summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2017-09-05 03:04:44 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-11 17:30:28 +0100
commitcb91b0eacd833b801732e177b734a756d9e0ae8f (patch)
treee7b422b25cfbfd81c1255e82c294c7ccb0b78d0c /meta/classes
parentee9db1a9152e8757ce4d831ff9f4472ff5a57dad (diff)
downloadpoky-cb91b0eacd833b801732e177b734a756d9e0ae8f.tar.gz
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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel.bbclass16
1 files changed, 3 insertions, 13 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 3cc0432fcf..02a5e961cb 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -2,7 +2,7 @@ inherit linux-kernel-base kernel-module-split
2 2
3PROVIDES += "virtual/kernel" 3PROVIDES += "virtual/kernel"
4DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native" 4DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native"
5PACKAGE_WRITE_DEPS += "depmodwrapper-cross virtual/update-alternatives-native" 5PACKAGE_WRITE_DEPS += "depmodwrapper-cross"
6 6
7do_deploy[depends] += "depmodwrapper-cross:do_populate_sysroot" 7do_deploy[depends] += "depmodwrapper-cross:do_populate_sysroot"
8 8
@@ -57,7 +57,7 @@ python __anonymous () {
57 57
58 d.appendVar('PACKAGES', ' ' + 'kernel-image-' + typelower) 58 d.appendVar('PACKAGES', ' ' + 'kernel-image-' + typelower)
59 59
60 d.setVar('FILES_kernel-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}') 60 d.setVar('FILES_kernel-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type)
61 61
62 d.appendVar('RDEPENDS_kernel-image', ' ' + 'kernel-image-' + typelower) 62 d.appendVar('RDEPENDS_kernel-image', ' ' + 'kernel-image-' + typelower)
63 63
@@ -65,13 +65,6 @@ python __anonymous () {
65 65
66 d.setVar('ALLOW_EMPTY_kernel-image-' + typelower, '1') 66 d.setVar('ALLOW_EMPTY_kernel-image-' + typelower, '1')
67 67
68 priority = d.getVar('KERNEL_PRIORITY')
69 postinst = '#!/bin/sh\n' + 'update-alternatives --install /' + imagedest + '/' + type + ' ' + type + ' ' + type + '-${KERNEL_VERSION_NAME} ' + priority + ' || true' + '\n'
70 d.setVar('pkg_postinst_kernel-image-' + typelower, postinst)
71
72 postrm = '#!/bin/sh\n' + 'update-alternatives --remove' + ' ' + type + ' ' + type + '-${KERNEL_VERSION_NAME} || true' + '\n'
73 d.setVar('pkg_postrm_kernel-image-' + typelower, postrm)
74
75 image = d.getVar('INITRAMFS_IMAGE') 68 image = d.getVar('INITRAMFS_IMAGE')
76 if image: 69 if image:
77 d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete') 70 d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
@@ -137,10 +130,6 @@ export CROSS_COMPILE = "${TARGET_PREFIX}"
137export KBUILD_BUILD_USER = "oe-user" 130export KBUILD_BUILD_USER = "oe-user"
138export KBUILD_BUILD_HOST = "oe-host" 131export KBUILD_BUILD_HOST = "oe-host"
139 132
140KERNEL_PRIORITY ?= "${@int(d.getVar('PV').split('-')[0].split('+')[0].split('.')[0]) * 10000 + \
141 int(d.getVar('PV').split('-')[0].split('+')[0].split('.')[1]) * 100 + \
142 int(d.getVar('PV').split('-')[0].split('+')[0].split('.')[-1])}"
143
144KERNEL_RELEASE ?= "${KERNEL_VERSION}" 133KERNEL_RELEASE ?= "${KERNEL_VERSION}"
145 134
146# The directory where built kernel lies in the kernel tree 135# The directory where built kernel lies in the kernel tree
@@ -350,6 +339,7 @@ kernel_do_install() {
350 install -d ${D}/boot 339 install -d ${D}/boot
351 for type in ${KERNEL_IMAGETYPES} ; do 340 for type in ${KERNEL_IMAGETYPES} ; do
352 install -m 0644 ${KERNEL_OUTPUT_DIR}/${type} ${D}/${KERNEL_IMAGEDEST}/${type}-${KERNEL_VERSION} 341 install -m 0644 ${KERNEL_OUTPUT_DIR}/${type} ${D}/${KERNEL_IMAGEDEST}/${type}-${KERNEL_VERSION}
342 ln -sf ${type}-${KERNEL_VERSION} ${D}/${KERNEL_IMAGEDEST}/${type}
353 done 343 done
354 install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} 344 install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION}
355 install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} 345 install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION}