ucslugc, openslug-init: changes to ensure compatibility with new thumb compilation

Some package builds removed from ucslugc because they are not compatible
with the thumb build.  openslug-init changed to use the target chroot, not the
initrd one, because this actually works when the initrd and target are
different operating systems.

4 files changed, 19 insertions, 9 deletions

diff --git a/packages/meta/ucslugc-native.bb b/packages/meta/ucslugc-native.bb
index 1300b95f30..c878f31562 100644
--- a/packages/meta/ucslugc-native.bb
+++ b/packages/meta/ucslugc-native.bb
@@ -59,7 +59,6 @@ UCSLUGC_NATIVE = "\
 	lrzsz \
 	m4 \
 	make \
-	monotone-5 \
 	ncurses \
 	patch \
 	perl \
@@ -72,6 +71,10 @@ UCSLUGC_NATIVE = "\
 	wget \
 	"
 
+UCSLUGC_NATIVE_THUMB_BROKEN = "\
+	monotone-5 \
+	"
+
 # These things are required but are not valid RDEPENDS
 UCSLUGC_NATIVE_DP = "\
 	gdbm \
diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb
index bb52048fd7..d46cba335b 100644
--- a/packages/meta/ucslugc-packages.bb
+++ b/packages/meta/ucslugc-packages.bb
@@ -32,7 +32,6 @@ UCSLUGC_PACKAGES = "\
 	cron \
 	cvs \
 	cvs\
-	cyrus-imapd \
 	db4 \
 	diffstat \
 	diffutils \
@@ -73,12 +72,9 @@ UCSLUGC_PACKAGES = "\
 	mgetty \
 	miau \ 
 	microcom \
-	monotone-4 \
-	monotone-5 \
 	mpd \
 	mt-daapd \
 	mutt \
-	mysql \
 	nail \
 	nano \
 	ncftp \
@@ -137,11 +133,18 @@ UCSLUGC_BROKEN_PACKAGES = "\
 	xinetd \
 	"
 
+# These packages are not in the build because they have a significant compilation
+# time and probably aren't very useful on a ucslugc system
+THUMB_OPTIONAL_PACKAGES = "\
+	monotone-4 \
+	mysql \
+	"
+
 # These packages have problems with thumb or thumb-interwork compilation - they
 # should really be fixed (if still in the build it is because there is a hacky
-# work round.)  The problem here is that _call_via_r2 is apparently inaccessible
-# under some circumstances.
+# work round.)  The problem with monotone-5 is that it is simply too big.
 THUMB_BROKEN_PACKAGES = "\
+	monotone-5 \
 	"
 
 # These packages will never build because uclibc lacks (and always will lack)
diff --git a/packages/openslug-init/openslug-init-0.10/functions b/packages/openslug-init/openslug-init-0.10/functions
index 55f3397462..e90f03aead 100755
--- a/packages/openslug-init/openslug-init-0.10/functions
+++ b/packages/openslug-init/openslug-init-0.10/functions
@@ -165,7 +165,11 @@ swivel() {
 		# (it's on fd 10).
 		# init closes all file descriptors, there's no point
 		# supplying it with fds.
-		exec "$2/usr/sbin/chroot" . bin/sh -c "\
+		# NOTE: this used to use $2/usr/sbin/chroot, however on
+		# linux / is already . when the command is executed
+		# therefore it is essential to use the local (new root)
+		# chroot to ensure it gets the correct shared libraries.
+		exec usr/sbin/chroot . bin/sh -c "\
 			test -x sbin/init && exec sbin/init
 			test -x etc/init && exec etc/init
 			test -x bin/init && exec bin/init
diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb
index e26b118a6a..1248cc22da 100644
--- a/packages/openslug-init/openslug-init_0.10.bb
+++ b/packages/openslug-init/openslug-init_0.10.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r41"
+PR = "r42"
 
 SRC_URI = "file://linuxrc \
 	   file://boot/flash \