remove webos_deploy

* replaced by upstreamed support: http://lists.openembedded.org/pipermail/openembedded-core/2019-October/287612.html
shr-project · Sep 30, 2021 · 5d636d9 · 5d636d9
1 parent f46be68
commit 5d636d9
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 128 deletions.
diff --git 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
@@ -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
diff --git a/meta-webos/classes/image.bbclass b/meta-webos/classes/image.bbclass
diff --git 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