From e8f9a4e8f80c44c6faf18af8d397d240e460b981 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 20 Nov 2017 19:35:47 +0000 Subject: sdcard_image-rpi.bbclass: drop KERNEL_INITRAMFS variable * use INITRAMFS_SYMLINK_NAME from new kernel-artifact-names.bbclass instead of KERNEL_INITRAMFS * the documentation says that KERNEL_INITRAMFS should be used to define extension of initramfs, but in linux-raspberrypi.inc it's defined only to 1 or empty based on INITRAMFS_IMAGE_BUNDLE variable and I don't see any code in meta-raspberry or oe-core which would use KERNEL_INITRAMFS to actualy name the initramfs artifact to create: ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin used in classes/sdcard_image-rpi.bbclass * also fix the assumption that there is -${MACHINE} suffix in: ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin because that's defined as KERNEL_IMAGE_SYMLINK_NAME and some DISTROs might use different value * this depends on oe-core changes which were merged today: http://git.openembedded.org/openembedded-core/commit/?id=7d0ef0eaa1bfe97015a774c26f5791622e7e8b12 * this is the last piece of previous pull-request: https://github.com/agherzan/meta-raspberrypi/pull/159 Signed-off-by: Martin Jansa --- recipes-kernel/linux/linux-raspberrypi.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc index 65c2ab7..586dabd 100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++ b/recipes-kernel/linux/linux-raspberrypi.inc @@ -33,8 +33,6 @@ CMDLINE_append += ' ${@oe.utils.conditional("DISABLE_RPI_BOOT_LOGO", "1", "logo. CMDLINE_DEBUG ?= "" CMDLINE_append = " ${CMDLINE_DEBUG}" -KERNEL_INITRAMFS ?= '${@oe.utils.conditional("INITRAMFS_IMAGE_BUNDLE", "1", "1", "", d)}' - KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "stmpe-ts", "", d)}" # A LOADADDR is needed when building a uImage format kernel. This value is not @@ -99,7 +97,7 @@ do_configure_prepend() { # Localversion kernel_configure_variable LOCALVERSION "\"\"" - if [ ! -z "${KERNEL_INITRAMFS}" ]; then + if [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then kernel_configure_variable OVERLAY_FS y kernel_configure_variable SQUASHFS y kernel_configure_variable UBIFS_FS y @@ -107,7 +105,7 @@ do_configure_prepend() { # Activate the configuration options for VC4 VC4GRAPHICS="${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" - if [ ${VC4GRAPHICS} = "1" ]; then + if [ "${VC4GRAPHICS}" = "1" ]; then kernel_configure_variable I2C_BCM2835 y kernel_configure_variable DRM y kernel_configure_variable DRM_FBDEV_EMULATION y -- cgit v1.2.3-54-g00ecf