merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

     and 'db976a98427dd6a195e2cf167e225de2d0206aea'

1 files changed, 27 insertions, 15 deletions

diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 76c949c0dd..6f6d3140c5 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 = "r19"
+PR = "r33"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -27,6 +27,7 @@ SLUGOS_PACKAGES = "\
 	audiofile \
 	aumix \
 	autoconf \
+	autofs \
 	automake \
 	bash \
 	beep \
@@ -47,6 +48,7 @@ SLUGOS_PACKAGES = "\
 	cyrus-imapd \
 	cyrus-sasl \
 	db \
+	devio \
 	devlabel \
 	diffstat \
 	diffutils \
@@ -63,6 +65,8 @@ SLUGOS_PACKAGES = "\
 	flac \
 	flex \
 	flite \
+	ftpd-topfield \
+	fuse \
 	gawk \
 	gcc \
 	gdb \
@@ -70,6 +74,7 @@ SLUGOS_PACKAGES = "\
 	glib-2.0 \
 	gnu-config \
 	grep \
+	gspcav1 \
 	gtk-doc \
 	gzip \
 	hdparm \
@@ -96,7 +101,6 @@ SLUGOS_PACKAGES = "\
 	libvorbis \
 	libxml2 \
 	litestream \
-	logrotate \
 	lrzsz \
 	lsof \
 	lvm2 \
@@ -107,14 +111,12 @@ SLUGOS_PACKAGES = "\
 	make \
 	masqmail \
 	mdadm \
-	mediatomb \
 	memtester \
 	mgetty \
 	miau \
 	microcom \
 	minicom \
 	motion \
-	mpd \
 	mt-daapd \
 	mtd-utils \
 	mutt \
@@ -123,7 +125,9 @@ SLUGOS_PACKAGES = "\
 	ncftp \
 	ncurses \
 	netcat \
+	nfs-utils \
 	nmap \
+	ntfs-3g \
 	ntp \
 	ntpclient \
 	obexftp \
@@ -138,9 +142,11 @@ SLUGOS_PACKAGES = "\
 	pciutils \
 	libpcre \
 	perl \
+	picocom \
 	pkgconfig \
 	ppp \
 	procps \
+	puppy \
 	python \
 	quilt \
 	reiserfsprogs reiser4progs \
@@ -151,26 +157,33 @@ SLUGOS_PACKAGES = "\
 	setpwc \
 	setserial \
 	sipsak \
+	slugimage \
 	smartmontools \
 	ssmtp \
 	strace \
 	streamripper \
 	sysfsutils \
-	syslog-ng \
 	tar \
+	task-mokogateway-everything \
 	thttpd \
 	tiff \
+	tzdata \
 	unzip \
+	upslug2 \
 	usbutils \
 	util-linux \
 	vim \
 	vlan \
 	vsftpd \
+	w3cam \
 	wakelan \
 	watchdog \
+	webcam-server \
 	wget \
 	wireless-tools \
+	wireshark \
 	wpa-supplicant \
+	zd1211-firmware \
 	zip \
 	zlib \
 	"
@@ -178,20 +191,27 @@ SLUGOS_PACKAGES = "\
 # Packages currently broken on all platforms
 SLUGOS_BROKEN_PACKAGES = "\
 	bwmon \
-	ftpd-topfield \
 	gphoto2 \
 	irssi \
 	libgphoto2 \
+	logrotate \
+	madfu \
+	mediatomb \
+	mpd \
 	netpbm \
-	puppy \
 	pvrusb2-mci \
 	qc-usb-messenger \
+	syslog-ng \
 	sane-backends \
 	unionfs-modules \
 	unionfs-utils \
 	lirc \
 	pwc \
+	task-native-sdk \
 	zd1211 \
+	mysql \
+        wview-sim-mysql wview-vpro-mysql \
+        wview-wxt510-mysql \
 	"
 
 # These packages will never build because uclibc lacks (and always will lack)
@@ -237,20 +257,12 @@ SLUGOS_PACKAGES_append_linux = "\
 	screen \
 	timezones \
         wview-sim wview-vpro wview-wxt510 \
-        wview-sim-mysql wview-vpro-mysql \
-        wview-wxt510-mysql \
 	xinetd \
 	"
 
 SLUGOS_PACKAGES_append_linux-uclibc = "\
 	"
 
-# These packages are not in the build because they have a significant compilation
-# time, add them to SLUGOS_EXTRA_PACKAGES if required
-SLUGOS_OPTIONAL_PACKAGES = "\
-	mysql \
-	"
-
 SLUGOS_EXTRA_PACKAGES ?= ""
 
 # The package-index at the end causes regeneration of the Packages.gz and