propagate from branch 'org.openembedded.dev' (head d46c4661bf8a227094ce244e37836233fb938268)

            to branch 'org.openembedded.dev.avr32' (head 7cd1ae5351316a6cdc9fe3db60bb05198d50af39)

1 files changed, 18 insertions, 11 deletions

diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 6b34fc187a..7960be85eb 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r36"
+PR = "r40"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -49,6 +49,9 @@ SLUGOS_PACKAGES = "\
 	coreutils \
 	cron \
 	ctorrent \
+	ctrlproxy \
+	cups \
+	curl \
 	cvs \
 	cyrus-imapd \
 	cyrus-sasl \
@@ -79,6 +82,7 @@ SLUGOS_PACKAGES = "\
 	gdbm \
 	glib-2.0 \
 	gnu-config \
+	gphoto2 \
 	grep \
 	groff \
 	gspcav1 \
@@ -114,6 +118,7 @@ SLUGOS_PACKAGES = "\
 	libxml2 \
 	linphone \
 	litestream \
+	logrotate \
 	lrzsz \
 	lsof \
 	lvm2 \
@@ -144,7 +149,6 @@ SLUGOS_PACKAGES = "\
 	net-tools \
 	netcat \
 	netpbm \
-	nfs-utils \
 	nmap \
 	ntfs-3g \
 	ntp \
@@ -173,6 +177,7 @@ SLUGOS_PACKAGES = "\
 	rng-tools \
 	rsync \
 	samba \
+	sane-backends \
 	screen \
 	sed \
 	setpwc \
@@ -186,7 +191,6 @@ SLUGOS_PACKAGES = "\
 	sudo \
 	sysfsutils \
 	tar \
-	task-mokogateway-everything \
 	thttpd \
 	tiff \
 	timezones \
@@ -207,7 +211,9 @@ SLUGOS_PACKAGES = "\
 	wireless-tools \
 	wireshark \
 	wpa-supplicant \
-        wview-sim wview-vpro wview-wxt510 \
+        wview-sim wview-sim-mysql \
+	wview-vpro wview-vpro-mysql \
+	wview-wxt510 wview-wxt510-mysql \
 	xinetd \
 	yeaphone \
 	yp-tools ypbind ypserv \
@@ -219,23 +225,19 @@ SLUGOS_PACKAGES = "\
 # Packages currently broken on all platforms
 SLUGOS_BROKEN_PACKAGES = "\
 	bwmon \
-	ctrlproxy \
 	dsniff \
 	fetchmail \
-	libgphoto2 gphoto2 sane-backends \\
 	lirc-modules lirc \
-	logrotate \
 	madfu \
+	portmap nfs-utils \
 	openldap \
 	pvrusb2-mci \
 	pwc \
 	qc-usb-messenger \
 	syslog-ng \
+	openocd task-mokogateway-everything \
 	task-native-sdk \
-	unionfs-modules \
-	unionfs-utils \
-        wview-sim-mysql wview-vpro-mysql \
-        wview-wxt510-mysql \
+	unionfs-modules unionfs-utils \
 	zd1211 \
 	"
 
@@ -250,3 +252,8 @@ DEPENDS = "\
 	${SLUGOS_EXTRA_PACKAGES} \
 	package-index \
 	"
+
+inherit meta
+
+do_package_write_ipk() {
+}