aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/linux
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-06-24 05:28:14 +0000
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2011-06-24 00:36:09 +0200
commitc382a9ce64bf4291572665652138aa01b2e54306 (patch)
tree2d7297717d03a35b96814391b6383c270a0d571c /recipes/linux
parent99cad4f2f283149eb25be6723bfdc5ec117aafba (diff)
downloadopenembedded-c382a9ce64bf4291572665652138aa01b2e54306.tar.gz
conf/bitbake: unbreak and improve lzma image compression handling and adapt linux-kexecboot.inc
We now use xz-native to generate lzma images Kexecboot.inc needed to be adjusted in order to reflect the dependency change from lzma-native to xz-native The initramfs.cpio.gz were tested with linux-kexecboot on nokia900. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> Acked-by: Andrea Adami <andrea.adami@gmail.com>
Diffstat (limited to 'recipes/linux')
-rw-r--r--recipes/linux/linux-kexecboot.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/linux/linux-kexecboot.inc b/recipes/linux/linux-kexecboot.inc
index efa45f2b1a..d1bf6aa652 100644
--- a/recipes/linux/linux-kexecboot.inc
+++ b/recipes/linux/linux-kexecboot.inc
@@ -1,5 +1,5 @@
# We set INC_PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels:
-INC_PR = "r39"
+INC_PR = "r40"
inherit kernel siteinfo
@@ -57,7 +57,7 @@ def kernel_version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d)
# force lzma compression for kernel (linux-kexecboot >= 2.6.32)
# force lzma compression for initramfs (linux-kexecboot >= 2.6.30)
-DEPENDS += '${@kernel_version_less_or_equal("PV", "2.6.29", "", "lzma-native", d)}'
+DEPENDS += '${@kernel_version_less_or_equal("PV", "2.6.29", "", "xz-native", d)}'
KERNEL_COMPRESSION = '${@kernel_version_less_or_equal("PV", "2.6.31", "", "CONFIG_KERNEL_LZMA=y", d)}'