From dcc455f2d8ab7a7b57274aa81b02553b2c4a817d Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 3 Nov 2006 00:02:55 +0000 Subject: linux-handhelds-2.6: Merge "_cvs" support into linux-handhelds-2.6.inc. * Had to put SRC_URI to per-version .bb for that. * Tested ;-) --- packages/linux/linux-handhelds-2.6_cvs.bb | 64 +++---------------------------- 1 file changed, 6 insertions(+), 58 deletions(-) (limited to 'packages/linux/linux-handhelds-2.6_cvs.bb') diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb index 62c0fad9c9..ab08f1c596 100644 --- a/packages/linux/linux-handhelds-2.6_cvs.bb +++ b/packages/linux/linux-handhelds-2.6_cvs.bb @@ -2,69 +2,17 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." LICENSE = "GPL" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" -PR = "r4" -# -COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3900|h5xxx|h2200|h4000|hx4700|htcuniversal|magician)' - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" - -SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ - file://24-hostap_cs_id.diff;patch=1 \ - file://hrw-pcmcia-ids-r2.patch;patch=1 \ - file://defconfig" - -S = "${WORKDIR}/kernel26" - -inherit kernel - -FILES_kernel-image_hx4700 = "" -ALLOW_EMPTY_hx4700 = 1 -FILES_kernel-image_htcuniversal = "" -ALLOW_EMPTY_htcuniversal = 1 +PR = "r5" K_MAJOR = "2" K_MINOR = "6" K_MICRO = "17" HHV = "2" -# - -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() { - - 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." - fi - - - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then - echo "CONFIG_AEABI=y" >> ${S}/.config - echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config - else - echo "# CONFIG_AEABI is not set" >> ${S}/.config - echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config - fi - - sed -e '/CONFIG_AEABI/d' \ - -e '/CONFIG_OABI_COMPAT=/d' \ - '${WORKDIR}/defconfig' >>'${S}/.config' - - yes '' | oe_runmake oldconfig -} - -do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} -} - - -do_deploy[dirs] = "${S}" +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ + file://24-hostap_cs_id.diff;patch=1 \ + file://hrw-pcmcia-ids-r2.patch;patch=1 \ + file://defconfig" -addtask deploy before do_package after do_compile +require linux-handhelds-2.6.inc -- cgit v1.2.3 From 552b7fccefaec8cd79764497991f5e139b14b0d7 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 3 Nov 2006 00:07:08 +0000 Subject: linux-handhelds-2.6 cvs: Add commot DESCRIPTION. --- packages/linux/linux-handhelds-2.6_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/linux/linux-handhelds-2.6_cvs.bb') diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb index ab08f1c596..d4574fb755 100644 --- a/packages/linux/linux-handhelds-2.6_cvs.bb +++ b/packages/linux/linux-handhelds-2.6_cvs.bb @@ -1,5 +1,5 @@ SECTION = "kernel" -DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." +DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" PR = "r5" -- cgit v1.2.3 From c119cdd62d87956a2094cf763b55732d13910494 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 4 Nov 2006 12:10:14 +0000 Subject: linux-handhelds-2.6 cvs: Card ID patches were merged to HH.org CVS. --- packages/linux/linux-handhelds-2.6_cvs.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/linux/linux-handhelds-2.6_cvs.bb') diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb index d4574fb755..cd4ab10dd1 100644 --- a/packages/linux/linux-handhelds-2.6_cvs.bb +++ b/packages/linux/linux-handhelds-2.6_cvs.bb @@ -10,8 +10,8 @@ K_MICRO = "17" HHV = "2" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ - file://24-hostap_cs_id.diff;patch=1 \ - file://hrw-pcmcia-ids-r2.patch;patch=1 \ + file://24-hostap_cs_id.diff;patch=1;maxdate=20061104 \ + file://hrw-pcmcia-ids-r2.patch;patch=1;maxdate=20061104 \ file://defconfig" require linux-handhelds-2.6.inc -- cgit v1.2.3 From edb57fb2bfdde1bc1d3ebe7cbba34b3990aeeba9 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 9 Nov 2006 17:45:26 +0000 Subject: handhelds-2.6 cvs: HH.org CVS upgraded to 2.6.18, follow. * -hh0 stuff is *never* suitable for general use. Use at your own risk, don't ask questions, report results and send patches. --- packages/linux/linux-handhelds-2.6_cvs.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/linux/linux-handhelds-2.6_cvs.bb') diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb index cd4ab10dd1..107b014e60 100644 --- a/packages/linux/linux-handhelds-2.6_cvs.bb +++ b/packages/linux/linux-handhelds-2.6_cvs.bb @@ -6,8 +6,8 @@ PR = "r5" K_MAJOR = "2" K_MINOR = "6" -K_MICRO = "17" -HHV = "2" +K_MICRO = "18" +HHV = "0" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ file://24-hostap_cs_id.diff;patch=1;maxdate=20061104 \ -- cgit v1.2.3