python(openslug), openslug kernel: enable tcl/tk in python, move kernel to 2.6.14-rc2

The changes overlap (in conf/distro/openslug.conf), the kernel change is, however,
only the version change in that file.

7 files changed, 27 insertions, 6 deletions

diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 7a9cb67bca..130d54481e 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -171,6 +171,7 @@ ${PKGDIR}/packages/sysfsutils/*.bb \
 ${PKGDIR}/packages/syslog-ng/*.bb \
 ${PKGDIR}/packages/sysvinit/*.bb \
 ${PKGDIR}/packages/tar/*.bb \
+${PKGDIR}/packages/tcltk/*.bb \
 ${PKGDIR}/packages/thttpd/*.bb \
 ${PKGDIR}/packages/timezones/*.bb \
 ${PKGDIR}/packages/tinylogin/*.bb \
@@ -188,7 +189,13 @@ ${PKGDIR}/packages/vsftpd/*.bb \
 ${PKGDIR}/packages/wakelan/*.bb \
 ${PKGDIR}/packages/wget/*.bb \
 ${PKGDIR}/packages/wireless-tools/*.bb \
+${PKGDIR}/packages/x11/*.bb \
+${PKGDIR}/packages/xau/*.bb \
+${PKGDIR}/packages/xdmcp/*.bb \
+${PKGDIR}/packages/xextensions/*.bb \
 ${PKGDIR}/packages/xinetd/*.bb \
+${PKGDIR}/packages/xproto/*.bb \
+${PKGDIR}/packages/xtrans/*.bb \
 ${PKGDIR}/packages/zd1211/*.bb \
 ${PKGDIR}/packages/zlib/*.bb \
 ${OPENSLUG_EXTRA_BBFILES}"
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 3d0f4867c8..fb6a48b78d 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -157,10 +157,14 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 
+# Select the smallest provider of x11 libraries
+PREFERRED_PROVIDER_x11 ?= "diet-x11"
+CVSDATE_diet-xll ?= "20050930"
+
 # Select the correct versions of the kernel and modules
 PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2"
+PREFERRED_VERSION_openslug-kernel ?= "2.6.14-rc2"
 
 PREFERRED_VERSION_ixp4xx-csr ?= "1.4"
 PREFERRED_VERSION_ixp425-eth ?= "1.1"
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index 77d1219365..a3cee488b5 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -155,6 +155,7 @@ ${PKGDIR}/packages/sysfsutils/*.bb \
 ${PKGDIR}/packages/syslog-ng/*.bb \
 ${PKGDIR}/packages/sysvinit/*.bb \
 ${PKGDIR}/packages/tar/*.bb \
+${PKGDIR}/packages/tcltk/*.bb \
 ${PKGDIR}/packages/thttpd/*.bb \
 ${PKGDIR}/packages/timezones/*.bb \
 ${PKGDIR}/packages/tinylogin/*.bb \
@@ -173,5 +174,11 @@ ${PKGDIR}/packages/vsftpd/*.bb \
 ${PKGDIR}/packages/wakelan/*.bb \
 ${PKGDIR}/packages/wget/*.bb \
 ${PKGDIR}/packages/wireless-tools/*.bb \
+${PKGDIR}/packages/x11/*.bb \
+${PKGDIR}/packages/xau/*.bb \
+${PKGDIR}/packages/xdmcp/*.bb \
+${PKGDIR}/packages/xextensions/*.bb \
+${PKGDIR}/packages/xproto/*.bb \
+${PKGDIR}/packages/xtrans/*.bb \
 ${PKGDIR}/packages/zlib/*.bb \
 ${UCSLUGC_EXTRA_BBFILES}"
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 82b4b67ab8..c4db50c1e3 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -129,6 +129,10 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 
+# Select the smallest provider of x11 libraries
+PREFERRED_PROVIDER_x11 ?= "diet-x11"
+CVSDATE_diet-xll ?= "20050930"
+
 # Select the correct versions of the kernel and modules
 PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 5a87441a2b..03af44953c 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -133,6 +133,7 @@ CVSDATE_gnu-config-native ?= "20050713"
 CVSDATE_ipkg-utils ?= "20050713"
 CVSDATE_ipkg-utils-native ?= "20050713"
 CVSDATE_ipkg-link ?= "20050713"
+CVSDATE_irssi ?= "20050930"
 
 CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
 INHERIT += "nslu2-mirrors"
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 2bb137df35..3e23e80b1b 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -97,7 +97,6 @@ OPENSLUG_PACKAGES = "\
 	procps \
 	psmisc \
 	puppy \
-	pvrusb2-mci \
 	pwc \
 	python \
 	qc-usb-messenger \
@@ -130,14 +129,15 @@ OPENSLUG_PACKAGES = "\
 	wget \
 	xinetd \
 	yp-tools ypbind ypserv \
-	zd1211 \
 	zlib \
 	"
 
 BROKEN_PACKAGES = "\
 	groff \
 	icecast \
+	pvrusb2-mci \
 	watchdog \
+	zd1211 \
 	"
 
 DEPENDS = 'openslug-image \
diff --git a/packages/python/python_2.4.2.bb b/packages/python/python_2.4.2.bb
index 3b25a84c1b..f29e0dc6d1 100644
--- a/packages/python/python_2.4.2.bb
+++ b/packages/python/python_2.4.2.bb
@@ -5,9 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PROVIDES = "python python-core"
-DEPENDS_GUI = "tcl tk"
-DEPENDS_GUI_nslu2 = ""
-DEPENDS = "python-native readline zlib gdbm openssl ${DEPENDS_GUI}"
+DEPENDS = "python-native readline zlib gdbm openssl tcl tk"
 PR = "ml1"
 
 PYTHON_MAJMIN = "2.4"