merge of '2d7114b5bd553a86afdf241ba00411ba1e6d9bec'

     and '2e4d5c372cfad0e6d1d535ecbebee7006a637b97'

71 files changed, 491 insertions, 2086 deletions

diff --git a/classes/bootimg.bbclass b/classes/bootimg.bbclass
index 0c96001096..d58cf1f424 100644
--- a/classes/bootimg.bbclass
+++ b/classes/bootimg.bbclass
@@ -13,9 +13,9 @@
 # ${SYSLINUX_OPTS} - additional options to add to the syslinux file ';' delimited 
 
 do_bootimg[depends] += "dosfstools-native:do_populate_staging \
-                       syslinux-native:do_populate_staging \
-		       mtools-native:do_populate_staging \
-		       cdrtools-native:do_populate_staging"
+                        syslinux-native:do_populate_staging \
+                        mtools-native:do_populate_staging \
+                        cdrtools-native:do_populate_staging"
 
 PACKAGES = " "
 
@@ -31,6 +31,8 @@ SYSLINUXCFG  = "${HDDDIR}/syslinux.cfg"
 SYSLINUXMENU = "${HDDDIR}/menu"
 
 inherit syslinux
+
+IMAGE_POSTPROCESS_COMMAND ?= ""
 		
 build_boot_bin() {
 	install -d ${HDDDIR}
@@ -49,13 +51,15 @@ build_boot_bin() {
 	BLOCKS=`du -bks ${HDDDIR} | cut -f 1`
 	SIZE=`expr $BLOCKS + ${BOOTIMG_EXTRA_SPACE}`	
 
+	install -d ${DEPLOY_DIR_IMAGE}
+
 	mkdosfs -F 12 -n ${BOOTIMG_VOLUME_ID} -d ${HDDDIR} \
 	-C ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg $SIZE 
 
 	syslinux ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
 	chmod 644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
 
-	#Create an ISO if we have an INITRD
+	# Create an ISO if we have an INITRD
 	if [ -n "${INITRD}" ] && [ -s "${INITRD}" ] && [ "${NOISO}" != "1" ] ; then
 		install -d ${ISODIR}
 
@@ -78,6 +82,8 @@ build_boot_bin() {
 		cp ${STAGING_DATADIR_NATIVE}/syslinux/isolinux.bin \
 		${ISODIR}
 
+		${IMAGE_POSTPROCESS_COMMAND}
+
 		mkisofs -V ${BOOTIMG_VOLUME_ID} \
 		-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \
 		-b isolinux/isolinux.bin -c isolinux/boot.cat -r \
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
new file mode 100644
index 0000000000..b04f72180d
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -0,0 +1,286 @@
+# see http://www.x.org/wiki/Releases/7.4
+# WORK IN PROGRESS, 7.4 will be released on 2008-03-01
+
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+
+PREFERRED_PROVIDER_libxext ?= "libxext"
+PREFERRED_PROVIDER_xext ?= "libxext"
+PREFERRED_PROVIDER_libxi ?= "libxi"
+PREFERRED_PROVIDER_libxft ?= "libxft"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_libxpm ?= "libxpm"
+PREFERRED_PROVIDER_xpm ?= "libxpm"
+PREFERRED_PROVIDER_libxt ?= "libxt"
+PREFERRED_PROVIDER_libxaw ?= "libxaw"
+PREFERRED_PROVIDER_libice ?= "libice"
+PREFERRED_PROVIDER_libxrender ?= "libxrender"
+PREFERRED_PROVIDER_libxcursor ?= "libxcursor"
+PREFERRED_PROVIDER_xextensions ?= "xextensions"
+PREFERRED_PROVIDER_xproto ?= "xproto"
+PREFERRED_PROVIDER_x11 ?= "libx11"
+PREFERRED_PROVIDER_libxv ?= "libxv"
+PREFERRED_PROVIDER_xft ?= "libxft"
+PREFERRED_PROVIDER_libxrandr ?= "libxrandr"
+PREFERRED_PROVIDER_libxdamage ?= "libxdamage"
+PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite"
+PREFERRED_PROVIDER_libxfixes ?= "libxfixes"
+PREFERRED_PROVIDER_libxinerama ?= "libxinerama"
+PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm"
+PREFERRED_PROVIDER_libxmu ?= "libxmu"
+PREFERRED_PROVIDER_libsm ?= "libsm"
+PREFERRED_PROVIDER_xrandr ?= "xrandr"
+PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg"
+
+PREFERRED_VERSION_task-xorg ?= "X11R7.4"
+
+# app
+PREFERRED_VERSION_appres ?= "1.0.1"
+PREFERRED_VERSION_bdftopcf ?= "1.0.1"
+PREFERRED_VERSION_beforelight ?= "1.0.3"
+PREFERRED_VERSION_bitmap ?= "1.0.3"
+PREFERRED_VERSION_editres ?= "1.0.3"
+PREFERRED_VERSION_fontosfnt ?= "1.0.3"
+PREFERRED_VERSION_fslsfonts ?= "1.0.1"
+PREFERRED_VERSION_fstobdf ?= "1.0.2"
+PREFERRED_VERSION_iceauth ?= "1.0.2"
+PREFERRED_VERSION_ico ?= "1.0.2"
+PREFERRED_VERSION_lbxproxy ?= "1.0.1"
+PREFERRED_VERSION_listres ?= "1.0.1"
+PREFERRED_VERSION_luit ?= "1.0.3"
+PREFERRED_VERSION_mkfontdir-native ?= "1.0.3"
+PREFERRED_VERSION_mkfontdir ?= "1.0.3"
+PREFERRED_VERSION_mkfontscale ?= "1.0.3"
+PREFERRED_VERSION_oclock ?= "1.0.1"
+PREFERRED_VERSION_proxymngr ?= "1.0.1"
+PREFERRED_VERSION_rgb ?= "1.0.1"
+PREFERRED_VERSION_rstart ?= "1.0.2"
+PREFERRED_VERSION_scripts ?= "1.0.1"
+PREFERRED_VERSION_sessreg ?= "1.0.3"
+PREFERRED_VERSION_setxkbmap ?= "1.0.4"
+PREFERRED_VERSION_smproxy ?= "1.0.2"
+PREFERRED_VERSION_twm ?= "1.0.3"
+PREFERRED_VERSION_viewres ?= "1.0.1"
+PREFERRED_VERSION_x11perf ?= "1.4.1"
+PREFERRED_VERSION_xauth ?= "1.0.2"
+PREFERRED_VERSION_xbacklight ?= "1.1"
+PREFERRED_VERSION_xbiff ?= "1.0.1"
+PREFERRED_VERSION_xcalc ?= "1.0.2"
+PREFERRED_VERSION_xclipboard ?= "1.0.1"
+PREFERRED_VERSION_xclock ?= "1.0.3"
+PREFERRED_VERSION_xcmsdb ?= "1.0.1"
+PREFERRED_VERSION_xconsole ?= "1.0.3"
+PREFERRED_VERSION_xcursorgen ?= "1.0.2"
+PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
+PREFERRED_VERSION_xditview ?= "1.0.1"
+PREFERRED_VERSION_xdm ?= "1.1.6"
+PREFERRED_VERSION_xdpyinfo ?= "1.0.2"
+PREFERRED_VERSION_xdriinfo ?= "1.0.2"
+PREFERRED_VERSION_xedit ?= "1.0.2"
+PREFERRED_VERSION_xev ?= "1.0.2"
+PREFERRED_VERSION_xeyes ?= "1.0.1"
+PREFERRED_VERSION_xxf86dga ?= "1.0.2"
+PREFERRED_VERSION_xfd ?= "1.0.1"
+PREFERRED_VERSION_xfindproxy ?= "1.0.1"
+PREFERRED_VERSION_xfontsel ?= "1.0.2"
+PREFERRED_VERSION_xfs ?= "1.0.5"
+PREFERRED_VERSION_xfsinfo ?= "1.0.1"
+PREFERRED_VERSION_xfwp ?= "1.0.1"
+PREFERRED_VERSION_xgamma ?= "1.0.2"
+PREFERRED_VERSION_xgc ?= "1.0.1"
+PREFERRED_VERSION_xhost ?= "1.0.2"
+PREFERRED_VERSION_xinit ?= "1.0.7"
+PREFERRED_VERSION_xinput ?= "1.3.0"
+PREFERRED_VERSION_xkbcomp ?= "1.0.3"
+PREFERRED_VERSION_xkbevd ?= "1.0.2"
+PREFERRED_VERSION_xkbprint ?= "1.0.1"
+PREFERRED_VERSION_xkbutils ?= "1.0.1"
+PREFERRED_VERSION_xkill ?= "1.0.1"
+PREFERRED_VERSION_xload ?= "1.0.2"
+PREFERRED_VERSION_xlogo ?= "1.0.1"
+PREFERRED_VERSION_xlsatoms ?= "1.0.1"
+PREFERRED_VERSION_xlsclients ?= "1.0.1"
+PREFERRED_VERSION_xlsfonts ?= "1.0.2"
+PREFERRED_VERSION_xmag ?= "1.0.2"
+PREFERRED_VERSION_xman ?= "1.0.3"
+PREFERRED_VERSION_xmessage ?= "1.0.2"
+PREFERRED_VERSION_xmh ?= "1.0.1"
+PREFERRED_VERSION_xmodmap ?= "1.0.3"
+PREFERRED_VERSION_xmore ?= "1.0.1"
+PREFERRED_VERSION_xphelloworld ?= "1.0.1"
+PREFERRED_VERSION_xplsprinters ?= "1.0.1"
+PREFERRED_VERSION_xpr ?= "1.0.2"
+PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1"
+PREFERRED_VERSION_xprop ?= "1.0.3"
+PREFERRED_VERSION_xrandr ?= "1.2.2"
+PREFERRED_VERSION_xrdb ?= "1.0.4"
+PREFERRED_VERSION_xrefresh ?= "1.0.2"
+PREFERRED_VERSION_xrx ?= "1.0.1"
+PREFERRED_VERSION_xset ?= "1.0.3"
+PREFERRED_VERSION_xsetmode ?= "1.0.0"
+PREFERRED_VERSION_xsetpointer ?= "1.0.1"
+PREFERRED_VERSION_xsetroot ?= "1.0.2"
+PREFERRED_VERSION_xsm ?= "1.0.1"
+PREFERRED_VERSION_xstdcmap ?= "1.0.1"
+PREFERRED_VERSION_xtrap ?= "1.0.2"
+PREFERRED_VERSION_xvidtune ?= "1.0.1"
+PREFERRED_VERSION_xvinfo ?= "1.0.2"
+PREFERRED_VERSION_xwd ?= "1.0.1"
+PREFERRED_VERSION_xwininfo ?= "1.0.3"
+PREFERRED_VERSION_xwud ?= "1.0.1"
+
+# data
+PREFERRED_VERSION_xbitmaps ?= "1.0.1"
+PREFERRED_VERSION_xcursor-themes ?= "1.0.1"
+
+# doc
+PREFERRED_VERSION_xorg-docs ?= "1.4"
+PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
+
+# driver
+PREFERRED_VERSION_xf86-input-acecad ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-aiptek ?= "1.0.1"
+PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-citron ?= "2.2.1"
+PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-dmc ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-elographics ?= "1.0.0.5"
+PREFERRED_VERSION_xf86-input-evdev ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-fpit ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-hyperpen ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-jamstudio ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-joystick ?= "1.3.1"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2"
+PREFERRED_VERSION_xf86-input-magellan ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
+PREFERRED_VERSION_xf86-input-microtouch ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.2.3"
+PREFERRED_VERSION_xf86-input-mutouch ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-palmax ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-penmount ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-summa ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-tek4957 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-vmmouse ?= "12.4.3"
+PREFERRED_VERSION_xf86-input-void ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-apm ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-ark ?= "0.6.0"
+PREFERRED_VERSION_xf86-video-ast ?= "0.81.0"
+PREFERRED_VERSION_xf86-video-ati ?= "6.6.193"
+PREFERRED_VERSION_xf86-video-chips ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-cirrus ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-dummy ?= "0.2.0"
+PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1"
+PREFERRED_VERSION_xf86-video-glide ?= "1.0.0"
+PREFERRED_VERSION_xf86-video-glint ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6"
+PREFERRED_VERSION_xf86-video-i740 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
+PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-intel ?= "2.2.0"
+PREFERRED_VERSION_xf86-video-mga ?= "1.4.8"
+PREFERRED_VERSION_xf86-video-neomagic ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
+PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.7"
+PREFERRED_VERSION_xf86-video-radeonhd ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-rendition ?= "4.1.3"
+PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0"
+PREFERRED_VERSION_xf86-video-s3virge ?= "1.9.1"
+PREFERRED_VERSION_xf86-video-savage ?= "2.1.3"
+PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.4.2"
+PREFERRED_VERSION_xf86-video-sis ?= "0.9.4"
+PREFERRED_VERSION_xf86-video-sisusb ?= "0.8.1"
+PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-sunffb ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-sunleo ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-tga ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-trident ?= "1.2.3"
+PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-v4l ?= "0.1.1"
+PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.0"
+PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
+PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.15.2"
+PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1"
+
+# font
+PREFERRED_VERSION_encodings ?= "1.0.2"
+PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1"
+PREFERRED_VERSION_font-util-native ?= "1.0.1"
+PREFERRED_VERSION_font-util ?= "1.0.1"
+
+# lib
+PREFERRED_VERSION_diet-x11 ?= "1.1.3"
+PREFERRED_VERSION_libdmx ?= "1.0.2"
+PREFERRED_VERSION_libfontenc ?= "1.0.4"
+PREFERRED_VERSION_libice ?= "1.0.4"
+PREFERRED_VERSION_liblbxutil ?= "1.0.1"
+PREFERRED_VERSION_libsm ?= "1.0.3"
+PREFERRED_VERSION_libx11 ?= "1.1.3"
+PREFERRED_VERSION_libx11-native ?= "1.1.1"
+PREFERRED_VERSION_libxau ?= "1.0.3"
+PREFERRED_VERSION_libxaw ?= "1.0.4"
+PREFERRED_VERSION_libxcomposite ?= "0.4.0"
+PREFERRED_VERSION_libxcursor ?= "1.1.9"
+PREFERRED_VERSION_libxdamage ?= "1.0.4"
+PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
+PREFERRED_VERSION_libxdmcp ?= "1.0.2"
+PREFERRED_VERSION_libxevie ?= "1.0.2"
+PREFERRED_VERSION_libxext ?= "1.0.3"
+PREFERRED_VERSION_libxfixes ?= "4.0.3"
+PREFERRED_VERSION_libxfont ?= "1.3.1"
+PREFERRED_VERSION_libxfontcache ?= "1.0.4"
+PREFERRED_VERSION_libxi ?= "1.1.3"
+PREFERRED_VERSION_libxinerama ?= "1.0.2"
+PREFERRED_VERSION_libxkbfile ?= "1.0.4"
+PREFERRED_VERSION_libxkbui ?= "1.0.2"
+PREFERRED_VERSION_libxmu ?= "1.0.4"
+PREFERRED_VERSION_libxpm ?= "3.5.7"
+PREFERRED_VERSION_libxrandr ?= "1.2.2"
+PREFERRED_VERSION_libxrender ?= "0.9.4"
+PREFERRED_VERSION_libxres ?= "1.0.3"
+PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
+PREFERRED_VERSION_libxt ?= "1.0.5"
+PREFERRED_VERSION_libxtst ?= "1.0.3"
+PREFERRED_VERSION_libxvmc ?= "1.0.4"
+PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
+PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
+PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
+PREFERRED_VERSION_xtrans ?= "1.0.4"
+
+# proto
+PREFERRED_VERSION_compositeproto ?= "0.4"
+PREFERRED_VERSION_damageproto ?= "1.1.0"
+PREFERRED_VERSION_fixesproto ?= "4.0"
+PREFERRED_VERSION_glproto ?= "1.4.9"
+PREFERRED_VERSION_inputproto ?= "1.4.2.1"
+PREFERRED_VERSION_kbproto ?= "1.0.3"
+PREFERRED_VERSION_randrproto ?= "1.2.1"
+PREFERRED_VERSION_renderproto ?= "0.9.3"
+PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
+PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
+PREFERRED_VERSION_xproto-native ?= "7.0.11"
+PREFERRED_VERSION_xproto ?= "7.0.11"
+
+# util
+PREFERRED_VERSION_gccmakedep ?= "1.0.2"
+PREFERRED_VERSION_imake ?= "1.0.2"
+PREFERRED_VERSION_makedepend ?= "1.0.1"
+PREFERRED_VERSION_util-macros-native ?= "1.1.5"
+PREFERRED_VERSION_util-macros ?= "1.1.5"
+PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
+
+# xserver
+PREFERRED_VERSION_xserver-kdrive ?= "1.4"
+PREFERRED_VERSION_xserver-xorg ?= "1.4"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index ca1227a84e..a585fdeca6 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -43,6 +43,7 @@ SRCREV_pn-libmokopanelui2 ?= "3349"
 SRCREV_pn-libmokoui2 ?= "3688"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
+SRCREV_pn-lightmediascanner ?= "68"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1039"
@@ -126,6 +127,7 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-python-formencode = "3148"
 SRCREV_pn-python-fso-pyproto = "70"
 SRCREV_pn-python-gsmd = "127"
+SRCREV_pn-python-lightmediascanner = "68"
 SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
diff --git a/packages/busybox/busybox-1.2.1/angstrom/defconfig b/packages/busybox/busybox-1.2.1/angstrom/defconfig
index 1807dab68e..5e0aa71614 100644
--- a/packages/busybox/busybox-1.2.1/angstrom/defconfig
+++ b/packages/busybox/busybox-1.2.1/angstrom/defconfig
@@ -123,7 +123,7 @@ CONFIG_CHROOT=y
 CONFIG_CP=y
 CONFIG_CUT=y
 CONFIG_DATE=y
-# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_FEATURE_DATE_ISOFMT=y
 CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
 # CONFIG_FEATURE_DD_IBS_OBS is not set
@@ -257,7 +257,7 @@ CONFIG_MKTEMP=y
 CONFIG_READLINK=y
 CONFIG_FEATURE_READLINK_FOLLOW=y
 CONFIG_RUN_PARTS=y
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
 CONFIG_START_STOP_DAEMON=y
 CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
 CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
diff --git a/packages/busybox/busybox-1.2.1/avr32/defconfig b/packages/busybox/busybox-1.2.1/avr32/defconfig
index b15f162a7d..112eb21d7e 100644
--- a/packages/busybox/busybox-1.2.1/avr32/defconfig
+++ b/packages/busybox/busybox-1.2.1/avr32/defconfig
@@ -123,7 +123,7 @@ CONFIG_CHROOT=y
 CONFIG_CP=y
 CONFIG_CUT=y
 CONFIG_DATE=y
-# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_FEATURE_DATE_ISOFMT=y
 CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
 # CONFIG_FEATURE_DD_IBS_OBS is not set
@@ -253,7 +253,7 @@ CONFIG_MKTEMP=y
 CONFIG_READLINK=y
 CONFIG_FEATURE_READLINK_FOLLOW=y
 CONFIG_RUN_PARTS=y
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
 CONFIG_START_STOP_DAEMON=y
 CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
 CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
diff --git a/packages/busybox/busybox-1.2.1/defconfig b/packages/busybox/busybox-1.2.1/defconfig
index 7308eead76..4bb48eb09d 100644
--- a/packages/busybox/busybox-1.2.1/defconfig
+++ b/packages/busybox/busybox-1.2.1/defconfig
@@ -123,7 +123,7 @@ CONFIG_CHROOT=y
 CONFIG_CP=y
 CONFIG_CUT=y
 CONFIG_DATE=y
-# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_FEATURE_DATE_ISOFMT=y
 CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
 # CONFIG_FEATURE_DD_IBS_OBS is not set
@@ -257,7 +257,7 @@ CONFIG_MKTEMP=y
 CONFIG_READLINK=y
 CONFIG_FEATURE_READLINK_FOLLOW=y
 CONFIG_RUN_PARTS=y
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
 CONFIG_START_STOP_DAEMON=y
 CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
 CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
diff --git a/packages/busybox/busybox-1.2.1/nylon/defconfig b/packages/busybox/busybox-1.2.1/nylon/defconfig
index 8a7aa8b00f..1e8ebb15a5 100644
--- a/packages/busybox/busybox-1.2.1/nylon/defconfig
+++ b/packages/busybox/busybox-1.2.1/nylon/defconfig
@@ -243,7 +243,7 @@ CONFIG_PIPE_PROGRESS=y
 CONFIG_READLINK=y
 CONFIG_FEATURE_READLINK_FOLLOW=y
 CONFIG_RUN_PARTS=y
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
 CONFIG_START_STOP_DAEMON=y
 CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
 # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
diff --git a/packages/busybox/busybox-1.2.1/slugos/defconfig b/packages/busybox/busybox-1.2.1/slugos/defconfig
index 74ece9c3b6..6ec2e8bee7 100644
--- a/packages/busybox/busybox-1.2.1/slugos/defconfig
+++ b/packages/busybox/busybox-1.2.1/slugos/defconfig
@@ -123,7 +123,7 @@ CONFIG_CHROOT=y
 CONFIG_CP=y
 CONFIG_CUT=y
 CONFIG_DATE=y
-# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_FEATURE_DATE_ISOFMT=y
 CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
 # CONFIG_FEATURE_DD_IBS_OBS is not set
@@ -257,7 +257,7 @@ CONFIG_MKTEMP=y
 CONFIG_READLINK=y
 CONFIG_FEATURE_READLINK_FOLLOW=y
 CONFIG_RUN_PARTS=y
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
 CONFIG_START_STOP_DAEMON=y
 CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
 CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
diff --git a/packages/busybox/busybox-1.7.2/defconfig b/packages/busybox/busybox-1.7.2/defconfig
index b878e95dec..11ec1b8aa6 100644
--- a/packages/busybox/busybox-1.7.2/defconfig
+++ b/packages/busybox/busybox-1.7.2/defconfig
@@ -143,7 +143,7 @@ CONFIG_CHROOT=y
 CONFIG_CP=y
 CONFIG_CUT=y
 CONFIG_DATE=y
-# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_FEATURE_DATE_ISOFMT=y
 CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
 # CONFIG_FEATURE_DD_IBS_OBS is not set
diff --git a/packages/busybox/busybox-static-1.2.1/defconfig b/packages/busybox/busybox-static-1.2.1/defconfig
index 1807dab68e..5e0aa71614 100644
--- a/packages/busybox/busybox-static-1.2.1/defconfig
+++ b/packages/busybox/busybox-static-1.2.1/defconfig
@@ -123,7 +123,7 @@ CONFIG_CHROOT=y
 CONFIG_CP=y
 CONFIG_CUT=y
 CONFIG_DATE=y
-# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_FEATURE_DATE_ISOFMT=y
 CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
 # CONFIG_FEATURE_DD_IBS_OBS is not set
@@ -257,7 +257,7 @@ CONFIG_MKTEMP=y
 CONFIG_READLINK=y
 CONFIG_FEATURE_READLINK_FOLLOW=y
 CONFIG_RUN_PARTS=y
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
 CONFIG_START_STOP_DAEMON=y
 CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
 CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
diff --git a/packages/busybox/busybox-static_1.2.1.bb b/packages/busybox/busybox-static_1.2.1.bb
index 519468039a..e51bb86da0 100644
--- a/packages/busybox/busybox-static_1.2.1.bb
+++ b/packages/busybox/busybox-static_1.2.1.bb
@@ -1,5 +1,5 @@
 require busybox_${PV}.bb
-PR = "r1"
+PR = "r2"
 
 S = "${WORKDIR}/busybox-1.2.1"
 
diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb
index 3b7016a42c..1accc790a2 100644
--- a/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r15"
+PR = "r16"
 
 SRC_URI += "file://wget-long-options.patch;patch=1 \
 	   file://df_rootfs.patch;patch=1 \
diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb
index 75847e1117..fbf05e7182 100644
--- a/packages/busybox/busybox_1.2.2.bb
+++ b/packages/busybox/busybox_1.2.2.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb
index 369500fc7b..1eea1edea2 100644
--- a/packages/busybox/busybox_1.3.1.bb
+++ b/packages/busybox/busybox_1.3.1.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb
index 269400106b..285096ce43 100644
--- a/packages/busybox/busybox_1.7.2.bb
+++ b/packages/busybox/busybox_1.7.2.bb
@@ -1,6 +1,5 @@
 require busybox.inc
-
-PR = "r4"
+PR = "r6"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://busybox-cron \
diff --git a/packages/busybox/files/syslog b/packages/busybox/files/syslog
index a999565e84..61d273b7cb 100644
--- a/packages/busybox/files/syslog
+++ b/packages/busybox/files/syslog
@@ -11,7 +11,7 @@ if [ -f /etc/syslog.conf ]; then
 	LOG_REMOTE=0
 	for D in $DESTINATION; do
 		if [ "$D" = "buffer" ]; then
-			SYSLOG_ARGS="$SYSLOG_ARGS -C $BUFFERSIZE"
+			SYSLOG_ARGS="$SYSLOG_ARGS -C$BUFFERSIZE"
 			LOG_LOCAL=1
 		elif [ "$D" = "file" ]; then
 			if [ -n "$LOGFILE" ]; then
diff --git a/packages/busybox/slingbox-1.00/.mtn2git_empty b/packages/busybox/slingbox-1.00/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/busybox/slingbox-1.00/.mtn2git_empty
+++ /dev/null
diff --git a/packages/busybox/slingbox-1.00/defconfig b/packages/busybox/slingbox-1.00/defconfig
deleted file mode 100644
index 6b15e1944b..0000000000
--- a/packages/busybox/slingbox-1.00/defconfig
+++ /dev/null
@@ -1,334 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-HAVE_DOT_CONFIG=y
-
-#
-# General Configuration
-#
-# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
-CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_FEATURE_VERBOSE_USAGE=y
-# CONFIG_FEATURE_INSTALLER is not set
-# CONFIG_LOCALE_SUPPORT is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_FEATURE_DEVPTS is not set
-# CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_SUID is not set
-# CONFIG_SELINUX is not set
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-CONFIG_LFS=y
-USING_CROSS_COMPILER=y
-CROSS_COMPILER_PREFIX="armv5b-softfloat-linux-"
-EXTRA_CFLAGS_OPTIONS=""
-
-#
-# Installation Options
-#
-# CONFIG_INSTALL_NO_USR is not set
-PREFIX="/"
-
-#
-# Archival Utilities
-#
-# CONFIG_AR is not set
-CONFIG_BUNZIP2=y
-# CONFIG_CPIO is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-CONFIG_GUNZIP=y
-CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
-CONFIG_GZIP=y
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_BZIP2=y
-# CONFIG_FEATURE_TAR_FROM is not set
-CONFIG_FEATURE_TAR_GZIP=y
-CONFIG_FEATURE_TAR_COMPRESS=y
-CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-CONFIG_FEATURE_TAR_LONG_OPTIONS=y
-CONFIG_UNCOMPRESS=y
-CONFIG_UNZIP=y
-
-#
-# Common options for cpio and tar
-#
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-
-#
-# Coreutils
-#
-# CONFIG_BASENAME is not set
-# CONFIG_CAL is not set
-# CONFIG_CAT is not set
-# CONFIG_CHGRP is not set
-# CONFIG_CHMOD is not set
-# CONFIG_CHOWN is not set
-CONFIG_CHROOT=y
-# CONFIG_CMP is not set
-# CONFIG_CP is not set
-CONFIG_CUT=y
-# CONFIG_DATE is not set
-# CONFIG_DD is not set
-# CONFIG_DF is not set
-CONFIG_DIRNAME=y
-# CONFIG_DOS2UNIX is not set
-CONFIG_DU=y
-# CONFIG_ECHO is not set
-# CONFIG_ENV is not set
-CONFIG_EXPR=y
-# CONFIG_FALSE is not set
-# CONFIG_FOLD is not set
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-# CONFIG_HOSTID is not set
-# CONFIG_ID is not set
-# CONFIG_INSTALL is not set
-# CONFIG_LENGTH is not set
-# CONFIG_LN is not set
-# CONFIG_LOGNAME is not set
-# CONFIG_LS is not set
-CONFIG_MD5SUM=y
-# CONFIG_MKDIR is not set
-CONFIG_MKFIFO=y
-# CONFIG_MKNOD is not set
-# CONFIG_MV is not set
-# CONFIG_OD is not set
-# CONFIG_PRINTF is not set
-# CONFIG_PWD is not set
-# CONFIG_REALPATH is not set
-# CONFIG_RM is not set
-CONFIG_RMDIR=y
-# CONFIG_SEQ is not set
-# CONFIG_SHA1SUM is not set
-# CONFIG_SLEEP is not set
-CONFIG_SORT=y
-# CONFIG_STTY is not set
-# CONFIG_SYNC is not set
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-# CONFIG_TEST is not set
-# CONFIG_TOUCH is not set
-# CONFIG_TR is not set
-# CONFIG_TRUE is not set
-# CONFIG_TTY is not set
-CONFIG_UNAME=y
-CONFIG_UNIQ=y
-# CONFIG_USLEEP is not set
-# CONFIG_UUDECODE is not set
-# CONFIG_UUENCODE is not set
-# CONFIG_WATCH is not set
-# CONFIG_WC is not set
-# CONFIG_WHO is not set
-# CONFIG_WHOAMI is not set
-# CONFIG_YES is not set
-
-#
-# Common options for md5sum, sha1sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-# CONFIG_CHVT is not set
-# CONFIG_CLEAR is not set
-# CONFIG_DEALLOCVT is not set
-# CONFIG_DUMPKMAP is not set
-# CONFIG_LOADFONT is not set
-# CONFIG_LOADKMAP is not set
-# CONFIG_OPENVT is not set
-# CONFIG_RESET is not set
-# CONFIG_SETKEYCODES is not set
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-# CONFIG_READLINK is not set
-# CONFIG_RUN_PARTS is not set
-# CONFIG_START_STOP_DAEMON is not set
-# CONFIG_WHICH is not set
-
-#
-# Editors
-#
-CONFIG_AWK=y
-# CONFIG_PATCH is not set
-CONFIG_SED=y
-# CONFIG_VI is not set
-
-#
-# Finding Utilities
-#
-# CONFIG_FIND is not set
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-# CONFIG_FEATURE_GREP_CONTEXT is not set
-# CONFIG_XARGS is not set
-
-#
-# Init Utilities
-#
-# CONFIG_INIT is not set
-# CONFIG_HALT is not set
-# CONFIG_POWEROFF is not set
-# CONFIG_REBOOT is not set
-# CONFIG_MESG is not set
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_ADDGROUP is not set
-# CONFIG_DELGROUP is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_DELUSER is not set
-# CONFIG_GETTY is not set
-# CONFIG_LOGIN is not set
-# CONFIG_PASSWD is not set
-# CONFIG_SU is not set
-# CONFIG_SULOGIN is not set
-# CONFIG_VLOCK is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_ADJTIMEX is not set
-# CONFIG_CROND is not set
-# CONFIG_CRONTAB is not set
-# CONFIG_DC is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_LAST is not set
-# CONFIG_HDPARM is not set
-# CONFIG_MAKEDEVS is not set
-# CONFIG_MT is not set
-# CONFIG_RX is not set
-CONFIG_STRINGS=y
-# CONFIG_TIME is not set
-# CONFIG_WATCHDOG is not set
-
-#
-# Linux Module Utilities
-#
-# CONFIG_INSMOD is not set
-# CONFIG_LSMOD is not set
-# CONFIG_MODPROBE is not set
-# CONFIG_RMMOD is not set
-
-#
-# Networking Utilities
-#
-# CONFIG_FEATURE_IPV6 is not set
-# CONFIG_ARPING is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_HOSTNAME is not set
-# CONFIG_HTTPD is not set
-# CONFIG_IFCONFIG is not set
-# CONFIG_IFUPDOWN is not set
-# CONFIG_INETD is not set
-# CONFIG_IP is not set
-# CONFIG_IPCALC is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
-# CONFIG_NAMEIF is not set
-CONFIG_NC=y
-# CONFIG_NETSTAT is not set
-# CONFIG_NSLOOKUP is not set
-# CONFIG_PING is not set
-# CONFIG_ROUTE is not set
-# CONFIG_TELNET is not set
-# CONFIG_TELNETD is not set
-# CONFIG_TFTP is not set
-# CONFIG_TRACEROUTE is not set
-# CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-# CONFIG_FEATURE_WGET_STATUSBAR is not set
-# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
-# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
-
-#
-# udhcp Server/Client
-#
-# CONFIG_UDHCPD is not set
-# CONFIG_UDHCPC is not set
-
-#
-# Process Utilities
-#
-CONFIG_FREE=y
-# CONFIG_KILL is not set
-# CONFIG_PIDOF is not set
-# CONFIG_PS is not set
-# CONFIG_RENICE is not set
-# CONFIG_TOP is not set
-# CONFIG_UPTIME is not set
-# CONFIG_SYSCTL is not set
-
-#
-# Another Bourne-like Shell
-#
-# CONFIG_FEATURE_SH_IS_ASH is not set
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_LASH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
-CONFIG_FEATURE_SH_IS_NONE=y
-# CONFIG_ASH is not set
-# CONFIG_HUSH is not set
-# CONFIG_LASH is not set
-# CONFIG_MSH is not set
-
-#
-# System Logging Utilities
-#
-# CONFIG_SYSLOGD is not set
-# CONFIG_LOGGER is not set
-
-#
-# Linux System Utilities
-#
-# CONFIG_DMESG is not set
-# CONFIG_FBSET is not set
-# CONFIG_FDFLUSH is not set
-# CONFIG_FDFORMAT is not set
-# CONFIG_FDISK is not set
-CONFIG_FREERAMDISK=y
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_GETOPT is not set
-CONFIG_HEXDUMP=y
-# CONFIG_HWCLOCK is not set
-CONFIG_LOSETUP=y
-# CONFIG_MKSWAP is not set
-# CONFIG_MORE is not set
-CONFIG_PIVOT_ROOT=y
-# CONFIG_RDATE is not set
-# CONFIG_SWAPONOFF is not set
-CONFIG_MOUNT=y
-CONFIG_NFSMOUNT=y
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_MOUNT_FORCE=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
diff --git a/packages/busybox/slingbox-1.00/lazy_umount.patch b/packages/busybox/slingbox-1.00/lazy_umount.patch
deleted file mode 100644
index 0608017e70..0000000000
--- a/packages/busybox/slingbox-1.00/lazy_umount.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- busybox-1.00-orig/util-linux/umount.c	2005-12-16 23:13:33.000000000 -0600
-+++ busybox-1.00/util-linux/umount.c	2005-12-16 23:16:49.000000000 -0600
-@@ -35,6 +35,7 @@
- #endif
- 
- static const int MNT_FORCE = 1;
-+static const int MNT_DETACH = 2;	/* Linksys -L mod */
- static const int MS_MGC_VAL = 0xc0ed0000; /* Magic number indicatng "new" flags */
- static const int MS_REMOUNT = 32;	/* Alter flags of a mounted FS.  */
- static const int MS_RDONLY = 1;	/* Mount read-only.  */
-@@ -54,7 +55,7 @@
- static struct _mtab_entry_t *mtab_cache = NULL;
- 
- 
--
-+static int doLazy = FALSE;		/* Linksys -L mod */
- #if defined CONFIG_FEATURE_MOUNT_FORCE
- static int doForce = FALSE;
- #endif
-@@ -181,6 +182,12 @@
- 		/* this was a loop device, delete it */
- 		del_loop(blockDevice);
- #endif
-+	if (status != 0 && doLazy) {	/* Linksys -L mod */
-+		status = umount2(blockDevice, MNT_DETACH);
-+		if (status != 0) {
-+			bb_error_msg_and_die("lazy umount of %s failed!", blockDevice);
-+		}
-+	}
- #if defined CONFIG_FEATURE_MOUNT_FORCE
- 	if (status != 0 && doForce) {
- 		status = umount2(blockDevice, MNT_FORCE);
-@@ -259,6 +266,9 @@
- 				freeLoop = FALSE;
- 				break;
- #endif
-+			case 'L':	/* Linksys -L mod */
-+				doLazy = TRUE;
-+				break;
- #ifdef CONFIG_FEATURE_MTAB_SUPPORT
- 			case 'n':
- 				useMtab = FALSE;
diff --git a/packages/busybox/slingbox-1.00/slingbox.patch b/packages/busybox/slingbox-1.00/slingbox.patch
deleted file mode 100644
index 6f5594b284..0000000000
--- a/packages/busybox/slingbox-1.00/slingbox.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- busybox-1.00-rc3/applets/install.sh	2001-03-09 08:12:11.000000000 +1030
-+++ slingbox/applets/install.sh	2004-08-31 11:27:23.000000000 +0930
-@@ -16,28 +16,28 @@
- h=`sort busybox.links | uniq`
- 
- 
--rm -f $prefix/bin/busybox || exit 1
-+rm -f $prefix/bin/slingbox || exit 1
- mkdir -p $prefix/bin || exit 1
--install -m 755 busybox $prefix/bin/busybox || exit 1
-+install -m 755 busybox $prefix/bin/slingbox || exit 1
- 
- for i in $h ; do
- 	appdir=`dirname $i`
- 	mkdir -p $prefix/$appdir || exit 1
- 	if [ "$2" = "--hardlinks" ]; then
--	    bb_path="$prefix/bin/busybox"
-+	    bb_path="$prefix/bin/slingbox"
- 	else
- 	    case "$appdir" in
- 		/)
--		    bb_path="bin/busybox"
-+		    bb_path="bin/slingbox"
- 		;;
- 		/bin)
--		    bb_path="busybox"
-+		    bb_path="slingbox"
- 		;;
- 		/sbin)
--		    bb_path="../bin/busybox"
-+		    bb_path="../bin/slingbox"
- 		;;
- 		/usr/bin|/usr/sbin)
--		    bb_path="../../bin/busybox"
-+		    bb_path="../../bin/slingbox"
- 		;;
- 		*)
- 		echo "Unknown installation directory: $appdir"
diff --git a/packages/busybox/slingbox-1.1.3/.mtn2git_empty b/packages/busybox/slingbox-1.1.3/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/busybox/slingbox-1.1.3/.mtn2git_empty
+++ /dev/null
diff --git a/packages/busybox/slingbox-1.1.3/Makefile_args.patch b/packages/busybox/slingbox-1.1.3/Makefile_args.patch
deleted file mode 100644
index 7561a89b94..0000000000
--- a/packages/busybox/slingbox-1.1.3/Makefile_args.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- busybox-1.1.2/Makefile.orig	2006-04-10 14:45:46.000000000 -0500
-+++ busybox-1.1.2/Makefile	2006-05-15 00:54:31.000000000 -0500
-@@ -79,6 +79,8 @@
- 	top_srcdir=$(top_srcdir) \
- 	top_builddir=$(top_builddir) \
- 	KBUILD_SRC=$(top_srcdir) \
-+	PREFIX=$(PREFIX) \
-+	CROSS=$(CROSS) \
- 	-f $(CURDIR)/Makefile $@
- 
- $(KBUILD_OUTPUT)/Rules.mak:
diff --git a/packages/busybox/slingbox-1.1.3/defconfig b/packages/busybox/slingbox-1.1.3/defconfig
deleted file mode 100644
index f1fe0d6d2d..0000000000
--- a/packages/busybox/slingbox-1.1.3/defconfig
+++ /dev/null
@@ -1,594 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
-CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_FEATURE_VERBOSE_USAGE=y
-# CONFIG_FEATURE_INSTALLER is not set
-# CONFIG_LOCALE_SUPPORT is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_FEATURE_DEVPTS is not set
-# CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_SUID is not set
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_DISABLE_SHARED is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-USING_CROSS_COMPILER=y
-CROSS_COMPILER_PREFIX="armv5b-softfloat-linux-"
-EXTRA_CFLAGS_OPTIONS=""
-# CONFIG_BUILD_AT_ONCE is not set
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_NO_DEBUG_LIB is not set
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-CONFIG_DEBUG_YANK_SUSv2=y
-
-#
-# Installation Options
-#
-# CONFIG_INSTALL_NO_USR is not set
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-PREFIX="/"
-
-#
-# Busybox Library Tuning
-#
-CONFIG_MD5_SIZE_VS_SPEED=2
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-# CONFIG_AR is not set
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-CONFIG_BUNZIP2=y
-# CONFIG_CPIO is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
-CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
-CONFIG_GZIP=y
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_BZIP2=y
-# CONFIG_FEATURE_TAR_LZMA is not set
-# CONFIG_FEATURE_TAR_FROM is not set
-CONFIG_FEATURE_TAR_GZIP=y
-CONFIG_FEATURE_TAR_COMPRESS=y
-CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-CONFIG_FEATURE_TAR_LONG_OPTIONS=y
-CONFIG_UNCOMPRESS=y
-# CONFIG_UNLZMA is not set
-# CONFIG_FEATURE_LZMA_FAST is not set
-CONFIG_UNZIP=y
-
-#
-# Common options for cpio and tar
-#
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-# CONFIG_FEATURE_DEB_TAR_GZ is not set
-# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
-# CONFIG_FEATURE_DEB_TAR_LZMA is not set
-
-#
-# Coreutils
-#
-# CONFIG_BASENAME is not set
-# CONFIG_CAL is not set
-# CONFIG_CAT is not set
-# CONFIG_CHGRP is not set
-# CONFIG_CHMOD is not set
-# CONFIG_CHOWN is not set
-CONFIG_CHROOT=y
-# CONFIG_CMP is not set
-# CONFIG_COMM is not set
-# CONFIG_CP is not set
-CONFIG_CUT=y
-# CONFIG_DATE is not set
-# CONFIG_FEATURE_DATE_ISOFMT is not set
-# CONFIG_DD is not set
-# CONFIG_DF is not set
-CONFIG_DIRNAME=y
-# CONFIG_DOS2UNIX is not set
-# CONFIG_UNIX2DOS is not set
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
-# CONFIG_ECHO is not set
-# CONFIG_FEATURE_FANCY_ECHO is not set
-# CONFIG_ENV is not set
-CONFIG_EXPR=y
-# CONFIG_EXPR_MATH_SUPPORT_64 is not set
-# CONFIG_FALSE is not set
-# CONFIG_FOLD is not set
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-# CONFIG_HOSTID is not set
-# CONFIG_ID is not set
-# CONFIG_INSTALL is not set
-# CONFIG_LENGTH is not set
-# CONFIG_LN is not set
-# CONFIG_LOGNAME is not set
-# CONFIG_LS is not set
-# CONFIG_FEATURE_LS_FILETYPES is not set
-# CONFIG_FEATURE_LS_FOLLOWLINKS is not set
-# CONFIG_FEATURE_LS_RECURSIVE is not set
-# CONFIG_FEATURE_LS_SORTFILES is not set
-# CONFIG_FEATURE_LS_TIMESTAMPS is not set
-# CONFIG_FEATURE_LS_USERNAME is not set
-# CONFIG_FEATURE_LS_COLOR is not set
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
-CONFIG_MD5SUM=y
-# CONFIG_MKDIR is not set
-CONFIG_MKFIFO=y
-# CONFIG_MKNOD is not set
-# CONFIG_MV is not set
-# CONFIG_NICE is not set
-# CONFIG_NOHUP is not set
-# CONFIG_OD is not set
-# CONFIG_PRINTENV is not set
-# CONFIG_PRINTF is not set
-# CONFIG_PWD is not set
-# CONFIG_REALPATH is not set
-# CONFIG_RM is not set
-CONFIG_RMDIR=y
-# CONFIG_SEQ is not set
-# CONFIG_SHA1SUM is not set
-# CONFIG_SLEEP is not set
-# CONFIG_FEATURE_FANCY_SLEEP is not set
-CONFIG_SORT=y
-# CONFIG_FEATURE_SORT_BIG is not set
-# CONFIG_STAT is not set
-# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_STTY is not set
-# CONFIG_SUM is not set
-# CONFIG_SYNC is not set
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-# CONFIG_TEST is not set
-# CONFIG_FEATURE_TEST_64 is not set
-# CONFIG_TOUCH is not set
-# CONFIG_TR is not set
-# CONFIG_FEATURE_TR_CLASSES is not set
-# CONFIG_FEATURE_TR_EQUIV is not set
-# CONFIG_TRUE is not set
-# CONFIG_TTY is not set
-CONFIG_UNAME=y
-CONFIG_UNIQ=y
-# CONFIG_USLEEP is not set
-# CONFIG_UUDECODE is not set
-# CONFIG_UUENCODE is not set
-# CONFIG_WATCH is not set
-# CONFIG_WC is not set
-# CONFIG_WHO is not set
-# CONFIG_WHOAMI is not set
-# CONFIG_YES is not set
-# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-# CONFIG_FEATURE_HUMAN_READABLE is not set
-
-#
-# Common options for md5sum, sha1sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-# CONFIG_CHVT is not set
-# CONFIG_CLEAR is not set
-# CONFIG_DEALLOCVT is not set
-# CONFIG_DUMPKMAP is not set
-# CONFIG_LOADFONT is not set
-# CONFIG_LOADKMAP is not set
-# CONFIG_OPENVT is not set
-# CONFIG_RESET is not set
-# CONFIG_SETCONSOLE is not set
-# CONFIG_SETKEYCODES is not set
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-# CONFIG_READLINK is not set
-# CONFIG_FEATURE_READLINK_FOLLOW is not set
-# CONFIG_RUN_PARTS is not set
-# CONFIG_START_STOP_DAEMON is not set
-# CONFIG_WHICH is not set
-
-#
-# Editors
-#
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
-# CONFIG_PATCH is not set
-CONFIG_SED=y
-# CONFIG_VI is not set
-# CONFIG_FEATURE_VI_COLON is not set
-# CONFIG_FEATURE_VI_YANKMARK is not set
-# CONFIG_FEATURE_VI_SEARCH is not set
-# CONFIG_FEATURE_VI_USE_SIGNALS is not set
-# CONFIG_FEATURE_VI_DOT_CMD is not set
-# CONFIG_FEATURE_VI_READONLY is not set
-# CONFIG_FEATURE_VI_SETOPTS is not set
-# CONFIG_FEATURE_VI_SET is not set
-# CONFIG_FEATURE_VI_WIN_RESIZE is not set
-# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set
-
-#
-# Finding Utilities
-#
-# CONFIG_FIND is not set
-# CONFIG_FEATURE_FIND_MTIME is not set
-# CONFIG_FEATURE_FIND_MMIN is not set
-# CONFIG_FEATURE_FIND_PERM is not set
-# CONFIG_FEATURE_FIND_TYPE is not set
-# CONFIG_FEATURE_FIND_XDEV is not set
-# CONFIG_FEATURE_FIND_NEWER is not set
-# CONFIG_FEATURE_FIND_INUM is not set
-# CONFIG_FEATURE_FIND_EXEC is not set
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-# CONFIG_FEATURE_GREP_CONTEXT is not set
-# CONFIG_XARGS is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
-
-#
-# Init Utilities
-#
-# CONFIG_INIT is not set
-# CONFIG_FEATURE_USE_INITTAB is not set
-# CONFIG_FEATURE_INIT_SCTTY is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-# CONFIG_FEATURE_INITRD is not set
-# CONFIG_HALT is not set
-# CONFIG_MESG is not set
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_FEATURE_SHADOWPASSWDS is not set
-# CONFIG_USE_BB_SHADOW is not set
-# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_ADDGROUP is not set
-# CONFIG_DELGROUP is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_DELUSER is not set
-# CONFIG_GETTY is not set
-# CONFIG_FEATURE_UTMP is not set
-# CONFIG_FEATURE_WTMP is not set
-# CONFIG_LOGIN is not set
-# CONFIG_FEATURE_SECURETTY is not set
-# CONFIG_PASSWD is not set
-# CONFIG_SU is not set
-# CONFIG_SULOGIN is not set
-# CONFIG_VLOCK is not set
-
-#
-# Linux Ext2 FS Progs
-#
-# CONFIG_CHATTR is not set
-# CONFIG_E2FSCK is not set
-# CONFIG_FSCK is not set
-# CONFIG_LSATTR is not set
-# CONFIG_MKE2FS is not set
-# CONFIG_TUNE2FS is not set
-# CONFIG_E2LABEL is not set
-# CONFIG_FINDFS is not set
-
-#
-# Linux Module Utilities
-#
-# CONFIG_INSMOD is not set
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-# CONFIG_RMMOD is not set
-# CONFIG_LSMOD is not set
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-# CONFIG_MODPROBE is not set
-# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set
-# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_2_6_MODULES is not set
-# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
-
-#
-# Linux System Utilities
-#
-# CONFIG_DMESG is not set
-# CONFIG_FBSET is not set
-# CONFIG_FEATURE_FBSET_FANCY is not set
-# CONFIG_FEATURE_FBSET_READMODE is not set
-# CONFIG_FDFLUSH is not set
-# CONFIG_FDFORMAT is not set
-CONFIG_FDISK=y
-FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_FEATURE_FDISK_WRITABLE=y
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-CONFIG_FREERAMDISK=y
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
-# CONFIG_GETOPT is not set
-CONFIG_HEXDUMP=y
-# CONFIG_HWCLOCK is not set
-# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
-# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
-# CONFIG_IPCRM is not set
-# CONFIG_IPCS is not set
-CONFIG_LOSETUP=y
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-# CONFIG_MKSWAP is not set
-CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_NFS=y
-CONFIG_PIVOT_ROOT=y
-# CONFIG_RDATE is not set
-# CONFIG_READPROFILE is not set
-# CONFIG_SETARCH is not set
-# CONFIG_SWAPONOFF is not set
-# CONFIG_SWITCH_ROOT is not set
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_ADJTIMEX is not set
-# CONFIG_BBCONFIG is not set
-# CONFIG_CROND is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-# CONFIG_CRONTAB is not set
-# CONFIG_DC is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_EJECT is not set
-# CONFIG_LAST is not set
-# CONFIG_LESS is not set
-# CONFIG_FEATURE_LESS_BRACKETS is not set
-# CONFIG_FEATURE_LESS_FLAGS is not set
-# CONFIG_FEATURE_LESS_FLAGCS is not set
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_HDPARM is not set
-# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
-# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
-# CONFIG_MAKEDEVS is not set
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
-# CONFIG_MOUNTPOINT is not set
-# CONFIG_MT is not set
-# CONFIG_RUNLEVEL is not set
-# CONFIG_RX is not set
-CONFIG_STRINGS=y
-# CONFIG_SETSID is not set
-# CONFIG_TIME is not set
-# CONFIG_WATCHDOG is not set
-
-#
-# Networking Utilities
-#
-# CONFIG_FEATURE_IPV6 is not set
-# CONFIG_ARPING is not set
-# CONFIG_DNSD is not set
-# CONFIG_ETHER_WAKE is not set
-# CONFIG_FAKEIDENTD is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_HOSTNAME is not set
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-# CONFIG_IFCONFIG is not set
-# CONFIG_FEATURE_IFCONFIG_STATUS is not set
-# CONFIG_FEATURE_IFCONFIG_SLIP is not set
-# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
-# CONFIG_FEATURE_IFCONFIG_HW is not set
-# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
-# CONFIG_IFUPDOWN is not set
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
-# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPX is not set
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
-# CONFIG_INETD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN is not set
-# CONFIG_FEATURE_INETD_RPC is not set
-# CONFIG_IP is not set
-# CONFIG_FEATURE_IP_ADDRESS is not set
-# CONFIG_FEATURE_IP_LINK is not set
-# CONFIG_FEATURE_IP_ROUTE is not set
-# CONFIG_FEATURE_IP_TUNNEL is not set
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
-# CONFIG_NAMEIF is not set
-CONFIG_NC=y
-# CONFIG_NC_GAPING_SECURITY_HOLE is not set
-# CONFIG_NETSTAT is not set
-# CONFIG_NSLOOKUP is not set
-# CONFIG_PING is not set
-# CONFIG_FEATURE_FANCY_PING is not set
-# CONFIG_PING6 is not set
-# CONFIG_FEATURE_FANCY_PING6 is not set
-# CONFIG_ROUTE is not set
-# CONFIG_TELNET is not set
-# CONFIG_FEATURE_TELNET_TTYPE is not set
-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
-# CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_INETD is not set
-# CONFIG_TFTP is not set
-# CONFIG_FEATURE_TFTP_GET is not set
-# CONFIG_FEATURE_TFTP_PUT is not set
-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_FEATURE_TFTP_DEBUG is not set
-# CONFIG_TRACEROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-# CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-# CONFIG_FEATURE_WGET_STATUSBAR is not set
-# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
-# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
-
-#
-# udhcp Server/Client
-#
-# CONFIG_UDHCPD is not set
-# CONFIG_UDHCPC is not set
-# CONFIG_DUMPLEASES is not set
-# CONFIG_FEATURE_UDHCP_SYSLOG is not set
-# CONFIG_FEATURE_UDHCP_DEBUG is not set
-# CONFIG_ZCIP is not set
-
-#
-# Process Utilities
-#
-CONFIG_FREE=y
-# CONFIG_FUSER is not set
-# CONFIG_KILL is not set
-# CONFIG_KILLALL is not set
-# CONFIG_PIDOF is not set
-# CONFIG_FEATURE_PIDOF_SINGLE is not set
-# CONFIG_FEATURE_PIDOF_OMIT is not set
-# CONFIG_PS is not set
-# CONFIG_FEATURE_PS_WIDE is not set
-# CONFIG_RENICE is not set
-# CONFIG_BB_SYSCTL is not set
-# CONFIG_TOP is not set
-# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
-# CONFIG_UPTIME is not set
-
-#
-# Shells
-#
-# CONFIG_FEATURE_SH_IS_ASH is not set
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_LASH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
-CONFIG_FEATURE_SH_IS_NONE=y
-# CONFIG_ASH is not set
-# CONFIG_ASH_JOB_CONTROL is not set
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
-# CONFIG_ASH_ALIAS is not set
-# CONFIG_ASH_MATH_SUPPORT is not set
-# CONFIG_ASH_MATH_SUPPORT_64 is not set
-# CONFIG_ASH_GETOPTS is not set
-# CONFIG_ASH_CMDCMD is not set
-# CONFIG_ASH_BUILTIN_ECHO is not set
-# CONFIG_ASH_MAIL is not set
-# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-# CONFIG_ASH_EXPAND_PRMT is not set
-# CONFIG_HUSH is not set
-# CONFIG_LASH is not set
-# CONFIG_MSH is not set
-# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
-# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
-# CONFIG_FEATURE_COMMAND_EDITING is not set
-# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
-CONFIG_FEATURE_COMMAND_HISTORY=0
-# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
-# CONFIG_FEATURE_COMMAND_TAB_COMPLETION is not set
-# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
-# CONFIG_FEATURE_SH_FANCY_PROMPT is not set
-
-#
-# System Logging Utilities
-#
-# CONFIG_SYSLOGD is not set
-# CONFIG_FEATURE_ROTATE_LOGFILE is not set
-# CONFIG_FEATURE_REMOTE_LOG is not set
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
-# CONFIG_LOGREAD is not set
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-# CONFIG_KLOGD is not set
-# CONFIG_LOGGER is not set
diff --git a/packages/busybox/slingbox-1.1.3/lazy_umount.patch b/packages/busybox/slingbox-1.1.3/lazy_umount.patch
deleted file mode 100644
index d5156d00d3..0000000000
--- a/packages/busybox/slingbox-1.1.3/lazy_umount.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- busybox-1.1.2/util-linux/umount.c~	2006-03-22 15:16:26.000000000 -0600
-+++ busybox-1.1.2/util-linux/umount.c	2006-05-15 11:43:23.000000000 -0500
-@@ -21,7 +21,7 @@
- #include <getopt.h>
- #include "busybox.h"
- 
--#define OPTION_STRING		"flDnrvad"
-+#define OPTION_STRING		"flDnrvadL"
- #define OPT_FORCE			1
- #define OPT_LAZY			2
- #define OPT_DONTFREELOOP	4
-@@ -29,6 +29,7 @@
- #define OPT_REMOUNT			16
- #define OPT_IGNORED			32	// -v is ignored
- #define OPT_ALL				(ENABLE_FEATURE_UMOUNT_ALL ? 64 : 0)
-+#define OPT_LINKSYS_LAZY		256
- 
- int umount_main(int argc, char **argv)
- {
-@@ -51,6 +52,8 @@
- 	argc -= optind;
- 	argv += optind;
- 
-+	if (opt & OPT_LINKSYS_LAZY) opt |= OPT_LAZY; /* -L option same as -l */
-+
- 	doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY));
- 
- 	/* Get a list of mount points from mtab.  We read them all in now mostly
diff --git a/packages/busybox/slingbox-1.1.3/slingbox.patch b/packages/busybox/slingbox-1.1.3/slingbox.patch
deleted file mode 100644
index 3759723bce..0000000000
--- a/packages/busybox/slingbox-1.1.3/slingbox.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- slingbox/applets/install.sh.orig	2006-05-14 18:08:17.000000000 -0500
-+++ slingbox/applets/install.sh	2006-05-14 18:10:40.000000000 -0500
-@@ -33,28 +33,28 @@
- 		fi
- 	done
- fi
--rm -f $prefix/bin/busybox || exit 1
-+rm -f $prefix/bin/slingbox || exit 1
- mkdir -p $prefix/bin || exit 1
--install -m 755 busybox $prefix/bin/busybox || exit 1
-+install -m 755 busybox $prefix/bin/slingbox || exit 1
- 
- for i in $h ; do
- 	appdir=`dirname $i`
- 	mkdir -p $prefix/$appdir || exit 1
- 	if [ "$2" = "--hardlinks" ]; then
--	    bb_path="$prefix/bin/busybox"
-+	    bb_path="$prefix/bin/slingbox"
- 	else
- 	    case "$appdir" in
- 		/)
--		    bb_path="bin/busybox"
-+		    bb_path="bin/slingbox"
- 		;;
- 		/bin)
--		    bb_path="busybox"
-+		    bb_path="slingbox"
- 		;;
- 		/sbin)
--		    bb_path="../bin/busybox"
-+		    bb_path="../bin/slingbox"
- 		;;
- 		/usr/bin|/usr/sbin)
--		    bb_path="../../bin/busybox"
-+		    bb_path="../../bin/slingbox"
- 		;;
- 		*)
- 		echo "Unknown installation directory: $appdir"
diff --git a/packages/busybox/slingbox-1.1.3/slingbox_name.patch b/packages/busybox/slingbox-1.1.3/slingbox_name.patch
deleted file mode 100644
index aeb7221fe2..0000000000
--- a/packages/busybox/slingbox-1.1.3/slingbox_name.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- busybox-1.1.2/applets/applets.c~	2006-03-22 15:16:25.000000000 -0600
-+++ busybox-1.1.2/applets/applets.c	2006-05-15 11:53:18.000000000 -0500
-@@ -447,6 +447,7 @@
- 	if(ENABLE_FEATURE_SUID_CONFIG) parse_config_file ();
- 
- 	if(!strncmp(name, "busybox", 7)) busybox_main(argc, argv);
-+	if(!strncmp(name, "slingbox", 8)) busybox_main(argc, argv);
- 	/* Do a binary search to find the applet entry given the name. */
- 	applet_using = find_applet_by_name(name);
- 	if(applet_using) {
diff --git a/packages/busybox/slingbox-1.2.2/.mtn2git_empty b/packages/busybox/slingbox-1.2.2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/busybox/slingbox-1.2.2/.mtn2git_empty
+++ /dev/null
diff --git a/packages/busybox/slingbox-1.2.2/defconfig b/packages/busybox/slingbox-1.2.2/defconfig
deleted file mode 100644
index 8026cfc2ff..0000000000
--- a/packages/busybox/slingbox-1.2.2/defconfig
+++ /dev/null
@@ -1,643 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-# CONFIG_NITPICK is not set
-# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-CONFIG_FEATURE_VERBOSE_USAGE=y
-CONFIG_FEATURE_COMPRESS_USAGE=y
-# CONFIG_FEATURE_INSTALLER is not set
-# CONFIG_LOCALE_SUPPORT is not set
-CONFIG_GETOPT_LONG=y
-# CONFIG_FEATURE_DEVPTS is not set
-# CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_SUID is not set
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-USING_CROSS_COMPILER=y
-CROSS_COMPILER_PREFIX="armeb-linux-"
-# CONFIG_BUILD_AT_ONCE is not set
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_NO_DEBUG_LIB is not set
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-CONFIG_DEBUG_YANK_SUSv2=y
-
-#
-# Installation Options
-#
-# CONFIG_INSTALL_NO_USR is not set
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-CONFIG_MD5_SIZE_VS_SPEED=2
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-# CONFIG_AR is not set
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-CONFIG_BUNZIP2=y
-CONFIG_CPIO=y
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
-CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
-CONFIG_GZIP=y
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_BZIP2=y
-# CONFIG_FEATURE_TAR_LZMA is not set
-CONFIG_FEATURE_TAR_FROM=y
-CONFIG_FEATURE_TAR_GZIP=y
-CONFIG_FEATURE_TAR_COMPRESS=y
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
-CONFIG_UNCOMPRESS=y
-# CONFIG_UNLZMA is not set
-# CONFIG_FEATURE_LZMA_FAST is not set
-CONFIG_UNZIP=y
-
-#
-# Common options for cpio and tar
-#
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-# CONFIG_FEATURE_DEB_TAR_GZ is not set
-# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
-# CONFIG_FEATURE_DEB_TAR_LZMA is not set
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-# CONFIG_CAL is not set
-CONFIG_CAT=y
-# CONFIG_CATV is not set
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-CONFIG_CHROOT=y
-# CONFIG_CKSUM is not set
-# CONFIG_CMP is not set
-# CONFIG_COMM is not set
-CONFIG_CP=y
-CONFIG_CUT=y
-# CONFIG_DATE is not set
-# CONFIG_FEATURE_DATE_ISOFMT is not set
-CONFIG_DD=y
-# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
-# CONFIG_FEATURE_DD_IBS_OBS is not set
-CONFIG_DF=y
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_BINARY is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_FEATURE_DIFF_MINIMAL is not set
-CONFIG_DIRNAME=y
-CONFIG_DOS2UNIX=y
-CONFIG_UNIX2DOS=y
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-# CONFIG_ENV is not set
-# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
-CONFIG_EXPR=y
-# CONFIG_EXPR_MATH_SUPPORT_64 is not set
-# CONFIG_FALSE is not set
-# CONFIG_FOLD is not set
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-# CONFIG_HOSTID is not set
-CONFIG_ID=y
-# CONFIG_INSTALL is not set
-# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
-# CONFIG_LENGTH is not set
-CONFIG_LN=y
-# CONFIG_LOGNAME is not set
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-# CONFIG_FEATURE_LS_COLOR is not set
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
-# CONFIG_NICE is not set
-# CONFIG_NOHUP is not set
-# CONFIG_OD is not set
-# CONFIG_PRINTENV is not set
-# CONFIG_PRINTF is not set
-CONFIG_PWD=y
-# CONFIG_REALPATH is not set
-CONFIG_RM=y
-CONFIG_RMDIR=y
-# CONFIG_SEQ is not set
-# CONFIG_SHA1SUM is not set
-CONFIG_SLEEP=y
-# CONFIG_FEATURE_FANCY_SLEEP is not set
-CONFIG_SORT=y
-# CONFIG_FEATURE_SORT_BIG is not set
-# CONFIG_STAT is not set
-# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_STTY is not set
-# CONFIG_SUM is not set
-CONFIG_SYNC=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-CONFIG_TEST=y
-# CONFIG_FEATURE_TEST_64 is not set
-CONFIG_TOUCH=y
-# CONFIG_TR is not set
-# CONFIG_FEATURE_TR_CLASSES is not set
-# CONFIG_FEATURE_TR_EQUIV is not set
-# CONFIG_TRUE is not set
-# CONFIG_TTY is not set
-CONFIG_UNAME=y
-CONFIG_UNIQ=y
-# CONFIG_USLEEP is not set
-# CONFIG_UUDECODE is not set
-# CONFIG_UUENCODE is not set
-# CONFIG_WATCH is not set
-# CONFIG_WC is not set
-# CONFIG_WHO is not set
-# CONFIG_WHOAMI is not set
-# CONFIG_YES is not set
-
-#
-# Common options for cp and mv
-#
-# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-# CONFIG_CHVT is not set
-# CONFIG_CLEAR is not set
-# CONFIG_DEALLOCVT is not set
-# CONFIG_DUMPKMAP is not set
-# CONFIG_LOADFONT is not set
-# CONFIG_LOADKMAP is not set
-# CONFIG_OPENVT is not set
-# CONFIG_RESET is not set
-# CONFIG_SETCONSOLE is not set
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-# CONFIG_SETKEYCODES is not set
-# CONFIG_SETLOGCONS is not set
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-# CONFIG_READLINK is not set
-# CONFIG_FEATURE_READLINK_FOLLOW is not set
-# CONFIG_RUN_PARTS is not set
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
-# CONFIG_START_STOP_DAEMON is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
-# CONFIG_WHICH is not set
-
-#
-# Editors
-#
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
-# CONFIG_ED is not set
-# CONFIG_PATCH is not set
-CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-# CONFIG_FEATURE_VI_USE_SIGNALS is not set
-# CONFIG_FEATURE_VI_DOT_CMD is not set
-# CONFIG_FEATURE_VI_READONLY is not set
-# CONFIG_FEATURE_VI_SETOPTS is not set
-# CONFIG_FEATURE_VI_SET is not set
-# CONFIG_FEATURE_VI_WIN_RESIZE is not set
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-# CONFIG_FEATURE_FIND_PRINT0 is not set
-# CONFIG_FEATURE_FIND_MTIME is not set
-# CONFIG_FEATURE_FIND_MMIN is not set
-# CONFIG_FEATURE_FIND_PERM is not set
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-# CONFIG_FEATURE_FIND_NEWER is not set
-# CONFIG_FEATURE_FIND_INUM is not set
-# CONFIG_FEATURE_FIND_EXEC is not set
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-# CONFIG_FEATURE_GREP_CONTEXT is not set
-# CONFIG_XARGS is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
-
-#
-# Init Utilities
-#
-# CONFIG_INIT is not set
-# CONFIG_DEBUG_INIT is not set
-# CONFIG_FEATURE_USE_INITTAB is not set
-# CONFIG_FEATURE_INIT_SCTTY is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-# CONFIG_FEATURE_INITRD is not set
-CONFIG_HALT=y
-# CONFIG_MESG is not set
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_FEATURE_SHADOWPASSWDS is not set
-# CONFIG_USE_BB_SHADOW is not set
-# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_ADDGROUP is not set
-# CONFIG_DELGROUP is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_DELUSER is not set
-# CONFIG_GETTY is not set
-# CONFIG_FEATURE_UTMP is not set
-# CONFIG_FEATURE_WTMP is not set
-# CONFIG_LOGIN is not set
-# CONFIG_FEATURE_SECURETTY is not set
-# CONFIG_PASSWD is not set
-# CONFIG_SU is not set
-# CONFIG_SULOGIN is not set
-# CONFIG_VLOCK is not set
-
-#
-# Linux Ext2 FS Progs
-#
-# CONFIG_CHATTR is not set
-# CONFIG_E2FSCK is not set
-# CONFIG_FSCK is not set
-# CONFIG_LSATTR is not set
-# CONFIG_MKE2FS is not set
-# CONFIG_TUNE2FS is not set
-# CONFIG_E2LABEL is not set
-# CONFIG_FINDFS is not set
-
-#
-# Linux Module Utilities
-#
-CONFIG_INSMOD=y
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-# CONFIG_MODPROBE is not set
-# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set
-
-#
-# Options common to multiple modutils
-#
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_FEATURE_2_4_MODULES=y
-# CONFIG_FEATURE_2_6_MODULES is not set
-CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y
-
-#
-# Linux System Utilities
-#
-CONFIG_DMESG=y
-# CONFIG_FBSET is not set
-# CONFIG_FEATURE_FBSET_FANCY is not set
-# CONFIG_FEATURE_FBSET_READMODE is not set
-# CONFIG_FDFLUSH is not set
-# CONFIG_FDFORMAT is not set
-CONFIG_FDISK=y
-FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_FEATURE_FDISK_WRITABLE=y
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-CONFIG_FREERAMDISK=y
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
-# CONFIG_GETOPT is not set
-CONFIG_HEXDUMP=y
-# CONFIG_HWCLOCK is not set
-# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
-# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
-# CONFIG_IPCRM is not set
-# CONFIG_IPCS is not set
-CONFIG_LOSETUP=y
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-# CONFIG_FEATURE_MDEV_EXEC is not set
-CONFIG_MKSWAP=y
-# CONFIG_FEATURE_MKSWAP_V0 is not set
-CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_NFS=y
-CONFIG_PIVOT_ROOT=y
-# CONFIG_RDATE is not set
-# CONFIG_READPROFILE is not set
-# CONFIG_SETARCH is not set
-CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_ADJTIMEX is not set
-# CONFIG_BBCONFIG is not set
-# CONFIG_CROND is not set
-# CONFIG_DEBUG_CROND_OPTION is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-# CONFIG_CRONTAB is not set
-# CONFIG_DC is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_EJECT is not set
-# CONFIG_LAST is not set
-# CONFIG_LESS is not set
-# CONFIG_FEATURE_LESS_BRACKETS is not set
-# CONFIG_FEATURE_LESS_FLAGS is not set
-# CONFIG_FEATURE_LESS_FLAGCS is not set
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_HDPARM is not set
-# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
-# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
-# CONFIG_MAKEDEVS is not set
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
-# CONFIG_MOUNTPOINT is not set
-# CONFIG_MT is not set
-# CONFIG_RUNLEVEL is not set
-# CONFIG_RX is not set
-CONFIG_STRINGS=y
-# CONFIG_SETSID is not set
-# CONFIG_TASKSET is not set
-# CONFIG_TIME is not set
-# CONFIG_WATCHDOG is not set
-
-#
-# Networking Utilities
-#
-# CONFIG_FEATURE_IPV6 is not set
-# CONFIG_ARPING is not set
-# CONFIG_DNSD is not set
-# CONFIG_ETHER_WAKE is not set
-# CONFIG_FAKEIDENTD is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
-CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set
-# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-# CONFIG_FEATURE_IFCONFIG_SLIP is not set
-# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
-CONFIG_FEATURE_IFCONFIG_HW=y
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
-# CONFIG_IFUPDOWN is not set
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
-# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPX is not set
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
-# CONFIG_INETD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
-# CONFIG_FEATURE_INETD_RPC is not set
-# CONFIG_IP is not set
-# CONFIG_FEATURE_IP_ADDRESS is not set
-# CONFIG_FEATURE_IP_LINK is not set
-# CONFIG_FEATURE_IP_ROUTE is not set
-# CONFIG_FEATURE_IP_TUNNEL is not set
-# CONFIG_FEATURE_IP_SHORT_FORMS is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-# CONFIG_NAMEIF is not set
-CONFIG_NC=y
-# CONFIG_NC_GAPING_SECURITY_HOLE is not set
-# CONFIG_NETSTAT is not set
-# CONFIG_NSLOOKUP is not set
-CONFIG_PING=y
-CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_PING6 is not set
-# CONFIG_FEATURE_FANCY_PING6 is not set
-CONFIG_ROUTE=y
-# CONFIG_TELNET is not set
-# CONFIG_FEATURE_TELNET_TTYPE is not set
-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
-# CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_INETD is not set
-# CONFIG_TFTP is not set
-# CONFIG_FEATURE_TFTP_GET is not set
-# CONFIG_FEATURE_TFTP_PUT is not set
-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_DEBUG_TFTP is not set
-# CONFIG_TRACEROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-
-#
-# udhcp Server/Client
-#
-# CONFIG_APP_UDHCPD is not set
-# CONFIG_APP_UDHCPC is not set
-# CONFIG_APP_DUMPLEASES is not set
-# CONFIG_FEATURE_UDHCP_SYSLOG is not set
-# CONFIG_FEATURE_UDHCP_DEBUG is not set
-# CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-# CONFIG_FEATURE_WGET_STATUSBAR is not set
-# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
-# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-# CONFIG_ZCIP is not set
-
-#
-# Process Utilities
-#
-CONFIG_FREE=y
-# CONFIG_FUSER is not set
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-CONFIG_PIDOF=y
-# CONFIG_FEATURE_PIDOF_SINGLE is not set
-# CONFIG_FEATURE_PIDOF_OMIT is not set
-CONFIG_PS=y
-# CONFIG_FEATURE_PS_WIDE is not set
-# CONFIG_RENICE is not set
-# CONFIG_BB_SYSCTL is not set
-# CONFIG_TOP is not set
-# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
-# CONFIG_UPTIME is not set
-
-#
-# Shells
-#
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_LASH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-CONFIG_ASH=y
-
-#
-# Ash Shell Options
-#
-CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
-# CONFIG_ASH_ALIAS is not set
-CONFIG_ASH_MATH_SUPPORT=y
-# CONFIG_ASH_MATH_SUPPORT_64 is not set
-# CONFIG_ASH_GETOPTS is not set
-# CONFIG_ASH_BUILTIN_ECHO is not set
-# CONFIG_ASH_BUILTIN_TEST is not set
-# CONFIG_ASH_CMDCMD is not set
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-# CONFIG_ASH_EXPAND_PRMT is not set
-# CONFIG_HUSH is not set
-# CONFIG_LASH is not set
-# CONFIG_MSH is not set
-
-#
-# Bourne Shell Options
-#
-# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
-# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
-CONFIG_FEATURE_COMMAND_EDITING=y
-# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
-CONFIG_FEATURE_COMMAND_HISTORY=15
-# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
-CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
-# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
-# CONFIG_FEATURE_SH_FANCY_PROMPT is not set
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-# CONFIG_FEATURE_REMOTE_LOG is not set
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
-# CONFIG_LOGREAD is not set
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-CONFIG_KLOGD=y
-# CONFIG_LOGGER is not set
diff --git a/packages/busybox/slingbox-1.2.2/df_rootfs.patch b/packages/busybox/slingbox-1.2.2/df_rootfs.patch
deleted file mode 100644
index fa7e61af15..0000000000
--- a/packages/busybox/slingbox-1.2.2/df_rootfs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- busybox-1.2.2/coreutils/df.c.orig	2006-11-11 13:25:00.000000000 -0600
-+++ busybox-1.2.2/coreutils/df.c	2006-11-11 13:23:15.000000000 -0600
-@@ -47,6 +47,7 @@
- 	struct statfs s;
- 	static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */
- 	const char *disp_units_hdr = hdr_1k;
-+	int root_done = 0;
- 
- #ifdef CONFIG_FEATURE_HUMAN_READABLE
- 	bb_opt_complementally = "h-km:k-hm:m-hk";
-@@ -112,16 +113,19 @@
- 									   ) / (blocks_used + s.f_bavail);
- 			}
- 
--			if (strcmp(device, "rootfs") == 0) {
--				continue;
--			} else if (strcmp(device, "/dev/root") == 0) {
-+			if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) {
- 				/* Adjusts device to be the real root device,
- 				* or leaves device alone if it can't find it */
--				if ((device = find_block_device("/")) == NULL) {
-+				if ((device = find_block_device(mount_point)) == NULL) {
- 					goto SET_ERROR;
- 				}
- 			}
- 
-+			if (strcmp(mount_point, "/") == 0) {
-+				if (root_done) continue;
-+				root_done = 1;
-+			}
-+
- #ifdef CONFIG_FEATURE_HUMAN_READABLE
- 			bb_printf("%-20s %9s ", device,
- 					  make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
diff --git a/packages/busybox/slingbox-1.2.2/halt.patch b/packages/busybox/slingbox-1.2.2/halt.patch
deleted file mode 100644
index c52e35a8d5..0000000000
--- a/packages/busybox/slingbox-1.2.2/halt.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur busybox-1.2.2/init.orig/halt.c busybox-1.2.2/init/halt.c
---- busybox-1.2.2/init.orig/halt.c	2006-11-10 13:39:29.000000000 -0600
-+++ busybox-1.2.2/init/halt.c	2006-11-10 13:39:09.000000000 -0600
-@@ -12,6 +12,8 @@
- #include <sys/reboot.h>
- #include <unistd.h>
- 
-+#include "init_shared.h"  /* Linksys mods */
-+
- int halt_main(int argc, char *argv[])
- {
- 	static const int magic[] = {
-@@ -40,6 +42,12 @@
- 	if (flags&1) sleep(atoi(delay));
- 	if (!(flags&2)) sync();
- 
-+/* Linksys Halt code - adapted from the Linksys source for Busybox. */
-+	rc = bb_shutdown_system(magic[which]);
-+	if (rc) bb_error_msg("No.");
-+	return rc; /* Shrug */
-+/* End of Linksys code */
-+
- 	/* Perform action. */
- 	if (ENABLE_INIT && !(flags & 4)) {
- 		if (ENABLE_FEATURE_INITRD) {
-diff -Naur busybox-1.2.2/init.orig/init_shared.c busybox-1.2.2/init/init_shared.c
---- busybox-1.2.2/init.orig/init_shared.c	2006-11-10 13:39:29.000000000 -0600
-+++ busybox-1.2.2/init/init_shared.c	2006-11-10 13:38:37.000000000 -0600
-@@ -62,6 +62,11 @@
- 
- 	sync();
- 
-+/* Linksys Halt code - if poweroff or halt, invoke an external program
-+   to do actually turn off the power. */
-+	if (magic != 0x01234567) system("/usr/bin/Set_Led power_off");
-+/* End of Linksys Halt code */
-+
- 	reboot(magic);
- 	return 0; /* Shrug */
- }
diff --git a/packages/busybox/slingbox-1.2.2/lazy_umount.patch b/packages/busybox/slingbox-1.2.2/lazy_umount.patch
deleted file mode 100644
index 345272b8c3..0000000000
--- a/packages/busybox/slingbox-1.2.2/lazy_umount.patch
+++ /dev/null
@@ -1,27 +0,0 @@
----busybox-1.2.2/util-linux/umount.c~	2006-11-04 17:59:20.000000000 -0600
-+++ busybox-1.2.2/util-linux/umount.c	2006-11-04 18:03:55.000000000 -0600
-@@ -16,13 +16,14 @@
- #include <errno.h>
- #include <getopt.h>
- 
--#define OPTION_STRING		"flDnravd"
-+#define OPTION_STRING		"flDnravdL"
- #define OPT_FORCE			1
- #define OPT_LAZY			2
- #define OPT_DONTFREELOOP	4
- #define OPT_NO_MTAB			8
- #define OPT_REMOUNT			16
- #define OPT_ALL				(ENABLE_FEATURE_UMOUNT_ALL ? 32 : 0)
-+#define OPT_LINKSYS_LAZY		256
- 
- int umount_main(int argc, char **argv)
- {
-@@ -45,6 +46,8 @@
- 	argc -= optind;
- 	argv += optind;
- 
-+	if (opt & OPT_LINKSYS_LAZY) opt |= OPT_LAZY; /* -L same as -l */
-+
- 	doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY));
- 
- 	/* Get a list of mount points from mtab.  We read them all in now mostly
diff --git a/packages/busybox/slingbox-1.2.2/slingbox.patch b/packages/busybox/slingbox-1.2.2/slingbox.patch
deleted file mode 100644
index 15f21ed4d0..0000000000
--- a/packages/busybox/slingbox-1.2.2/slingbox.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- slingbox/applets/install.sh.orig	2006-11-04 18:08:47.000000000 -0600
-+++ slingbox/applets/install.sh	2006-11-04 18:11:46.000000000 -0600
-@@ -39,8 +39,8 @@
- 	done
- fi
- 
--if [ "$cleanup" = "1" ] && [ -e "$prefix/bin/busybox" ]; then
--	inode=`ls -i "$prefix/bin/busybox" | awk '{print $1}'`
-+if [ "$cleanup" = "1" ] && [ -e "$prefix/bin/slingbox" ]; then
-+	inode=`ls -i "$prefix/bin/slingbox" | awk '{print $1}'`
- 	sub_shell_it=`
- 	cd "$prefix"
- 	for d in usr/sbin usr/bin sbin bin ; do
-@@ -54,28 +54,28 @@
- 	`
- fi
- 
--rm -f $prefix/bin/busybox || exit 1
-+rm -f $prefix/bin/slingbox || exit 1
- mkdir -p $prefix/bin || exit 1
--install -m 755 busybox $prefix/bin/busybox || exit 1
-+install -m 755 busybox $prefix/bin/slingbox || exit 1
- 
- for i in $h ; do
- 	appdir=`dirname $i`
- 	mkdir -p $prefix/$appdir || exit 1
- 	if [ "$2" = "--hardlinks" ]; then
--		bb_path="$prefix/bin/busybox"
-+		bb_path="$prefix/bin/slingbox"
- 	else
- 		case "$appdir" in
- 		/)
--			bb_path="bin/busybox"
-+			bb_path="bin/slingbox"
- 		;;
- 		/bin)
--			bb_path="busybox"
-+			bb_path="slingbox"
- 		;;
- 		/sbin)
--			bb_path="../bin/busybox"
-+			bb_path="../bin/slingbox"
- 		;;
- 		/usr/bin|/usr/sbin)
--			bb_path="../../bin/busybox"
-+			bb_path="../../bin/slingbox"
- 		;;
- 		*)
- 		echo "Unknown installation directory: $appdir"
diff --git a/packages/busybox/slingbox-1.2.2/slingbox_name.patch b/packages/busybox/slingbox-1.2.2/slingbox_name.patch
deleted file mode 100644
index aeb7221fe2..0000000000
--- a/packages/busybox/slingbox-1.2.2/slingbox_name.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- busybox-1.1.2/applets/applets.c~	2006-03-22 15:16:25.000000000 -0600
-+++ busybox-1.1.2/applets/applets.c	2006-05-15 11:53:18.000000000 -0500
-@@ -447,6 +447,7 @@
- 	if(ENABLE_FEATURE_SUID_CONFIG) parse_config_file ();
- 
- 	if(!strncmp(name, "busybox", 7)) busybox_main(argc, argv);
-+	if(!strncmp(name, "slingbox", 8)) busybox_main(argc, argv);
- 	/* Do a binary search to find the applet entry given the name. */
- 	applet_using = find_applet_by_name(name);
- 	if(applet_using) {
diff --git a/packages/busybox/slingbox-1.2.2/wget-long-options.patch b/packages/busybox/slingbox-1.2.2/wget-long-options.patch
deleted file mode 100644
index 3c5920a3cb..0000000000
--- a/packages/busybox/slingbox-1.2.2/wget-long-options.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- busybox-1.2.1.orig/networking/wget.c
-+++ busybox-1.2.1/networking/wget.c
-@@ -136,7 +136,7 @@
- #define WGET_OPT_PREFIX	32
- #define WGET_OPT_PROXY	64
- 
--#if ENABLE_WGET_LONG_OPTIONS
-+#if CONFIG_FEATURE_WGET_LONG_OPTIONS
- static const struct option wget_long_options[] = {
- 	{ "continue",        0, NULL, 'c' },
- 	{ "quiet",           0, NULL, 'q' },
-@@ -180,7 +180,7 @@
- 	 * Crack command line.
- 	 */
- 	bb_opt_complementally = "-1:\203::";
--#if ENABLE_WGET_LONG_OPTIONS
-+#if CONFIG_FEATURE_WGET_LONG_OPTIONS
- 	bb_applet_long_options = wget_long_options;
- #endif
- 	opt = bb_getopt_ulflags(argc, argv, "cq\213O:\203:P:Y:",
diff --git a/packages/busybox/slingbox_1.00.bb b/packages/busybox/slingbox_1.00.bb
deleted file mode 100644
index e52a1b4eb6..0000000000
--- a/packages/busybox/slingbox_1.00.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \
-to enable ipkg to run on an Unslung NSLU2 device."
-HOMEPAGE = "http://www.busybox.net"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "required"
-PR = "r10"
-COMPATIBLE_MACHINE = "nslu2"
-
-SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
-           file://defconfig \
-           file://lazy_umount.patch;patch=1 \
-           file://slingbox.patch;patch=1"
-
-S = "${WORKDIR}/busybox-${PV}"
-
-export EXTRA_CFLAGS = "${CFLAGS}"
-EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
-
-FILES_${PN} = "/"
-FILES_${PN}-doc = ""
-FILES_${PN}-dev = ""
-FILES_${PN}-locale = ""
-
-inherit cml1
-
-do_configure () {
-	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
-	cml1_do_configure
-}
-
-do_compile () {
-	unset CFLAGS
-	base_do_compile
-}
-
-do_install () {
-	oe_runmake 'PREFIX=${D}' install
-}
diff --git a/packages/busybox/slingbox_1.1.3.bb b/packages/busybox/slingbox_1.1.3.bb
deleted file mode 100644
index b290841eed..0000000000
--- a/packages/busybox/slingbox_1.1.3.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \
-to enable ipkg to run on an Unslung NSLU2 device."
-HOMEPAGE = "http://www.busybox.net"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "required"
-PR = "r3"
-COMPATIBLE_MACHINE = "nslu2"
-
-SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
-           file://defconfig \
-           file://Makefile_args.patch;patch=1 \
-           file://lazy_umount.patch;patch=1 \
-           file://slingbox_name.patch;patch=1 \
-           file://slingbox.patch;patch=1"
-
-S = "${WORKDIR}/busybox-${PV}"
-
-export EXTRA_CFLAGS = "${CFLAGS}"
-EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
-
-FILES_${PN} = "/"
-FILES_${PN}-doc = ""
-FILES_${PN}-dev = ""
-FILES_${PN}-locale = ""
-
-inherit cml1
-
-do_configure () {
-	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
-	cml1_do_configure
-}
-
-do_compile () {
-	unset CFLAGS
-	base_do_compile
-	# Just in case fdisk is compiled in, do not overwrite the Linksys one
-	sed -i -e '/fdisk/d' ${S}/busybox.links
-}
-
-do_install () {
-	oe_runmake 'PREFIX=${D}' install
-}
diff --git a/packages/busybox/slingbox_1.2.2.bb b/packages/busybox/slingbox_1.2.2.bb
deleted file mode 100644
index 1a3eaa3985..0000000000
--- a/packages/busybox/slingbox_1.2.2.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \
-to enable ipkg to run on an Unslung NSLU2 device."
-HOMEPAGE = "http://www.busybox.net"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "required"
-PR = "r4"
-COMPATIBLE_MACHINE = "nslu2"
-
-SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
-           file://defconfig \
-           file://wget-long-options.patch;patch=1 \
-           file://lazy_umount.patch;patch=1 \
-           file://df_rootfs.patch;patch=1 \
-           file://slingbox_name.patch;patch=1 \
-           file://halt.patch;patch=1" \
-           file://slingbox.patch;patch=1"
-
-S = "${WORKDIR}/busybox-${PV}"
-
-export EXTRA_CFLAGS = "${CFLAGS}"
-EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
-
-FILES_${PN} = "/"
-FILES_${PN}-doc = ""
-FILES_${PN}-dev = ""
-FILES_${PN}-locale = ""
-
-inherit cml1
-
-do_configure () {
-	install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe
-	echo "CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"" > ${S}/.config
-	echo "USING_CROSS_COMPILER=y" >> ${S}/.config
-	sed -e 	'/CROSS_COMPILER_PREFIX/d' \
-	    -e 	'/USING_CROSS_COMPILER/d' \
-		'${S}/.config.oe' >>'${S}/.config'
-	cml1_do_configure
-}
-
-do_compile () {
-	unset CFLAGS
-	base_do_compile
-	# Just in case fdisk is compiled in, do not overwrite the Linksys one
-	sed -i -e '/fdisk/d' ${S}/busybox.links
-}
-
-do_install () {
-	oe_runmake "PREFIX=${D}" install
-	cp -pPR ${S}/_install/* ${D}/
-}
diff --git a/packages/e17/enna_cvs.bb b/packages/e17/enna_cvs.bb
index 7f2c6eb632..3ea77940b4 100644
--- a/packages/e17/enna_cvs.bb
+++ b/packages/e17/enna_cvs.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Enna is a media center application based on EFL"
 LICENSE = "GPL"
-DEPENDS = "curl dbus eet evas edje ecore edbus emotion libmusicbrainz libxml2 taglibc"
+DEPENDS = "curl dbus eet evas edje ecore edbus emotion"
+DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglibc"
 SECTION = "x11/multimedia"
 PV = "0.2.0+cvs${SRCDATE}"
 
diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc
index 237971c9c7..d2630e5e43 100644
--- a/packages/gpsd/gpsd.inc
+++ b/packages/gpsd/gpsd.inc
@@ -3,7 +3,7 @@ SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "dbus-glib ncurses python"
-RDEPENDS = "gpsd-conf"
+RDEPENDS_${PN} = "gpsd-conf gpsd-gpsctl"
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
                 --x-libraries=${STAGING_LIBDIR} \
@@ -12,12 +12,12 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
 
 SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \
            file://gpsd-default \
-	   file://gps-hardware \
+           file://gps-hardware \
            file://gpsd"
 
 SRC_URI_append_fic-gta01 = " \
-			    file://restart_gllin.sh \
-			   "
+           file://restart_gllin.sh \
+"
 			   
 inherit autotools update-rc.d
 
@@ -47,7 +47,7 @@ do_install_append() {
         install -d ${D}/${sysconfdir}/init.d
         install -d ${D}/dev
         install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/
-	install -m 0755 ${WORKDIR}/gps-hardware ${D}/${sysconfdir}/init.d/gps-hardware.default
+        install -m 0755 ${WORKDIR}/gps-hardware ${D}/${sysconfdir}/init.d/gps-hardware.default
         install -d ${D}/${sysconfdir}/default
         install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default
 }
@@ -69,14 +69,18 @@ pkg_postrm_${PN}-conf() {
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 
-PACKAGES =+ "libgps python-pygps gpsd-conf"
+PACKAGES =+ "libgps python-pygps gpsd-conf gpsd-gpsctl gps-utils"
 
 PACKAGE_ARCH_gpsd-conf = "${MACHINE_ARCH}"
 
 FILES_libgps = "${libdir}/*.so.*"
 FILES_gpsd-conf = "${sysconfdir}"
+FILES_gpsd-gpsctl = "${bindir}/gpsctl"
+FILES_gps-utils = "${bindir}/*"
+# might split them up even more fine granular
+RDEPENDS_gps-utils = "python-pygps"
 
 DESCRIPTION_python-pygps = "Python bindings to gpsd"
 FILES_python-pygps = "${libdir}/*/site-packages/*"
-RDEPENDS_python-pygps = "python-core gpsd"
+RDEPENDS_python-pygps = "python-core python-ncurses gpsd"
 
diff --git a/packages/gpsd/gpsd_2.28.bb b/packages/gpsd/gpsd_2.28.bb
index 7094893b99..d5a02e27b4 100644
--- a/packages/gpsd/gpsd_2.28.bb
+++ b/packages/gpsd/gpsd_2.28.bb
@@ -1,2 +1,3 @@
 require gpsd.inc
-PR = "r8"
+
+PR = "r9"
diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb
index ea9fe4f550..8e46cb01eb 100644
--- a/packages/gpsd/gpsd_2.34.bb
+++ b/packages/gpsd/gpsd_2.34.bb
@@ -1,4 +1,4 @@
 require gpsd.inc
 
-PR = "r8"
+PR = "r9"
 
diff --git a/packages/gpsd/gpsd_2.36.bb b/packages/gpsd/gpsd_2.36.bb
index 726ba42481..b3cc2f1f19 100644
--- a/packages/gpsd/gpsd_2.36.bb
+++ b/packages/gpsd/gpsd_2.36.bb
@@ -1,3 +1,3 @@
 require gpsd.inc
 
-PR = "r2"
+PR = "r4"
diff --git a/packages/busybox/busybox-1.7.2/files/.mtn2git_empty b/packages/lightmediascanner/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/busybox/busybox-1.7.2/files/.mtn2git_empty
+++ b/packages/lightmediascanner/.mtn2git_empty
diff --git a/packages/lightmediascanner/lightmediascanner_svn.bb b/packages/lightmediascanner/lightmediascanner_svn.bb
new file mode 100644
index 0000000000..702dcbe3f3
--- /dev/null
+++ b/packages/lightmediascanner/lightmediascanner_svn.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Lightweight media scanner meant to be used in not-so-powerful devices"
+SECTION = "libs/multimedia"
+HOMEPAGE = "http://lms.garage.maemo.org/"
+AUTHOR = "Gustavo Barbieri"
+LICENSE = "LGPL"
+DEPENDS = "sqlite3"
+PV = "0.1.0+svn${SRCREV}"
+
+SRC_URI = "svn://garage.maemo.org/svn/lms/;module=lightmediascanner;proto=https"
+S = "${WORKDIR}/lightmediascanner"
+
+inherit autotools pkgconfig
+
+FILES_${PN}-dbg += "${libdir}/${PN}/plugins/.debug"
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/python/python-lightmediascanner_svn.bb b/packages/python/python-lightmediascanner_svn.bb
new file mode 100644
index 0000000000..27d0bb62f1
--- /dev/null
+++ b/packages/python/python-lightmediascanner_svn.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Python bindings to the Lightweight media scanner"
+SECTION = "devel/python"
+HOMEPAGE = "http://lms.garage.maemo.org/"
+AUTHOR = "Gustavo Barbieri"
+LICENSE = "LGPL"
+DEPENDS = "lightmediascanner"
+PV = "0.1.0+svn${SRCREV}"
+
+SRC_URI = "svn://garage.maemo.org/svn/lms/;module=python-lightmediascanner;proto=https"
+S = "${WORKDIR}/python-lightmediascanner"
+
+inherit distutils
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index 61daa7e089..a23589111d 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,7 +1,7 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml24"
+PR = "ml25"
 
 RDEPENDS = "\
 		python-ao 		\
@@ -30,6 +30,7 @@ RDEPENDS = "\
 		python-itools		\
 		python-logilab-common		\
 		python-libgmail		\
+		python-lightmediascanner \
 		python-lxml		\
 		python-mad		\
 		python-numarray		\
diff --git a/packages/xorg-driver/xf86-input-acecad_1.2.1.bb b/packages/xorg-driver/xf86-input-acecad_1.2.1.bb
new file mode 100644
index 0000000000..c993bc7718
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-acecad_1.2.1.bb
@@ -0,0 +1,5 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- AceCad input driver"
+PE = "1"
+
diff --git a/packages/xorg-driver/xf86-input-calcomp_1.1.1.bb b/packages/xorg-driver/xf86-input-calcomp_1.1.1.bb
new file mode 100644
index 0000000000..a309230801
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-calcomp_1.1.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- Calcomp input driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-input-citron_2.2.1.bb b/packages/xorg-driver/xf86-input-citron_2.2.1.bb
new file mode 100644
index 0000000000..4c449b12d7
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-citron_2.2.1.bb
@@ -0,0 +1,5 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X Server -- Citron input driver"
+PE = "1"
+
diff --git a/packages/xorg-driver/xf86-input-dmc_1.1.1.bb b/packages/xorg-driver/xf86-input-dmc_1.1.1.bb
new file mode 100644
index 0000000000..fea3ce83aa
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-dmc_1.1.1.bb
@@ -0,0 +1,5 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- DMC input driver"
+PE = "1"
+
diff --git a/packages/xorg-driver/xf86-input-dynapro_1.1.1.bb b/packages/xorg-driver/xf86-input-dynapro_1.1.1.bb
new file mode 100644
index 0000000000..0033ffe7fa
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-dynapro_1.1.1.bb
@@ -0,0 +1,5 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- Dynapro input driver"
+PE = "1"
+
diff --git a/packages/xorg-driver/xf86-input-elo2300_1.1.1.bb b/packages/xorg-driver/xf86-input-elo2300_1.1.1.bb
new file mode 100644
index 0000000000..7841287fb0
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-elo2300_1.1.1.bb
@@ -0,0 +1,5 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- ELO2300 input driver"
+PE = "1"
+
diff --git a/packages/xorg-driver/xf86-input-elographics_1.1.0.bb b/packages/xorg-driver/xf86-input-elographics_1.1.0.bb
new file mode 100644
index 0000000000..cb49a58d4c
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-elographics_1.1.0.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- ELOGraphics input driver"
+PE = "2"
diff --git a/packages/xorg-driver/xf86-input-evdev_1.2.0.bb b/packages/xorg-driver/xf86-input-evdev_1.2.0.bb
new file mode 100644
index 0000000000..792909621a
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-evdev_1.2.0.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-input-joystick_1.3.1.bb b/packages/xorg-driver/xf86-input-joystick_1.3.1.bb
new file mode 100644
index 0000000000..a53297fd8a
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-joystick_1.3.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- joystick input driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-input-magellan_1.1.1.bb b/packages/xorg-driver/xf86-input-magellan_1.1.1.bb
new file mode 100644
index 0000000000..2bbf253d53
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-magellan_1.1.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- Magellan input driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-input-microtouch_1.1.1.bb b/packages/xorg-driver/xf86-input-microtouch_1.1.1.bb
new file mode 100644
index 0000000000..9a90a80b9f
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-microtouch_1.1.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- MicroTouch input driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-input-mouse_1.2.3.bb b/packages/xorg-driver/xf86-input-mouse_1.2.3.bb
new file mode 100644
index 0000000000..e6325675f8
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-mouse_1.2.3.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-input-penmount_1.2.1.bb b/packages/xorg-driver/xf86-input-penmount_1.2.1.bb
new file mode 100644
index 0000000000..1ed62d4cad
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-penmount_1.2.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- Penmount input driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-input-spaceorb_1.1.1.bb b/packages/xorg-driver/xf86-input-spaceorb_1.1.1.bb
new file mode 100644
index 0000000000..cf099b8193
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-spaceorb_1.1.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- SpaceOrb input driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-input-vmmouse_12.4.3.bb b/packages/xorg-driver/xf86-input-vmmouse_12.4.3.bb
new file mode 100644
index 0000000000..7af9f7ddc9
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-vmmouse_12.4.3.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-input-void_1.1.1.bb b/packages/xorg-driver/xf86-input-void_1.1.1.bb
new file mode 100644
index 0000000000..2fa7021d95
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-void_1.1.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- void input driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-ati_6.7.197.bb b/packages/xorg-driver/xf86-video-ati_6.7.197.bb
new file mode 100644
index 0000000000..4aae05a747
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-ati_6.7.197.bb
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- ATI display driver"
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-i128_1.2.1.bb b/packages/xorg-driver/xf86-video-i128_1.2.1.bb
new file mode 100644
index 0000000000..78d5eda810
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-i128_1.2.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- i128 display driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-i810_1.7.4.bb b/packages/xorg-driver/xf86-video-i810_1.7.4.bb
new file mode 100644
index 0000000000..eed1fcb600
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-i810_1.7.4.bb
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-mga_1.9.99.bb b/packages/xorg-driver/xf86-video-mga_1.9.99.bb
new file mode 100644
index 0000000000..0ed0d28dfd
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-mga_1.9.99.bb
@@ -0,0 +1,4 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- MGA display driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-nsc_2.8.3.bb b/packages/xorg-driver/xf86-video-nsc_2.8.3.bb
new file mode 100644
index 0000000000..96486d2e72
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-nsc_2.8.3.bb
@@ -0,0 +1,9 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- NSC display driver"
+DEPENDS += " xf86dgaproto"
+PE = "1"
+
+# This driver is broken because it's seldom updated. It compiles
+# but fails to communicate with the card without this deprecated define.
+EXTRA_OEMAKE += "CFLAGS+=-DXFree86Server"
diff --git a/packages/xorg-driver/xf86-video-nv_2.1.7.bb b/packages/xorg-driver/xf86-video-nv_2.1.7.bb
new file mode 100644
index 0000000000..0d4ee2ed19
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-nv_2.1.7.bb
@@ -0,0 +1,4 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- NV display driver"
+PE = "1"
diff --git a/packages/xorg-driver/xf86-video-sis_0.9.4.bb b/packages/xorg-driver/xf86-video-sis_0.9.4.bb
new file mode 100644
index 0000000000..dd6e106e0d
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-sis_0.9.4.bb
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- SiS display driver"
+DEPENDS += " xineramaproto xf86miscproto xf86dgaproto drm xf86driproto"
+PE = "1"
diff --git a/packages/xorg-lib/libxmu_1.0.4.bb b/packages/xorg-lib/libxmu_1.0.4.bb
new file mode 100644
index 0000000000..396e2a2d4b
--- /dev/null
+++ b/packages/xorg-lib/libxmu_1.0.4.bb
@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 miscellaneous utility library"
+DEPENDS += "libxt libxext"
+PROVIDES = "xmu"
+PE = "1"
+
+XORG_PN = "libXmu"
+
+LEAD_SONAME = "libXmu"
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
diff --git a/packages/xorg-proto/xproto-native_7.0.11.bb b/packages/xorg-proto/xproto-native_7.0.11.bb
new file mode 100644
index 0000000000..baae28ec32
--- /dev/null
+++ b/packages/xorg-proto/xproto-native_7.0.11.bb
@@ -0,0 +1,5 @@
+require xproto_${PV}.bb
+
+XORG_PN = "xproto"
+
+inherit native