diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-07-15 14:36:08 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-07-15 20:53:53 +0200 |
| commit | aad62a5f3cc3a6e06d3b256ac7865a8f41ea7805 (patch) | |
| tree | 4e6aead5c4fe2fd3595eb5c713f660ec381f6569 /meta-oe | |
| parent | b42f8cbcf1b66eb580abdd3c67b2e9ead1270580 (diff) | |
| download | meta-openembedded-aad62a5f3cc3a6e06d3b256ac7865a8f41ea7805.tar.gz | |
Remove meta-oe/patches/
I suspect this should not have been committed.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/patches/0001-kernel-bbclass-merge-in-OE-improvements-for-mkimage-.patch | 109 | ||||
| -rw-r--r-- | meta-oe/patches/kernel-temp | 33 |
2 files changed, 0 insertions, 142 deletions
diff --git a/meta-oe/patches/0001-kernel-bbclass-merge-in-OE-improvements-for-mkimage-.patch b/meta-oe/patches/0001-kernel-bbclass-merge-in-OE-improvements-for-mkimage-.patch deleted file mode 100644 index 7283df8df5..0000000000 --- a/meta-oe/patches/0001-kernel-bbclass-merge-in-OE-improvements-for-mkimage-.patch +++ /dev/null | |||
| @@ -1,109 +0,0 @@ | |||
| 1 | From 65780d06117be92941b3c5404dc31597b6807263 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
| 3 | Date: Sun, 23 Jan 2011 10:58:46 +0100 | ||
| 4 | Subject: [PATCH] kernel bbclass: merge in OE improvements for mkimage, PR and initramfs | ||
| 5 | |||
| 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
| 7 | --- | ||
| 8 | classes/kernel.bbclass | 60 +++++++++++++++++++++++++++++++++++------------ | ||
| 9 | 1 files changed, 44 insertions(+), 16 deletions(-) | ||
| 10 | |||
| 11 | diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass | ||
| 12 | index 827046e..d94930b 100644 | ||
| 13 | --- a/classes/kernel.bbclass | ||
| 14 | +++ b/classes/kernel.bbclass | ||
| 15 | @@ -14,8 +14,20 @@ python __anonymous () { | ||
| 16 | depends = bb.data.getVar("DEPENDS", d, 1) | ||
| 17 | depends = "%s u-boot-mkimage-native" % depends | ||
| 18 | bb.data.setVar("DEPENDS", depends, d) | ||
| 19 | + | ||
| 20 | + image = bb.data.getVar('INITRAMFS_IMAGE', d, True) | ||
| 21 | + if image != '' and image is not None: | ||
| 22 | + bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d) | ||
| 23 | + | ||
| 24 | + machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True) | ||
| 25 | + | ||
| 26 | + if machine_kernel_pr: | ||
| 27 | + bb.data.setVar('PR', machine_kernel_pr, d) | ||
| 28 | } | ||
| 29 | |||
| 30 | +INITRAMFS_IMAGE ?= "" | ||
| 31 | +INITRAMFS_TASK ?= "" | ||
| 32 | + | ||
| 33 | inherit kernel-arch deploy | ||
| 34 | |||
| 35 | PACKAGES_DYNAMIC += "kernel-module-*" | ||
| 36 | @@ -196,8 +208,17 @@ sysroot_stage_all_append() { | ||
| 37 | |||
| 38 | kernel_do_configure() { | ||
| 39 | yes '' | oe_runmake oldconfig | ||
| 40 | + if [ ! -z "${INITRAMFS_IMAGE}" ]; then | ||
| 41 | + for img in cpio.gz cpio.lzo cpio.lzma; do | ||
| 42 | + if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then | ||
| 43 | + cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" initramfs.$img | ||
| 44 | + fi | ||
| 45 | + done | ||
| 46 | + fi | ||
| 47 | } | ||
| 48 | |||
| 49 | +kernel_do_configure[depends] += "${INITRAMFS_TASK}" | ||
| 50 | + | ||
| 51 | do_menuconfig() { | ||
| 52 | export TERMWINDOWTITLE="${PN} Kernel Configuration" | ||
| 53 | export SHELLCMDS="make menuconfig" | ||
| 54 | @@ -476,6 +497,29 @@ do_sizecheck() { | ||
| 55 | |||
| 56 | addtask sizecheck before do_install after do_compile | ||
| 57 | |||
| 58 | +do_uboot_mkimage() { | ||
| 59 | + if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then | ||
| 60 | + ENTRYPOINT=${UBOOT_ENTRYPOINT} | ||
| 61 | + if test -n "${UBOOT_ENTRYSYMBOL}"; then | ||
| 62 | + ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \ | ||
| 63 | + awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'` | ||
| 64 | + fi | ||
| 65 | + if test -e arch/${ARCH}/boot/compressed/vmlinux ; then | ||
| 66 | + ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin | ||
| 67 | + uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage | ||
| 68 | + rm -f linux.bin | ||
| 69 | + else | ||
| 70 | + ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin | ||
| 71 | + rm -f linux.bin.gz | ||
| 72 | + gzip -9 linux.bin | ||
| 73 | + uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage | ||
| 74 | + rm -f linux.bin.gz | ||
| 75 | + fi | ||
| 76 | + fi | ||
| 77 | +} | ||
| 78 | + | ||
| 79 | +addtask uboot_mkimage before do_install after do_compile | ||
| 80 | + | ||
| 81 | KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}" | ||
| 82 | # Don't include the DATETIME variable in the sstate package signatures | ||
| 83 | KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" | ||
| 84 | @@ -487,22 +531,6 @@ kernel_do_deploy() { | ||
| 85 | tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib | ||
| 86 | fi | ||
| 87 | |||
| 88 | - if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then | ||
| 89 | - if test -e arch/${ARCH}/boot/uImage ; then | ||
| 90 | - cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin | ||
| 91 | - elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then | ||
| 92 | - ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin | ||
| 93 | - uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin | ||
| 94 | - rm -f linux.bin | ||
| 95 | - else | ||
| 96 | - ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin | ||
| 97 | - rm -f linux.bin.gz | ||
| 98 | - gzip -9 linux.bin | ||
| 99 | - uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin | ||
| 100 | - rm -f linux.bin.gz | ||
| 101 | - fi | ||
| 102 | - fi | ||
| 103 | - | ||
| 104 | cd ${DEPLOYDIR} | ||
| 105 | rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin | ||
| 106 | ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin | ||
| 107 | -- | ||
| 108 | 1.6.6.1 | ||
| 109 | |||
diff --git a/meta-oe/patches/kernel-temp b/meta-oe/patches/kernel-temp deleted file mode 100644 index 3bbcfe955a..0000000000 --- a/meta-oe/patches/kernel-temp +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass | ||
| 2 | index d94930b..2a0f3da 100644 | ||
| 3 | --- a/classes/kernel.bbclass | ||
| 4 | +++ b/classes/kernel.bbclass | ||
| 5 | @@ -220,6 +196,9 @@ kernel_do_configure() { | ||
| 6 | kernel_do_configure[depends] += "${INITRAMFS_TASK}" | ||
| 7 | |||
| 8 | do_menuconfig() { | ||
| 9 | + export DISPLAY='${DISPLAY}' | ||
| 10 | + export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}' | ||
| 11 | + export XAUTHORITY='${XAUTHORITY}' | ||
| 12 | export TERMWINDOWTITLE="${PN} Kernel Configuration" | ||
| 13 | export SHELLCMDS="make menuconfig" | ||
| 14 | ${TERMCMDRUN} | ||
| 15 | @@ -318,13 +297,16 @@ module_conf_rfcomm = "alias bt-proto-3 rfcomm" | ||
| 16 | |||
| 17 | python populate_packages_prepend () { | ||
| 18 | def extract_modinfo(file): | ||
| 19 | - import re | ||
| 20 | - tmpfile = os.tmpnam() | ||
| 21 | + import tempfile, re | ||
| 22 | + tempfile.tempdir = bb.data.getVar("WORKDIR", d, 1) | ||
| 23 | + tf = tempfile.mkstemp() | ||
| 24 | + tmpfile = tf[1] | ||
| 25 | cmd = "PATH=\"%s\" %sobjcopy -j .modinfo -O binary %s %s" % (bb.data.getVar("PATH", d, 1), bb.data.getVar("HOST_PREFIX", d, 1) or "", file, tmpfile) | ||
| 26 | os.system(cmd) | ||
| 27 | f = open(tmpfile) | ||
| 28 | l = f.read().split("\000") | ||
| 29 | f.close() | ||
| 30 | + os.close(tf[0]) | ||
| 31 | os.unlink(tmpfile) | ||
| 32 | exp = re.compile("([^=]+)=(.*)") | ||
| 33 | vals = {} | ||
