mirror of
https://git.yoctoproject.org/poky
synced 2026-04-29 18:32:20 +02:00
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
@@ -46,7 +46,7 @@ python __anonymous () {
|
||||
kpn = d.getVar("KERNEL_PACKAGE_NAME")
|
||||
|
||||
# XXX Remove this after bug 11905 is resolved
|
||||
# FILES_${KERNEL_PACKAGE_NAME}-dev doesn't expand correctly
|
||||
# FILES:${KERNEL_PACKAGE_NAME}-dev doesn't expand correctly
|
||||
if kpn == pn:
|
||||
bb.warn("Some packages (E.g. *-dev) might be missing due to "
|
||||
"bug 11905 (variable KERNEL_PACKAGE_NAME == PN)")
|
||||
@@ -96,11 +96,11 @@ python __anonymous () {
|
||||
continue
|
||||
typelower = type.lower()
|
||||
d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower))
|
||||
d.setVar('FILES_' + kname + '-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type)
|
||||
d.appendVar('RDEPENDS_%s-image' % kname, ' %s-image-%s' % (kname, typelower))
|
||||
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.setVar('pkg_postinst_%s-image-%s' % (kname,typelower), """set +e
|
||||
d.setVar('FILES:' + kname + '-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type)
|
||||
d.appendVar('RDEPENDS:%s-image' % kname, ' %s-image-%s' % (kname, typelower))
|
||||
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.setVar('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
|
||||
@@ -112,7 +112,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
|
||||
@@ -303,7 +303,7 @@ do_bundle_initramfs () {
|
||||
}
|
||||
do_bundle_initramfs[dirs] = "${B}"
|
||||
|
||||
python do_devshell_prepend () {
|
||||
python do_devshell:prepend () {
|
||||
os.environ["LDFLAGS"] = ''
|
||||
}
|
||||
|
||||
@@ -591,7 +591,7 @@ kernel_do_configure() {
|
||||
fi
|
||||
|
||||
# Copy defconfig to .config if .config does not exist. This allows
|
||||
# recipes to manage the .config themselves in do_configure_prepend().
|
||||
# recipes to manage the .config themselves in do_configure:prepend().
|
||||
if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then
|
||||
cp "${WORKDIR}/defconfig" "${B}/.config"
|
||||
fi
|
||||
@@ -608,34 +608,34 @@ addtask savedefconfig after do_configure
|
||||
|
||||
inherit cml1
|
||||
|
||||
KCONFIG_CONFIG_COMMAND_append = " LD='${KERNEL_LD}' HOSTLDFLAGS='${BUILD_LDFLAGS}'"
|
||||
KCONFIG_CONFIG_COMMAND:append = " LD='${KERNEL_LD}' HOSTLDFLAGS='${BUILD_LDFLAGS}'"
|
||||
|
||||
EXPORT_FUNCTIONS do_compile do_install do_configure
|
||||
|
||||
# kernel-base becomes kernel-${KERNEL_VERSION}
|
||||
# kernel-image becomes kernel-image-${KERNEL_VERSION}
|
||||
PACKAGES = "${KERNEL_PACKAGE_NAME} ${KERNEL_PACKAGE_NAME}-base ${KERNEL_PACKAGE_NAME}-vmlinux ${KERNEL_PACKAGE_NAME}-image ${KERNEL_PACKAGE_NAME}-dev ${KERNEL_PACKAGE_NAME}-modules"
|
||||
FILES_${PN} = ""
|
||||
FILES_${KERNEL_PACKAGE_NAME}-base = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.order ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
|
||||
FILES_${KERNEL_PACKAGE_NAME}-image = ""
|
||||
FILES_${KERNEL_PACKAGE_NAME}-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH} ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
|
||||
FILES_${KERNEL_PACKAGE_NAME}-vmlinux = "/boot/vmlinux-${KERNEL_VERSION_NAME}"
|
||||
FILES_${KERNEL_PACKAGE_NAME}-modules = ""
|
||||
RDEPENDS_${KERNEL_PACKAGE_NAME} = "${KERNEL_PACKAGE_NAME}-base"
|
||||
FILES:${PN} = ""
|
||||
FILES:${KERNEL_PACKAGE_NAME}-base = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.order ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
|
||||
FILES:${KERNEL_PACKAGE_NAME}-image = ""
|
||||
FILES:${KERNEL_PACKAGE_NAME}-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH} ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
|
||||
FILES:${KERNEL_PACKAGE_NAME}-vmlinux = "/boot/vmlinux-${KERNEL_VERSION_NAME}"
|
||||
FILES:${KERNEL_PACKAGE_NAME}-modules = ""
|
||||
RDEPENDS:${KERNEL_PACKAGE_NAME} = "${KERNEL_PACKAGE_NAME}-base"
|
||||
# Allow machines to override this dependency if kernel image files are
|
||||
# not wanted in images as standard
|
||||
RDEPENDS_${KERNEL_PACKAGE_NAME}-base ?= "${KERNEL_PACKAGE_NAME}-image"
|
||||
PKG_${KERNEL_PACKAGE_NAME}-image = "${KERNEL_PACKAGE_NAME}-image-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}"
|
||||
RDEPENDS_${KERNEL_PACKAGE_NAME}-image += "${@oe.utils.conditional('KERNEL_IMAGETYPE', 'vmlinux', '${KERNEL_PACKAGE_NAME}-vmlinux', '', 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}"
|
||||
ALLOW_EMPTY_${KERNEL_PACKAGE_NAME} = "1"
|
||||
ALLOW_EMPTY_${KERNEL_PACKAGE_NAME}-base = "1"
|
||||
ALLOW_EMPTY_${KERNEL_PACKAGE_NAME}-image = "1"
|
||||
ALLOW_EMPTY_${KERNEL_PACKAGE_NAME}-modules = "1"
|
||||
DESCRIPTION_${KERNEL_PACKAGE_NAME}-modules = "Kernel modules meta package"
|
||||
RDEPENDS:${KERNEL_PACKAGE_NAME}-base ?= "${KERNEL_PACKAGE_NAME}-image"
|
||||
PKG:${KERNEL_PACKAGE_NAME}-image = "${KERNEL_PACKAGE_NAME}-image-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}"
|
||||
RDEPENDS:${KERNEL_PACKAGE_NAME}-image += "${@oe.utils.conditional('KERNEL_IMAGETYPE', 'vmlinux', '${KERNEL_PACKAGE_NAME}-vmlinux', '', 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}"
|
||||
ALLOW_EMPTY:${KERNEL_PACKAGE_NAME} = "1"
|
||||
ALLOW_EMPTY:${KERNEL_PACKAGE_NAME}-base = "1"
|
||||
ALLOW_EMPTY:${KERNEL_PACKAGE_NAME}-image = "1"
|
||||
ALLOW_EMPTY:${KERNEL_PACKAGE_NAME}-modules = "1"
|
||||
DESCRIPTION:${KERNEL_PACKAGE_NAME}-modules = "Kernel modules meta package"
|
||||
|
||||
pkg_postinst_${KERNEL_PACKAGE_NAME}-base () {
|
||||
pkg_postinst:${KERNEL_PACKAGE_NAME}-base () {
|
||||
if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
|
||||
mkdir -p $D/lib/modules/${KERNEL_VERSION}
|
||||
fi
|
||||
@@ -646,7 +646,7 @@ pkg_postinst_${KERNEL_PACKAGE_NAME}-base () {
|
||||
fi
|
||||
}
|
||||
|
||||
PACKAGESPLITFUNCS_prepend = "split_kernel_packages "
|
||||
PACKAGESPLITFUNCS:prepend = "split_kernel_packages "
|
||||
|
||||
python split_kernel_packages () {
|
||||
do_split_packages(d, root='${nonarch_base_libdir}/firmware', file_regex=r'^(.*)\.(bin|fw|cis|csp|dsp)$', output_pattern='${KERNEL_PACKAGE_NAME}-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
|
||||
|
||||
Reference in New Issue
Block a user