kernel: Stop using update-alternatives

The update-alternatives where using relative links so not being really
in use since December 2016 (see OE-Core:c7bc46b9 "kernel: Fix
symlinks") so instead we now generate the relative symlinks during the
do_install task and drop the update-alternatives use at all.

Acked-by: Saul Wold <sgw@linux.intel.com>
(From OE-Core rev: 10a1b293191268e6792ac8e27bd6427f1974c7ce)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 5 insertions, 31 deletions

diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc
index 0174c80d85..ca92822d25 100644
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ b/meta/recipes-kernel/linux/linux-dtb.inc
@@ -1,7 +1,5 @@
 # Support for device tree generation
-FILES_kernel-devicetree = "/${KERNEL_IMAGEDEST}/devicetree*"
-
-PACKAGE_WRITE_DEPS += "virtual/update-alternatives-native"
+FILES_kernel-devicetree = "/${KERNEL_IMAGEDEST}/*.dtb /${KERNEL_IMAGEDEST}/*.dtbo"
 
 python __anonymous () {
     d.appendVar("PACKAGES", " kernel-devicetree")
@@ -36,12 +34,13 @@ do_install_append() {
         for DTB in ${KERNEL_DEVICETREE}; do
                 DTB=`normalize_dtb "${DTB}"`
                 DTB_EXT=${DTB##*.}
+                DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"`
                 DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
+                install -m 0644 ${DTB_PATH} ${D}/${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT}
                 for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
                         symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME}
                         DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
-                        DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"`
-                        install -m 0644 ${DTB_PATH} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT}
+                        ln -sf ${DTB_BASE_NAME}.${DTB_EXT} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT}
                 done
         done
 }
@@ -60,32 +59,7 @@ do_deploy_append() {
                         install -d ${DEPLOYDIR}
                         install -m 0644 ${DTB_PATH} ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT}
                         ln -sf ${DTB_NAME}.${DTB_EXT} ${DEPLOYDIR}/${DTB_SYMLINK_NAME}.${DTB_EXT}
-                done
-        done
-}
-
-pkg_postinst_kernel-devicetree () {
-        cd /${KERNEL_IMAGEDEST}
-        for DTB in ${KERNEL_DEVICETREE}; do
-                for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
-                        symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME}
-                        DTB_EXT=${DTB##*.}
-                        DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
-                        DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
-                        update-alternatives --install /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} ${DTB_BASE_NAME}.${DTB_EXT} devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true
-                done
-        done
-}
-
-pkg_postrm_kernel-devicetree () {
-        cd /${KERNEL_IMAGEDEST}
-        for DTB in ${KERNEL_DEVICETREE}; do
-                for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
-                        symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME}
-                        DTB_EXT=${DTB##*.}
-                        DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
-                        DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
-                        update-alternatives --remove ${DTB_BASE_NAME}.${DTB_EXT} devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true
+                        ln -sf ${DTB_NAME}.${DTB_EXT} ${DEPLOYDIR}/${DTB_BASE_NAME}.${DTB_EXT}
                 done
         done
 }