[oe-commits] org.oe.dev linux-handhelds-2.6: Merge "_cvs" support into linux-handhelds-2.6.inc.
pfalcon commit
openembedded-commits at lists.openembedded.org
Fri Nov 3 00:05:32 UTC 2006
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 ;-)
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 5f21d25d6791636dcfe4c7ac6cdec7ae6e2cd384
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5f21d25d6791636dcfe4c7ac6cdec7ae6e2cd384
Files:
1
packages/linux/linux-handhelds-2.6.inc
packages/linux/linux-handhelds-2.6_2.6.16-hh5.bb
packages/linux/linux-handhelds-2.6_2.6.16-hh7.bb
packages/linux/linux-handhelds-2.6_2.6.17-hh2.bb
packages/linux/linux-handhelds-2.6_cvs.bb
Diffs:
#
# mt diff -r7b0b1b3eb34b3e216e5b616a595e38f031aec538 -r5f21d25d6791636dcfe4c7ac6cdec7ae6e2cd384
#
#
#
# patch "packages/linux/linux-handhelds-2.6.inc"
# from [030504306d843331dd10871129d90ff5e74bb240]
# to [1730a389e84d8a34ea386bed2af2c5bb425b7806]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.16-hh5.bb"
# from [92a893090f824fdebb2440f8e63d945924ac2521]
# to [ad1129a0d4baefec69f16a2853e02e3edfa9524d]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.16-hh7.bb"
# from [bab9107f62ba3121a37b1c5b21c212124edea541]
# to [371a5a6425e38030994822cf2e0f9a6b5e5464d0]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.17-hh2.bb"
# from [d67c9d85ad33d7014c92a1317bbea99406f3b27d]
# to [107631a127720e414e7010f3ce475bbc3c717d87]
#
# patch "packages/linux/linux-handhelds-2.6_cvs.bb"
# from [5c39683472777ac7550b2e971e6a38949cce4350]
# to [d69e878b83cda940230a4f754c10fd975801e083]
#
============================================================
--- packages/linux/linux-handhelds-2.6.inc 030504306d843331dd10871129d90ff5e74bb240
+++ packages/linux/linux-handhelds-2.6.inc 1730a389e84d8a34ea386bed2af2c5bb425b7806
@@ -5,7 +5,8 @@ COMPATIBLE_MACHINE ?= '(h1910|h2200|h360
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)))}"
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.16-hh5.bb 92a893090f824fdebb2440f8e63d945924ac2521
+++ packages/linux/linux-handhelds-2.6_2.6.16-hh5.bb ad1129a0d4baefec69f16a2853e02e3edfa9524d
@@ -1,8 +1,15 @@ PR = "r1"
SECTION = "kernel"
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
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.16-hh7.bb bab9107f62ba3121a37b1c5b21c212124edea541
+++ packages/linux/linux-handhelds-2.6_2.6.16-hh7.bb 371a5a6425e38030994822cf2e0f9a6b5e5464d0
@@ -1,8 +1,15 @@ PR = "r2"
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
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
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.17-hh2.bb d67c9d85ad33d7014c92a1317bbea99406f3b27d
+++ packages/linux/linux-handhelds-2.6_2.6.17-hh2.bb 107631a127720e414e7010f3ce475bbc3c717d87
@@ -5,4 +5,9 @@ DEFAULT_PREFERENCE = "-1"
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
============================================================
--- packages/linux/linux-handhelds-2.6_cvs.bb 5c39683472777ac7550b2e971e6a38949cce4350
+++ packages/linux/linux-handhelds-2.6_cvs.bb d69e878b83cda940230a4f754c10fd975801e083
@@ -1,70 +1,18 @@ PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-h
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)'
+PR = "r5"
-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
-
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() {
+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"
- if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then
- die "-hh version mismatch"
- fi
+require linux-handhelds-2.6.inc
- 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}"
-
-addtask deploy before do_package after do_compile
-
More information about the Openembedded-commits
mailing list