SlugOS: package feeds - subsume nas package; demote netatalk; remove

openocd and dfu-util due to libusb conflicts (temporary, until that
conflict can be resolved satisfactorily).

2 files changed, 14 insertions, 8 deletions

diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 946b51b210..5b745d2ca1 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 = "r57"
+PR = "r58"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -165,7 +165,6 @@ SLUGOS_PACKAGES = "\
 	ncftp \
 	ncurses \
 	net-tools \
-	netatalk \
 	netcat \
 	netpbm \
 	nfs-utils \
@@ -179,7 +178,6 @@ SLUGOS_PACKAGES = "\
 	openobex-apps \
 	openntpd \
 	openobex \
-	openocd \
 	openssh \
 	openvpn \
 	patch \
@@ -217,6 +215,7 @@ SLUGOS_PACKAGES = "\
 	streamripper \
 	stunnel \
 	sudo \
+	swat \
 	sysfsutils \
 	syslog-ng \
 	tar \
@@ -262,6 +261,7 @@ SLUGOS_BROKEN_PACKAGES = "\
 	lirc-modules lirc \
 	madfu \
 	motion \
+	netatalk \
 	openldap \
 	postfix \
 	pwc \
@@ -280,7 +280,6 @@ SLUGOS_EXTRA_PACKAGES ?= ""
 DEPENDS = "\
 	slugos-image \
 	slugos-native \
-	task-nas-server-everything \
 	task-proper-tools \
 	${SLUGOS_PACKAGES} \
 	${SLUGOS_EXTRA_PACKAGES} \
diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
index 3df3f1fd03..1575b41780 100644
--- a/packages/tasks/task-mokogateway.bb
+++ b/packages/tasks/task-mokogateway.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "MokoGateway: Tasks for a companion server for the Openmoko Linux Distribution"
 LICENSE = "MIT"
 PROVIDES = "task-mokogateway-everything"
-PR = "r4"
+PR = "r5"
 
 inherit task
 
@@ -73,9 +73,16 @@ RRECOMMENDS_task-mokogateway-wifi = "\
 
 DESCRIPTION_task-mokogateway-debug = "MokoGateway: Debug"
 RDEPENDS_task-mokogateway-debug = "\
-	dfu-util \
-	openocd \
 "
+# The following packages are broken -- victims of libusb confusion.
+# These packages depend upon libusb, which provides libusb.a -- however
+# everything else depends upon libusb-compat, which also provides libusb.a
+# (this includes bluez-*, usbutils-*, hal-*, libhal-*, etc).  The wrong
+# libusb.a is staged for at least somebody.  The hacky solution right now
+# is to not build these two utils, as they are the only ones in common use
+# that DEPEND upon libusb.  This needs to be fixed in a better way, but this
+# will, at least, get the feeds working again.
+#	dfu-util \
+#	openocd \
 RRECOMMENDS_task-mokogateway-debug = "\
 "
-