diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2006-07-28 11:32:53 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2006-07-28 11:32:53 +0000 |
| commit | 1287e38077fece73a2d0887c63bc869cf5c516c1 (patch) | |
| tree | 6fdb2770b7b99b365c36ea40d9877ee17868f43e /packages/linux | |
| parent | f4008ca823bfbb7c33d92008137ff78cc6907f17 (diff) | |
| parent | 39dba3e0ec9b72c5394d9ec669e68ecd87e23658 (diff) | |
merge of 23f392c4a32f829ba2c33998e47b14cc08c51a26
and a5ef4c4c70b547e6337fc06d8e0f67f7be568250
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/handhelds-pxa-2.6_cvs.bb | 10 | ||||
| -rw-r--r-- | packages/linux/linux-h1940_2.6.17-h1940.bb | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index 7fcfc93943..054868864f 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -25,12 +25,17 @@ ALLOW_EMPTY_ipaq_pxa270 = 1 K_MAJOR = "2" K_MINOR = "6" K_MICRO = "16" -HHV = "4" +HHV = "5" # KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" do_configure() { - rm -f ${S}/.config + + if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then + die "-hh version mismatch" + fi + + rm -f ${S}/.config if [ ! -e ${WORKDIR}/defconfig ]; then die "No default configuration for ${MACHINE} available." @@ -57,6 +62,7 @@ do_deploy() { install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} } + do_deploy[dirs] = "${S}" addtask deploy before do_package after do_compile diff --git a/packages/linux/linux-h1940_2.6.17-h1940.bb b/packages/linux/linux-h1940_2.6.17-h1940.bb index efecee302d..3542e6f7b3 100644 --- a/packages/linux/linux-h1940_2.6.17-h1940.bb +++ b/packages/linux/linux-h1940_2.6.17-h1940.bb @@ -13,6 +13,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/bluetooth.patch;patch=1 \ http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/h1940_batt.patch;patch=1 \ http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/mtd_partition.patch;patch=1 \ + http://anymore.nl/ipaq/usbgadget_fixups.patch;patch=1 \ file://defconfig" S = "${WORKDIR}/linux-2.6.17" |