[oe-commits] org.oe.dev hh-pxa-2.6 2.6.16 hh5: unbreak do_configure for EABI, add proper COMPATIBLE_MACHINES and do a version check for good measure
koen commit
openembedded-commits at lists.openembedded.org
Wed Aug 30 10:27:40 UTC 2006
hh-pxa-2.6 2.6.16 hh5: unbreak do_configure for EABI, add proper COMPATIBLE_MACHINES and do a version check for good measure
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 5ef29a16dd96c72ef0f33bd0f53e06381ba285dd
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5ef29a16dd96c72ef0f33bd0f53e06381ba285dd
Files:
1
packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb
Diffs:
#
# mt diff -r39efcc0a9c0b1a048e2e5e79a904ab27eca3c4c4 -r5ef29a16dd96c72ef0f33bd0f53e06381ba285dd
#
#
#
# patch "packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb"
# from [50e3300355d6bc611e31b22314aa7a37f04df11c]
# to [4f384e1e0e4efde74842008fdb7f517f2d8377f7]
#
============================================================
--- packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb 50e3300355d6bc611e31b22314aa7a37f04df11c
+++ packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb 4f384e1e0e4efde74842008fdb7f517f2d8377f7
@@ -1,33 +1,60 @@ DESCRIPTION = "handhelds.org Linux kerne
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
-MAINTAINER = "Greg Gilbert <greg at treke.net>"
LICENSE = "GPL"
-DEFAULT_PREFERENCE = "-1"
-
COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(h3900|h2200|h4000|ipaq-pxa270)'
+COMPATIBLE_MACHINE = '(h3900|h2200|h4000|h5xxx|htcuniversal|ipaq-pxa270)'
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
- file://ide_not_removable-r0.patch;patch=1 \
- file://block-pio.patch;patch=1 \
file://defconfig"
S = "${WORKDIR}/kernel26"
inherit kernel
+FILES_kernel-image_ipaq-pxa270 = ""
+ALLOW_EMPTY_ipaq_pxa270 = 1
+FILES_kernel-image_htcuniversal = ""
+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]}"
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() {
- install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "No default configuration for ${MACHINE} available."
- yes '' | oe_runmake oldconfig
+
+ 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" ]; 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() {
More information about the Openembedded-commits
mailing list