From 5e19196797ce53fe8fe7a845bccea825e401e51c Mon Sep 17 00:00:00 2001
From: John Bowler <jbowler@nslu2-linux.org>
Date: Thu, 22 Sep 2005 19:47:26 +0000
Subject: 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.

---
 packages/meta/ucslugc-native.bb   |  5 ++++-
 packages/meta/ucslugc-packages.bb | 15 +++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'packages/meta')

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)
-- 
cgit v1.2.3