Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/08 11:56:10+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/06/08 11:55:46+02:00 uni-frankfurt.de!mickeyl
make python-2.4.1.bb actually build python 2.4.1 and not python 2.4.0 (oops). Thanks jacques for spotting that.

2005/06/08 10:54:41+01:00 rpsys.net!RP
linux-oz-2.6: Upgrade to 2.6.12-rc5-mm2, add copypage fix, update hx2750 patches

BKrev: 42a6cb13XpBozHfDSS_AQX6sFAeT-g

12 files changed, 3 insertions, 184 deletions

diff --git a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/add-elpp-stuff.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/add-elpp-stuff.patch
+++ b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/add-elpp-stuff.patch
diff --git a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/add-oz-release-string.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/add-oz-release-string.patch
+++ b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/defconfig-c7x0
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/defconfig-c7x0
diff --git a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/defconfig-collie b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/defconfig-collie
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/defconfig-collie
+++ b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/defconfig-ipaq-pxa-2.6 b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/defconfig-ipaq-pxa-2.6
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/defconfig-ipaq-pxa-2.6
+++ b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/defconfig-ipaq-pxa-2.6
diff --git a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/defconfig-poodle
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/defconfig-poodle
+++ b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/defconfig-spitz
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/defconfig-spitz
+++ b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/defconfig-spitz
diff --git a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/defconfig-tosa
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/defconfig-tosa
+++ b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/pxa-serial-hack.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.12-rc4-mm2/pxa-serial-hack.patch
+++ b/packages/linux/linux-openzaurus-2.6.12-rc5-mm2/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus_2.6.12-rc4-mm2.bb b/packages/linux/linux-openzaurus_2.6.12-rc4-mm2.bb
deleted file mode 100644
index ca8b4527ae..0000000000
--- a/packages/linux/linux-openzaurus_2.6.12-rc4-mm2.bb
+++ /dev/null
@@ -1,181 +0,0 @@
-DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices and iPAQ hx2750."
-SECTION = "kernel"
-MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>"
-LICENSE = "GPL"
-#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
-KV = "${@bb.data.getVar('PV',d,True)}"
-
-PR = "r6"
-
-DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
-RPSRC = "http://www.rpsys.net/openzaurus/patches"
-JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files"
-BASRC = "http://www.orca.cx/zaurus/patches"
-
-# Handy URLs
-# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-${KV}.tar.gz \
-# http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \
-# http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.11-rc1-bk7.gz;patch=1 \
-# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.11-rc5.bz2;patch=1 \
-
-#           ${RPSRC}/corgi_kbd1-r1.patch;patch=1 \
-#           ${RPSRC}/sharpsl_mapprom-r1.patch;patch=1 \
-
-# Patches submitted upstream are towards top of this list 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
-           ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.12-rc4.bz2;patch=1 \
-           ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc4/2.6.12-rc4-mm2/2.6.12-rc4-mm2.bz2;patch=1 \
-           ${RPSRC}/mmtree_fix-r1.patch;patch=1 \
-           ${RPSRC}/mmtree_pcmcia-r0.patch;patch=1 \
-           ${RPSRC}/machtype_update-r1.patch;patch=1 \
-           ${RPSRC}/corgi_kbd3-r6.patch;patch=1 \
-           ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
-           ${RPSRC}/pxa_irda-r2.patch;patch=1 \
-           ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \
-           ${RPSRC}/input_power-r2.patch;patch=1 \
-           ${RPSRC}/corgi_irda-r2.patch;patch=1 \
-           ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \
-           ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
-           ${RPSRC}/corgi_power-r22.patch;patch=1 \
-           ${RPSRC}/corgi_power1-r1.patch;patch=1 \
-           ${RPSRC}/mmc_sd-r5.patch;patch=1 \
-           ${RPSRC}/corgi_snd-r6.patch;patch=1 \
-           ${RPSRC}/w100_split-r8.patch;patch=1 \
-           ${RPSRC}/pxa_i2c-r2.patch;patch=1 \
-           ${DOSRC}/pxa-i2c-suspend-r0.patch;patch=1 \
-           ${DOSRC}/pxa-i2c-func-r0.patch;patch=1 \           
-           ${RPSRC}/spitz_mtd-r0.patch;patch=1 \
-           ${RPSRC}/mmc_timeout-r0.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_base-r14.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_bl-r0.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_pcmcia-r0.patch;patch=1 \
-           ${RPSRC}/ipaq/pxa_keys-r0.patch;patch=1 \
-           ${RPSRC}/ipaq/tsc2101-r6.patch;patch=1 \
-           ${DOSRC}/tosa-detection-r0.patch;patch=1 \
-           ${BASRC}/spitz-detection-r0.patch;patch=1 \
-           ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
-           ${DOSRC}/tc6393-device-r4.patch;patch=1 \
-           ${DOSRC}/tc6393_nand-r4.patch;patch=1 \
-           ${DOSRC}/tosa-machine-base-r6.patch;patch=1 \
-           ${DOSRC}/tosa-keyboard-r4.patch;patch=1 \
-           ${DOSRC}/tc6393fb-r6.patch;patch=1 \
-           ${DOSRC}/tosa-power-r5.patch;patch=1 \
-           ${DOSRC}/tosa-mmc-r3.patch;patch=1 \
-           ${DOSRC}/tosa-udc-r3.patch;patch=1 \
-           ${DOSRC}/tosa-irda-r2.patch;patch=1 \
-           ${DOSRC}/tosa-lcd-r2.patch;patch=1 \
-           ${DOSRC}/tosa-bl-r4.patch;patch=1 \
-           ${DOSRC}/pxa-ac97-alsa-r0.patch;patch=1 \
-           ${DOSRC}/pxa-ac97-alsa-resume-r0.patch;patch=1 \
-           ${DOSRC}/ac97-bus-r0.patch;patch=1 \
-           ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
-           ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
-           file://add-oz-release-string.patch;patch=1 \
-           file://add-elpp-stuff.patch;patch=1 \
-           file://pxa-serial-hack.patch;patch=1 \ 
-           ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \
-           file://defconfig-c7x0 \
-           file://defconfig-ipaq-pxa-2.6 \
-           file://defconfig-collie \
-           file://defconfig-poodle \
-           file://defconfig-spitz \
-           file://defconfig-tosa "
-
-
-#${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 \
-
-SRC_URI_append_collie = "${RPSRC}/jl1/collie_keymap.patch;patch=1 "
-SRC_URI_append_poodle = "${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 \
-                         ${RPSRC}/rpextra_poodle-r0.patch;patch=1 "
-SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
-                       ${DOSRC}/tosa-pxaac97-r1.patch;patch=1 "
-SRC_URI_append_spitz = "${BASRC}/spitz-cf-support-r0.patch;patch=1 \
-                        ${BASRC}/spitz-base-r2.patch;patch=1 "
-
-
-S = "${WORKDIR}/linux-2.6.11"
-
-inherit kernel
-
-##############################################################
-# Compensate for sucky bootloader on all Sharp Zaurus models
-#
-FILES_kernel-image = ""
-ALLOW_EMPTY = 1
-
-EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}"
-COMPATIBLE_HOST = "arm.*-linux"
-
-CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
-CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 "
-CMDLINE_ROOT_poodle = "root=/dev/mtdblock1 rootfstype=jffs2 "
-
-##############################################################
-# Configure memory/ramdisk split for collie
-#
-export mem = ${@bb.data.getVar("COLLIE_MEMORY_SIZE",d,1) or "32"}
-export rd  = ${@bb.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"}
-
-CMDLINE_MEM_collie = "mem=${mem}M"
-CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM}"
-
-###############################################################
-# Enable or disable ELPP via local.conf - default is "no"
-#
-ENABLE_ELPP = ${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"}
-
-do_configure() {
-
-	install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
-
-	if [ "${MACHINE}" == "collie" ]; then
-		mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
-		rdsize=`echo "$rd * 1024" | bc`
-		total=`expr $mem + $rd`
-		addr=`echo "obase=16; ibase=16; C0000000 + $mempos" | bc`
-	 	if [ "$rd" == "0" ]
-	 	then
-		    echo "No RAMDISK"
-			echo "# CONFIG_MTD_MTDRAM_SA1100 is not set" >> ${S}/.config
-		else
-		    echo "RAMDIR = $rdsize on $addr"
-			echo "CONFIG_MTD_MTDRAM_SA1100=y"           >> ${S}/.config
-			echo "CONFIG_MTDRAM_TOTAL_SIZE=$rdsize"     >> ${S}/.config
-			echo "CONFIG_MTDRAM_ERASE_SIZE=1"           >> ${S}/.config
-			echo "CONFIG_MTDRAM_ABS_POS=$addr"          >> ${S}/.config
-		fi
-	fi
-
-	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
-
-	if [ "${ENABLE_ELPP}" == "yes" ]; then
-                echo "# Enhanced Linux Progress Patch"  >> ${S}/.config
-                echo "CONFIG_FB_ELPP=y"                 >> ${S}/.config
-                echo "CONFIG_LOGO=y"                    >> ${S}/.config
-                echo "CONFIG_LOGO_LINUX_CLUT224=y"      >> ${S}/.config
-	else
-		echo "# CONFIG_FB_ELPP is not set"	>> ${S}/.config
-	fi
-
-	yes '' | oe_runmake oldconfig
-}
-
-# Check the kernel is below the 1272*1024 byte limit for the c7x0
-do_compile_append() {
-	if [ "${MACHINE}" == "c7x0" ]; then
-		size=`ls arch/${ARCH}/boot/${KERNEL_IMAGETYPE} -s | cut -d ' ' -f 1`
-		if [ $size -ge 1271 ]; then
-			rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
-			die "This kernel is too big for the c7x0 and will destroy your machine if you flash it!!!"
-		fi
-	fi
-}
-
-do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/linux-openzaurus_2.6.12-rc5-mm2.bb b/packages/linux/linux-openzaurus_2.6.12-rc5-mm2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-openzaurus_2.6.12-rc5-mm2.bb
diff --git a/packages/python/python_2.4.1.bb b/packages/python/python_2.4.1.bb
index 27cdaf99fe..0777df8631 100644
--- a/packages/python/python_2.4.1.bb
+++ b/packages/python/python_2.4.1.bb
@@ -6,14 +6,14 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PROVIDES = "python python-core"
 DEPENDS = "python-native zlib gdbm openssl"
-PR = "ml2"
+PR = "ml3"
 
 PYTHON_MAJMIN = "2.4"
 
-SRC_URI = "ftp://www.python.org/pub/python/2.4/Python-2.4.tar.bz2 \
+SRC_URI = "ftp://www.python.org/pub/python/${PV}/Python-${PV}.tar.bz2 \
 	   file://bindir-libdir.patch;patch=1 \
 	   file://crosscompile.patch;patch=1"
-S = "${WORKDIR}/Python-2.4"
+S = "${WORKDIR}/Python-${PV}"
 
 inherit autotools