diff options
| -rw-r--r-- | packages/linux/linux-handhelds-2.6.inc | 11 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6_2.6.16-hh5.bb | 7 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6_2.6.16-hh7.bb | 7 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6_2.6.17-hh2.bb | 5 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6_cvs.bb | 64 |
5 files changed, 31 insertions, 63 deletions
diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index 7ac7470e82..ba65d600b2 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -5,7 +5,8 @@ LICENSE = "GPL" COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE ?= '(h1910|h2200|h3600|h3900|h4000|h5xxx|htcuniversal|hx4700|jornada56x|simpad)' -SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ +# SRC_URI *must* be overriden in includer, but this is a good reference +SRC_URI ?= "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://24-hostap_cs_id.diff;patch=1 \ file://hrw-pcmcia-ids-r2.patch;patch=1 \ file://defconfig" @@ -21,10 +22,10 @@ ALLOW_EMPTY_htcuniversal = 1 -K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" -K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" -K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" -HHV = "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}" +K_MAJOR ?= "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" +K_MINOR ?= "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" +K_MICRO ?= "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" +HHV ?= "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}" 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)))}" diff --git a/packages/linux/linux-handhelds-2.6_2.6.16-hh5.bb b/packages/linux/linux-handhelds-2.6_2.6.16-hh5.bb index 2ffcc472d4..b614be5124 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.16-hh5.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.16-hh5.bb @@ -3,6 +3,13 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." LICENSE = "GPL" PR = "r1" +# Override where to look for defconfigs and patches, +# we have per-kernel-release sets. FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.16/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.16" +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://24-hostap_cs_id.diff;patch=1 \ + file://hrw-pcmcia-ids-r2.patch;patch=1 \ + file://defconfig" + require linux-handhelds-2.6.inc diff --git a/packages/linux/linux-handhelds-2.6_2.6.16-hh7.bb b/packages/linux/linux-handhelds-2.6_2.6.16-hh7.bb index 0f1556afaa..dd8ebe2440 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.16-hh7.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.16-hh7.bb @@ -3,6 +3,13 @@ DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer h LICENSE = "GPL" PR = "r2" +# Override where to look for defconfigs and patches, +# we have per-kernel-release sets. FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.16/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.16" +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://24-hostap_cs_id.diff;patch=1 \ + file://hrw-pcmcia-ids-r2.patch;patch=1 \ + file://defconfig" + require linux-handhelds-2.6.inc diff --git a/packages/linux/linux-handhelds-2.6_2.6.17-hh2.bb b/packages/linux/linux-handhelds-2.6_2.6.17-hh2.bb index 5f7f88bc21..2c2b9b77a4 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.17-hh2.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.17-hh2.bb @@ -5,4 +5,9 @@ PR = "r0" DEFAULT_PREFERENCE = "-1" +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://24-hostap_cs_id.diff;patch=1 \ + file://hrw-pcmcia-ids-r2.patch;patch=1 \ + file://defconfig" + require linux-handhelds-2.6.inc 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 |