From 4ef5087ed7956bda672a133cbe3d11a0fa25397c Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Thu, 17 Jun 2010 12:14:35 -0500
Subject: SlugOS: package feed changes to drop x11, and unbuildable packages
 This set of changes removes packages that pull in libx11, and (temporarily)
 disables packages that won't build, mostly due to gcc 4.4.4 issues.  Only
 tested on LE for the moment.

---
 recipes/meta/slugos-packages.bb | 68 ++++++++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 24 deletions(-)

(limited to 'recipes/meta')

diff --git a/recipes/meta/slugos-packages.bb b/recipes/meta/slugos-packages.bb
index 53a5598238..20354e999f 100644
--- a/recipes/meta/slugos-packages.bb
+++ b/recipes/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 = "r66"
+PR = "r67"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -21,7 +21,6 @@ ALLOW_EMPTY = "1"
 SLUGOS_PACKAGES = "\
 	alsa-lib \
 	alsa-utils \
-	apex-env \
 	apr \
 	asterisk \
 	asterisk-core-sounds-en-alaw \
@@ -47,8 +46,6 @@ SLUGOS_PACKAGES = "\
 	bind \
 	binutils \
 	bison \
-	bluez-hcidump \
-	bluez4 \
 	bogofilter \
 	bonnie++ \
 	boost \
@@ -62,7 +59,6 @@ SLUGOS_PACKAGES = "\
 	coreutils \
 	cron \
 	cryptsetup \
-	cups \
 	curl \
 	cvs \
 	db \
@@ -93,7 +89,6 @@ SLUGOS_PACKAGES = "\
 	glib-2.0 \
 	gnu-config \
 	gphoto2 \
-	gpsd \
 	grep \
 	groff \
 	gtk-doc \
@@ -101,18 +96,15 @@ SLUGOS_PACKAGES = "\
 	hdparm \
 	hostap-daemon \
 	ifupdown \
-	inetutils \
 	iozone3 \
 	iperf \
 	ipkg-utils \
 	iptables \
-	ircp \
 	joe \
 	jpeg \
 	kexec-tools \
 	lcdproc \
 	less \
-	libao \
 	libdvb \
 	libexif \
 	libid3tag \
@@ -134,10 +126,8 @@ SLUGOS_PACKAGES = "\
 	logrotate \
 	lrzsz \
 	lsof \
-	lvm2 \
 	m4 \
 	madplay \
-	madwifi-ng \
 	mailx \
 	make \
 	man man-pages \
@@ -146,11 +136,9 @@ SLUGOS_PACKAGES = "\
 	mediatomb \
 	memtester \
 	mgetty \
-	miau \
 	microcom \
 	minicom \
 	monit \
-	mpd \
 	mt-daapd \
 	mtd-utils \
 	mutt \
@@ -160,20 +148,14 @@ SLUGOS_PACKAGES = "\
 	ncftp \
 	ncurses \
 	net-tools \
-	netatalk \
 	netcat \
-	netpbm \
 	nfs-utils \
 	ngrep \
 	nmap \
 	ntfs-3g \
 	ntp \
 	ntpclient \
-	obexftp \
-	obexpush \
-	openobex-apps \
 	openntpd \
-	openobex \
 	openssh \
 	openvpn \
 	owfs \
@@ -190,12 +172,9 @@ SLUGOS_PACKAGES = "\
 	puppy \
 	python \
 	quilt \
-	reiserfsprogs reiser4progs \
 	rng-tools \
 	rsync \
-	rtorrent \
 	samba \
-	sane-backends \
 	screen \
 	sed \
 	setpwc \
@@ -215,7 +194,6 @@ SLUGOS_PACKAGES = "\
 	sysfsutils \
 	syslog-ng \
 	tar \
-	task-mokogateway-everything \
 	tcpdump \
 	thttpd \
 	tiff \
@@ -235,7 +213,6 @@ SLUGOS_PACKAGES = "\
 	webcam-server \
 	wget \
 	wireless-tools \
-	wireshark \
 	wpa-supplicant \
         wview-sim \
 	wview-vpro \
@@ -247,6 +224,46 @@ SLUGOS_PACKAGES = "\
 	zlib \
 	"
 
+# Packages that pull in dbus, which pulls in X11 libs.
+SLUGOS_DBUS_PACKAGES = "\
+	cups \
+	gpsd \
+	ircp \
+	obexftp \
+	obexpush \
+	openobex-apps \
+	openobex \
+	rtorrent \
+	task-mokogateway-everything \
+	"
+
+
+# Packages that pull in X11 libs (impractical packages).
+# These are not built by default any more.
+SLUGOS_X11_PACKAGES = "\
+	bluez-hcidump \
+	bluez4 \
+	libao \
+	mpd \
+	netatalk \
+	sane-backends \
+	wireshark \
+	"
+
+# Packages that are broken but need to be fixed!
+#
+# - apex-env: gcc4.4
+# - inetutils: gcc 4.4
+# - lvm2: gcc 4.4 (suspected)
+# - madwifi-ng: gcc 4.4 (and possibly other problems)
+# 
+SLUGOS_BROKEN_BUT_NEED_FIXING_PACKAGES = "\
+	apex-env \
+	inetutils \
+	lvm2 \
+	madwifi-ng \
+	"
+
 # Packages currently broken on all platforms
 # Notes:
 #  ctrlproxy - dependency on tdb.h (part of samba but not packaged/staged).
@@ -263,12 +280,15 @@ SLUGOS_BROKEN_PACKAGES = "\
 	linphone \
 	lirc-modules lirc \
 	madfu \
+	miau \
 	motion \
+	netpbm \
 	openldap \
 	postfix \
 	pvrusb2-mci \
 	pwc \
 	qc-usb-messenger \
+	reiserfsprogs reiser4progs \
 	task-native-sdk \
 	unionfs-modules unionfs-utils \
 	wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \
-- 
cgit 1.2.3-korg