diff options
Diffstat (limited to 'poky/meta/classes-recipe/kernel.bbclass')
| -rw-r--r-- | poky/meta/classes-recipe/kernel.bbclass | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/poky/meta/classes-recipe/kernel.bbclass b/poky/meta/classes-recipe/kernel.bbclass index d6eedf942c..a7c4bf0ef4 100644 --- a/poky/meta/classes-recipe/kernel.bbclass +++ b/poky/meta/classes-recipe/kernel.bbclass @@ -21,7 +21,10 @@ PACKAGE_WRITE_DEPS += "depmodwrapper-cross" do_deploy[depends] += "depmodwrapper-cross:do_populate_sysroot gzip-native:do_populate_sysroot" do_clean[depends] += "make-mod-scripts:do_clean" -CVE_PRODUCT ?= "linux_kernel" +# CPE entries from NVD use linux_kernel, but the raw CVE entries from the kernel CNA have +# vendor: linux and product: linux. Note that multiple distributions use "linux" as a product +# name, so we need to fill vendor to avoid false positives +CVE_PRODUCT ?= "linux_kernel linux:linux" S = "${STAGING_KERNEL_DIR}" B = "${WORKDIR}/build" @@ -115,7 +118,9 @@ python __anonymous () { d.setVar('PKG:%s-image-%s' % (kname,typelower), '%s-image-%s-${KERNEL_VERSION_PKG_NAME}' % (kname, typelower)) d.setVar('ALLOW_EMPTY:%s-image-%s' % (kname, typelower), '1') - d.prependVar('pkg_postinst:%s-image-%s' % (kname,typelower), """set +e + + if d.getVar('KERNEL_IMAGETYPE_SYMLINK') == '1': + d.prependVar('pkg_postinst:%s-image-%s' % (kname,typelower), """set +e if [ -n "$D" ]; then ln -sf %s-${KERNEL_VERSION} $D/${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1 else @@ -127,7 +132,7 @@ else fi set -e """ % (type, type, type, type, type, type, type)) - d.setVar('pkg_postrm:%s-image-%s' % (kname,typelower), """set +e + d.setVar('pkg_postrm:%s-image-%s' % (kname,typelower), """set +e if [ -f "${KERNEL_IMAGEDEST}/%s" -o -L "${KERNEL_IMAGEDEST}/%s" ]; then rm -f ${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1 fi @@ -222,8 +227,6 @@ KERNEL_DTBVENDORED ?= "0" # # configuration # -export CMDLINE_CONSOLE = "console=${@d.getVar("KERNEL_CONSOLE") or "ttyS0"}" - KERNEL_VERSION = "${@get_kernelversion_headers('${B}')}" # kernels are generally machine specific @@ -686,13 +689,6 @@ kernel_do_configure() { ${KERNEL_CONFIG_COMMAND} } -do_savedefconfig() { - bbplain "Saving defconfig to:\n${B}/defconfig" - oe_runmake -C ${B} savedefconfig -} -do_savedefconfig[nostamp] = "1" -addtask savedefconfig after do_configure - inherit cml1 pkgconfig # Need LD, HOSTLDFLAGS and more for config operations @@ -715,9 +711,10 @@ RDEPENDS:${KERNEL_PACKAGE_NAME} = "${KERNEL_PACKAGE_NAME}-base (= ${EXTENDPKGV}) # not wanted in images as standard RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base ?= "${KERNEL_PACKAGE_NAME}-image (= ${EXTENDPKGV})" PKG:${KERNEL_PACKAGE_NAME}-image = "${KERNEL_PACKAGE_NAME}-image-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}" +RPROVIDES:${KERNEL_PACKAGE_NAME}-image += "${KERNEL_PACKAGE_NAME}-image" RDEPENDS:${KERNEL_PACKAGE_NAME}-image += "${@oe.utils.conditional('KERNEL_IMAGETYPE', 'vmlinux', '${KERNEL_PACKAGE_NAME}-vmlinux (= ${EXTENDPKGV})', '', d)}" PKG:${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}" -RPROVIDES:${KERNEL_PACKAGE_NAME}-base += "${KERNEL_PACKAGE_NAME}-${KERNEL_VERSION}" +RPROVIDES:${KERNEL_PACKAGE_NAME}-base += "${KERNEL_PACKAGE_NAME}-${KERNEL_VERSION} ${KERNEL_PACKAGE_NAME}-base" ALLOW_EMPTY:${KERNEL_PACKAGE_NAME} = "1" ALLOW_EMPTY:${KERNEL_PACKAGE_NAME}-base = "1" ALLOW_EMPTY:${KERNEL_PACKAGE_NAME}-image = "1" |