merge of 885d90470dc44f85332ae3b62f38a1f1cf91b4c5

     and c9530ced58773f4fa9498d173533e73615774c22

8 files changed, 33 insertions, 43 deletions

diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb
deleted file mode 100644
index f16f61c795..0000000000
--- a/packages/meta/e-image.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-export IMAGE_BASENAME = "e-image"
-
-DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/evas = "evas-x11"
-PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
-PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
-
-export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11 xserver-kdrive-fbdev"
-
-inherit image_ipk
-LICENSE = MIT
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index 8c2729dabe..b4f3558e93 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta-package for Enlightenment/X11"
 LICENSE = "MIT"
 PACKAGES = "task-enlightenment-x11"
-PR = "r1"
+PR = "r2"
 
 FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
               e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
@@ -11,12 +11,14 @@ ALLOW_EMPTY = 1
 #
 # X
 #
-DEPENDS  += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig ttf-bitstream-vera"
-RDEPENDS += "         rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo            ttf-bitstream-vera"
+DEPENDS  += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \
+             ttf-bitstream-vera bash"
+RDEPENDS += "         rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo            \
+             ttf-bitstream-vera"
 
 #
 # E
 #
-DEPENDS  += "entrance e-wm entice"
-RDEPENDS += "entrance e-wm entice"
+DEPENDS  += "entrance e-wm entice eclair examine "
+RDEPENDS += "entrance e-wm entice eclair examine "
 
diff --git a/packages/meta/meta-opie-dynamic.bb b/packages/meta/meta-opie-dynamic.bb
deleted file mode 100644
index a1a2bb262d..0000000000
--- a/packages/meta/meta-opie-dynamic.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-BROKEN = 1
-#
-# FIXME:
-# we need to get the necessary support from the OE infrastructure
-# to allow the dynamic package to work
-#
-DESCRIPTION = "Meta-package for Opie"
-
-def opie_packages(d):
-	import bb, os
-	files = os.listdir( bb.data.getVar( "TOPDIR", d, True ) )
-	pkgs = [ f for f in files if f.startswith( "opie-" ) and f != "opie-3rdparty" ]
-        return " ".join( pkgs )
-
-OPIE_PACKAGES := "${@opie_packages(d)}"
-
-DEPENDS = "qte libqpe-opie libopie2 manufacturers ${OPIE_PACKAGES}"
-
-LICENSE = MIT
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index 6672dd7a18..065a109251 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta-package for Opie and QPE"
 SECTION = "opie/base"
 ALLOW_EMPTY = 1
-PR = "r24"
+PR = "r25"
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 
@@ -273,7 +273,6 @@ opie-mediaplayer2-skin-default \
 opie-mediaplayer2-skin-default-landscape \
 opie-mediaplayer2-skin-pod \
 opie-mediaplayer2-skin-techno \
-opie-mediaplayer2-divx \
 opie-powerchord \
 opie-recorder \
 opie-tonleiter \
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index db150f7972..d8526fb64b 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -44,6 +44,8 @@ OPENSLUG_PACKAGES = "\
 	gzip \
 	iperf \
 	ipkg-utils \
+	iptables \
+	joe \
 	jpeg \
 	less \
 	libpam \
@@ -107,13 +109,17 @@ OPENSLUG_PACKAGES = "\
 	tiff \
 	timezones \
 	unionfs-modules unionfs-utils \
+	usbutils \
 	util-linux \
 	vlan \
+	vsftpd \
 	wakelan \
 	watchdog \
+	wireless-tools \
 	wget \
 	xinetd \
 	yp-tools ypbind ypserv \
+	zd1211 \
 	zlib \
 	"
 
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index 60cc77356a..052ddac474 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -77,10 +77,10 @@ OPIE_EXTRA_SETTINGS = "opie-language opie-launcher-settings opie-doctab opie-sec
 
 OPIE_DEPENDS_24  = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop \
                     qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix   \
-                    opie-irc "
+                    opie-irc opie-mediaplayer2"
 OPIE_RDEPENDS_24 = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop \
                     qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix   \
-                    opie-irc "
+                    opie-irc opie-mediaplayer2 libxine-plugin-decode-ff libxine-plugin-dmx-avi"
 
 #
 #
diff --git a/packages/meta/unslung-binary-kernel-packages.bb b/packages/meta/unslung-binary-kernel-packages.bb
new file mode 100644
index 0000000000..dfe2ec029e
--- /dev/null
+++ b/packages/meta/unslung-binary-kernel-packages.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Packages that are compatible with the Unslung binary kernel firmware"
+LICENSE = MIT
+PR = "r0"
+
+ALLOW_EMPTY = 1
+PACKAGES = "${PN}"
+
+UNSLUNG_PACKAGES = "\
+	"
+
+BROKEN_PACKAGES = "\
+	"
+
+DEPENDS = 'unslung-image \
+	${UNSLUNG_PACKAGES} \
+	package-index'
diff --git a/packages/meta/unslung-image.bb b/packages/meta/unslung-image.bb
index a6277afcf7..7fa1b1cd4c 100644
--- a/packages/meta/unslung-image.bb
+++ b/packages/meta/unslung-image.bb
@@ -47,7 +47,6 @@ unslung_clean_image () {
 python () {
 	# Don't build unslung images unless we're targeting an nslu2
 	mach = bb.data.getVar("MACHINE", d, 1)
-	dist = bb.data.getVar("DISTRO", d, 1)
-	if mach != 'nslu2' or dist != 'unslung':
+	if mach != 'nslu2':
 		raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
 }