diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-02 18:04:03 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-02 18:04:03 +0100 |
| commit | 0c7a5327eba1b3379f47e4b36feb82685088858c (patch) | |
| tree | 885b667d4dee58ae096bf6562d1720d766db7865 | |
| parent | 05d83b9e768fb2a901acbf495b77b63b84d6bfbb (diff) | |
| parent | e4755f888383ab9850a49926f0997ea232fb6b96 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
| -rw-r--r-- | recipes/kexecboot/linux-kexecboot.inc | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/recipes/kexecboot/linux-kexecboot.inc b/recipes/kexecboot/linux-kexecboot.inc index 0d5f2bb2ac..900e005cac 100644 --- a/recipes/kexecboot/linux-kexecboot.inc +++ b/recipes/kexecboot/linux-kexecboot.inc @@ -1,5 +1,5 @@ # We set PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels: -PR = "r16" +PR = "r17" SRC_URI = "file://defconfig" @@ -31,18 +31,30 @@ TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches" KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${PV}-${PR}-${MACHINE}" KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}" +# use custom function until base_version_less_or_equal is fixed # +def kernel_version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): + from bb import utils + result = bb.utils.vercmp_part(bb.data.getVar(variable,d,True), checkvalue) + if result <= 0: + return truevalue + else: + return falsevalue + # default lzma compressor for kernels >= 2.6.30 -INITRAMFS_COMPRESSION = '${@base_version_less_or_equal("PV", "2.6.30", "", "CONFIG_INITRAMFS_COMPRESSION_LZMA=y", d)}' -INITRAMFS_COMPRESSION_SUFFIX = '${@base_version_less_or_equal("PV", "2.6.30", "gz", "lzma", d)}' +INITRAMFS_COMPRESSION = '${@kernel_version_less_or_equal("PV", "2.6.30", "", "CONFIG_INITRAMFS_COMPRESSION_LZMA=y", d)}' +INITRAMFS_COMPRESSION_SUFFIX = '${@kernel_version_less_or_equal("PV", "2.6.30", "gz", "lzma", d)}' +RD_COMPRESSION = '${@kernel_version_less_or_equal("PV", "2.6.30", "", "CONFIG_RD_LZMA=y", d)}' do_configure[depends] += "${INITRAMFS_IMAGE}:do_rootfs" + do_configure_append() { sed -i -e /CONFIG_BLK_DEV_INITRD/d \ -e /CONFIG_KEXEC/d \ -e /CONFIG_INITRAMFS_SOURCE/d \ -e /CONFIG_INITRAMFS_COMPRESSION/d \ + -e /CONFIG_RD/d \ -e /=m/d \ -e /CONFIG_MODULES/d \ -e /CONFIG_DEBUG_ERRORS/d \ @@ -58,6 +70,7 @@ echo 'CONFIG_BLK_DEV_INITRD=y CONFIG_KEXEC=y ${INITRAMFS_COMPRESSION} CONFIG_INITRAMFS_SOURCE="initramfs.cpio.${INITRAMFS_COMPRESSION_SUFFIX}" +${RD_COMPRESSION} CONFIG_MODULES=n' >> ${S}/.config yes '' | oe_runmake oldconfig |