From cfe4177d5d1f2715f2b39f96b9d3b8745c4405b3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 10 Jul 2018 19:57:38 +0000 Subject: [PATCH] remove webos_deploy * replaced by upstreamed support: http://lists.openembedded.org/pipermail/openembedded-core/2019-October/287612.html --- .../classes/sdcard_image-rpi.bbclass | 3 +- .../linux/linux-raspberrypi_%.bbappend | 6 -- .../ostree-kernel-initramfs_%.bbappend | 5 -- meta-webos/classes/image.bbclass | 81 ------------------- meta-webos/classes/kernel.bbclass | 18 +---- meta-webos/classes/webos_deploy.bbclass | 17 ---- 6 files changed, 2 insertions(+), 128 deletions(-) delete mode 100644 meta-webos-updater/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_%.bbappend delete mode 100644 meta-webos/classes/image.bbclass delete mode 100644 meta-webos/classes/webos_deploy.bbclass diff --git a/meta-webos-raspberrypi/classes/sdcard_image-rpi.bbclass b/meta-webos-raspberrypi/classes/sdcard_image-rpi.bbclass index 89589faac..b74813c3f 100644 --- a/meta-webos-raspberrypi/classes/sdcard_image-rpi.bbclass +++ b/meta-webos-raspberrypi/classes/sdcard_image-rpi.bbclass @@ -1,5 +1,4 @@ # Imported from meta-raspberrypi -# kernel dependency changed to do_webos_deploy_fixup task inherit image_types @@ -58,7 +57,7 @@ do_image:rpi_sdimg[depends] = " \ parted-native:do_populate_sysroot \ mtools-native:do_populate_sysroot \ dosfstools-native:do_populate_sysroot \ - virtual/kernel:do_webos_deploy_fixup \ + virtual/kernel:do_deploy \ ${IMAGE_BOOTLOADER}:do_deploy \ rpi-config:do_deploy \ ${@bb.utils.contains('MACHINE_FEATURES', 'armstub', 'armstubs:do_deploy', '' ,d)} \ diff --git a/meta-webos-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-webos-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend index a211f557f..d3c4147c1 100644 --- a/meta-webos-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend +++ b/meta-webos-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend @@ -33,9 +33,3 @@ KERNEL_MODULE_AUTOLOAD:append = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'openvswitch', '', d)} \ bridge \ " - -do_deploy:append() { - # Remove kernel image link in meta-webos/classes/kernel.bbclass - # However the image link is required in raspberrypi - ln -sf ${type}-${KERNEL_IMAGE_NAME}.bin ${DEPLOYDIR}/${type}-${KERNEL_IMAGE_LINK_NAME}.bin -} diff --git a/meta-webos-updater/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_%.bbappend b/meta-webos-updater/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_%.bbappend deleted file mode 100644 index 962e97b03..000000000 --- a/meta-webos-updater/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2020 LG Electronics, Inc. - -EXTENDPRAUTO:append = "webosupdater1" - -do_install[depends] += "virtual/kernel:do_webos_deploy_fixup" diff --git a/meta-webos/classes/image.bbclass b/meta-webos/classes/image.bbclass deleted file mode 100644 index d7ec279e3..000000000 --- a/meta-webos/classes/image.bbclass +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright (c) 2017-2020 LG Electronics, Inc. -# -# Intercept the upstream image.bbclass so that when there's -# a webos_deploy_fixup task. -# - -require ${COREBASE}/meta/classes/image.bbclass - -inherit webos_deploy - -do_build[depends] += "virtual/kernel:do_webos_deploy_fixup" -# needed to provide target of bzImage symlink for build_boot_dd function -do_bootdirectdisk[depends] += "virtual/kernel:do_webos_deploy_fixup" -# similarly for WIC, which also uses bzImage -do_image_wic[depends] += "virtual/kernel:do_webos_deploy_fixup" -# for ostree -do_image_ostree[depends] += "virtual/kernel:do_webos_deploy_fixup" - -do_webos_deploy_fixup:prepend() { - [ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ] && \ - ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext3 - - [ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ] && \ - ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4 - - [ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest ] && \ - ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.manifest - - [ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ] && \ - ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.tar.gz - - [ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ] && \ - ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.tar.bz2 - - [ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz ] && \ - ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.cpio.gz - - [ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-dbg.rootfs.tar.gz ] && \ - ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-dbg.rootfs.tar.gz \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}-dbg.tar.gz - - [ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk ] && \ - ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.vmdk - - [ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vfat ] && \ - ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vfat \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.vfat - - [ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect ] && \ - ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdddirect - - [ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.qemuboot.conf ] && \ - ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.qemuboot.conf \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.qemuboot.conf - - [ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg ] && \ - ln -vf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rpi-sdimg -} - -# Don't append to IMAGE_LINK_NAME because in webOS we construct IMAGE_LINK_NAME from IMAGE_NAME -# so the -dbg suffix was applied twice, e.g. core-image-minimal-*-dbg-master-svl-666-dbg.tar.gz -# d.appendVar('IMAGE_LINK_NAME', '-dbg') -def setup_debugfs_variables(d): - d.appendVar('IMAGE_ROOTFS', '-dbg') - image_name = d.getVar('IMAGE_NAME', True) - webos_image_name_suffix = d.getVar('IMAGE_VERSION_SUFFIX', True) - d.setVar('IMAGE_LINK_NAME', image_name+webos_image_name_suffix+'-dbg') - d.appendVar('IMAGE_NAME','-dbg') - d.setVar('IMAGE_BUILDING_DEBUGFS', 'true') - debugfs_image_fstypes = d.getVar('IMAGE_FSTYPES_DEBUGFS', True) - if debugfs_image_fstypes: - d.setVar('IMAGE_FSTYPES', debugfs_image_fstypes) diff --git a/meta-webos/classes/kernel.bbclass b/meta-webos/classes/kernel.bbclass index 07c796fce..7279b051d 100644 --- a/meta-webos/classes/kernel.bbclass +++ b/meta-webos/classes/kernel.bbclass @@ -2,30 +2,14 @@ # # packagegroup # -# Intercept the upstream kernel.bbclass so that when there's a webos_deploy_fixup -# task. +# Intercept the upstream kernel.bbclass # require ${COREBASE}/meta/classes/kernel.bbclass -inherit webos_deploy - do_deploy:append() { # The .bin-s are of no use to us. for type in ${KERNEL_IMAGETYPES} ; do rm -vf ${DEPLOYDIR}/${type}-${KERNEL_IMAGE_LINK_NAME}.bin - rm -vf ${DEPLOYDIR}/${type} done } - -do_webos_deploy_fixup:prepend() { - [ -e ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.bin ] && \ - ln -vf ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.bin \ - ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_LINK_NAME}.bin - [ -e ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_IMAGE_NAME}.bin ] && \ - ln -vf ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_IMAGE_NAME}.bin \ - ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} - [ -e ${DEPLOY_DIR_IMAGE}/modules-${MODULE_TARBALL_NAME}.tgz ] && \ - ln -vf ${DEPLOY_DIR_IMAGE}/modules-${MODULE_TARBALL_NAME}.tgz \ - ${DEPLOY_DIR_IMAGE}/modules-${MODULE_TARBALL_LINK_NAME}.tgz -} diff --git a/meta-webos/classes/webos_deploy.bbclass b/meta-webos/classes/webos_deploy.bbclass deleted file mode 100644 index 16bba223e..000000000 --- a/meta-webos/classes/webos_deploy.bbclass +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2015-2017 LG Electronics, Inc. - -inherit deploy - -# Always execute do_webos_deploy_fixup so that the -# IMAGE_VERSION_SUFFIX portion of the image filenames, which is formed from -# WEBOS_DISTRO_BUILD_ID, always corresponds to its value for this build. -do_webos_deploy_fixup[nostamp] = "1" -do_webos_deploy_fixup() { - # this should be last command, recipes should prepend to it - true -} - -# The "before" is required, otherwise do_webos_deploy_fixup isn't run -# because it doesn't appear in task dependencies of the default task (do_build). -# The "after" only tells bitbake when to run it. -addtask webos_deploy_fixup after do_vmdkimg do_rootfs do_deploy do_image_complete before do_build