summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Remmet <j.remmet@phytec.de>2018-08-29 16:00:12 +0200
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2018-08-30 15:50:24 +0200
commit0792d2f9cd40f125d932b5ebe247c4e25689bd8f (patch)
treea206efbee4f25740c5ffa0251bf617294db66eda
parent10a9ada136e14605b429fafec5f665e6cd916143 (diff)
downloadmeta-phytec-0792d2f9cd40f125d932b5ebe247c4e25689bd8f.tar.bz2
meta-phytec-0792d2f9cd40f125d932b5ebe247c4e25689bd8f.zip
bootlogo.inc: various fixes
${S} did't work since krogoth anymore convert.im7 is the new version from meta-openembedded DEPENDS is from do_configure, we need imagemagick earlier in do_patch raise error if convert.im7 fails Signed-off-by: Jan Remmet <j.remmet@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--recipes-kernel/linux/bootlogo.inc15
1 files changed, 9 insertions, 6 deletions
diff --git a/recipes-kernel/linux/bootlogo.inc b/recipes-kernel/linux/bootlogo.inc
index e866a7b..0736143 100644
--- a/recipes-kernel/linux/bootlogo.inc
+++ b/recipes-kernel/linux/bootlogo.inc
@@ -1,17 +1,20 @@
-# Copyright (C) 2016 PHYTEC Messtechnik GmbH,
+# Copyright (C) 2018 PHYTEC Messtechnik GmbH,
# Author: Jan Remmet <j.remmet@phytec.de>
# the fist picture found in SRC_URI, will be convert and used as bootlogo
# the picture size should match the lcd resolution
-DEPENDS += "imagemagick-native"
-
do_patch_append () {
+ logo = os.path.join(d.getVar('STAGING_KERNEL_DIR', True),
+ "drivers/video/logo/logo_linux_clut224.ppm")
for s in src_patches(d, True):
if s.endswith(('.bmp', '.ppm', '.png')):
- os.system('convert.im6 -colors 224 -format ppm -compress none \
+ if os.system('convert.im7 -colors 224 -format ppm -compress none \
%(pic)s %(dest)s' %
- { 'pic': s,
- 'dest': '${S}/drivers/video/logo/logo_linux_clut224.ppm'})
+ { 'pic': s, 'dest': logo}):
+ bb.error("imagemagick convert failed")
break
}
+
+do_patch[depends] += "imagemagick-native:do_populate_sysroot"
+