MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-04 21:05:25 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

global: overrides syntax conversion

Browse Source 
OEcore/bitbake are moving to use the clearer ":" as an overrides
separator.

This is pass one of updating the meta-virt recipes to use that
syntax.

This has only been minimally build/runtime tested, more changes
will be required for missed overrides, or incorrect conversions

Note: A recent bitbake is required:

    commit 75fad23fc06c008a03414a1fc288a8614c6af9ca
    Author: Richard Purdie <richard.purdie@linuxfoundation.org>
    Date:   Sun Jul 18 12:59:15 2021 +0100

        bitbake: data_smart/parse: Allow ':' characters in variable/function names

        It is becomming increasingly clear we need to find a way to show what
        is/is not an override in our syntax. We need to do this in a way which
        is clear to users, readable and in a way we can transition to.

        The most effective way I've found to this is to use the ":" charater
        to directly replace "_" where an override is being specified. This
        includes "append", "prepend" and "remove" which are effectively special
        override directives.

        This patch simply adds the character to the parser so bitbake accepts
        the value but maps it back to "_" internally so there is no behaviour
        change.

        This change is simple enough it could potentially be backported to older
        version of bitbake meaning layers using the new syntax/markup could
        work with older releases. Even if other no other changes are accepted
        at this time and we don't backport, it does set us on a path where at
        some point in future we could
        require a more explict syntax.

        I've tested this patch by converting oe-core/meta-yocto to the new
        syntax for overrides (9000+ changes) and then seeing that builds
        continue to work with this patch.

        (Bitbake rev: 0dbbb4547cb2570d2ce607e9a53459df3c0ac284)

        Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2021-07-28 14:22:43 -04:00
parent 5fdf66c1e2
commit d876cfc5bf
122 changed files with 596 additions and 595 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -8,7 +8,7 @@ The bbappend files for some recipes (e.g. linux-yocto) in this layer need to
have 'virtualization' in DISTRO_FEATURES to have effect. To enable them, add
in configuration file the following line.
DISTRO_FEATURES_append = " virtualization"
DISTRO_FEATURES:append = " virtualization"
If meta-virtualization is included, but virtualization is not enabled as a
distro feature a warning is printed at parse time:

10
classes/cni_networking.bbclass
View File

@ -1,12 +1,12 @@
DEPENDS_append_class-target = " cni"
DEPENDS:append:class-target = " cni"
PACKAGES_prepend = "${PN}-cni "
PACKAGES:prepend = "${PN}-cni "
FILES_${PN}-cni = "${sysconfdir}/cni/net.d/*"
FILES:${PN}-cni = "${sysconfdir}/cni/net.d/*"
RDEPENDS_${PN}-cni = "cni"
RDEPENDS:${PN}-cni = "cni"
do_install_append() {
do_install:append() {
if [ -z "${CNI_NETWORKING_FILES}" ]; then
bbfatal "cni-networking was inherited, but no networking configuration was provided via CNI_NETWORKING_FILES"
fi

2
classes/image-oci-sloci-image.inc
View File

@ -1,4 +1,4 @@
IMAGE_CMD_oci() {
IMAGE_CMD:oci() {
sloci_options=""
bbdebug 1 "OCI image settings:"

2
classes/image-oci-umoci.inc
View File

@ -1,4 +1,4 @@
IMAGE_CMD_oci() {
IMAGE_CMD:oci() {
umoci_options=""
bbdebug 1 "UMOCI image settings:"

2
classes/image-oci.bbclass
View File

@ -88,7 +88,7 @@ def oci_map_subarch(a, f, d):
return ''
return ''
# the IMAGE_CMD_oci comes from the .inc
# the IMAGE_CMD:oci comes from the .inc
OCI_IMAGE_BACKEND_INC ?= "${@"image-oci-" + "${OCI_IMAGE_BACKEND}" + ".inc"}"
include ${OCI_IMAGE_BACKEND_INC}

6
conf/distro/include/meta-virt-xen.inc
View File

@ -1,9 +1,9 @@
# Make sure Xen mode is enabled in qemu
PACKAGECONFIG_append_pn-qemu = " xen"
PACKAGECONFIG:append:pn-qemu = " xen"
# For builds for ARM platforms, enable fdt
PACKAGECONFIG_append_pn-qemu_arm = " fdt"
PACKAGECONFIG_append_pn-qemu_aarch64 = " fdt"
PACKAGECONFIG:append:pn-qemu:arm = " fdt"
PACKAGECONFIG:append:pn-qemu:aarch64 = " fdt"
# Xen on Raspberry Pi 4 64-bit support
XEN_RPI4_64_CONFIG_PATH ??= \

4
conf/distro/include/virt_security_flags.inc
View File

@ -1,5 +1,5 @@
# Build errors with the pie options enabled
SECURITY_CFLAGS_pn-libvirt = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS:pn-libvirt = "${SECURITY_NO_PIE_CFLAGS}"
# This has text relco errors with the pie options enabled
SECURITY_CFLAGS_pn-lxc = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS:pn-lxc = "${SECURITY_NO_PIE_CFLAGS}"

6
conf/layer.conf
View File

@ -54,8 +54,8 @@ INHERIT += "sanity-meta-virt"
META_VIRT_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-default-versions.inc"
META_VIRT_XEN_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-xen.inc"
K8S_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/k8s-versions.inc"
USER_CLASSES_append = " meta-virt-cfg"
USER_CLASSES_append = " meta-virt-k8s-cfg"
USER_CLASSES_append = " meta-virt-xen-cfg"
USER_CLASSES:append = " meta-virt-cfg"
USER_CLASSES:append = " meta-virt-k8s-cfg"
USER_CLASSES:append = " meta-virt-xen-cfg"
HOSTTOOLS_NONFATAL += "getent"

8
dynamic-layers/raspberrypi/conf/distro/include/xen-raspberrypi4-64.inc
View File

@ -5,15 +5,15 @@ RPI_USE_U_BOOT = "1"
ENABLE_UART = "1"
# Build the bootable SD card image
IMAGE_CLASSES_append = " sdcard_image-rpi"
IMAGE_FSTYPES_append = " rpi-sdimg"
IMAGE_CLASSES:append = " sdcard_image-rpi"
IMAGE_FSTYPES:append = " rpi-sdimg"
# Add Xen to the bootable SD card image
RPI_SDIMG_EXTRA_DEPENDS_append = " xen:do_deploy"
RPI_SDIMG_EXTRA_DEPENDS:append = " xen:do_deploy"
DEPLOYPAYLOAD = "xen-${MACHINE}:xen"
# We need the GIC enabled for Xen to work
RPI_EXTRA_CONFIG_append = "\nenable_gic=1"
RPI_EXTRA_CONFIG:append = "\nenable_gic=1"
# Increase boot partition for space for kernel and Xen
BOOT_SPACE = "61440"

4
dynamic-layers/xilinx/recipes-extended/xen/xen-xilinx.inc
View File

@ -1,10 +1,10 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
DEPENDS += "u-boot-mkimage-native"
DEPENDS += "dtc-native"
XENIMAGE_KERNEL_LOADADDRESS ?= "0x6000000"
do_deploy_append() {
do_deploy:append() {
if [ -f ${DEPLOYDIR}/xen-${MACHINE} ]; then
uboot-mkimage -A arm64 -T kernel -a ${XENIMAGE_KERNEL_LOADADDRESS} -e ${XENIMAGE_KERNEL_LOADADDRESS} -C none -d ${DEPLOYDIR}/xen-${MACHINE} ${DEPLOYDIR}/xen.ub
fi

4
recipes-containers/cgroup-lite/cgroup-lite_1.15.bb
View File

@ -17,8 +17,8 @@ INITSCRIPT_PARAMS = "start 8 2 3 4 5 . stop 20 0 1 6 ."
# Keeps the sysvinit scripts out of the image if building
# where systemd is in use.
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "cgroups-init.service"
SYSTEMD_AUTO_ENABLE_${PN} = "mask"
SYSTEMD_SERVICE:${PN} = "cgroups-init.service"
SYSTEMD_AUTO_ENABLE:${PN} = "mask"
do_install() {

12
recipes-containers/containerd/containerd-opencontainers_git.bb
View File

@ -20,7 +20,7 @@ CONTAINERD_VERSION = "v1.5.4"
EXTRA_OEMAKE += "GODEBUG=1"
PROVIDES += "virtual/containerd"
RPROVIDES_${PN} = "virtual/containerd"
RPROVIDES:${PN} = "virtual/containerd"
S = "${WORKDIR}/git"
@ -33,7 +33,7 @@ GO_IMPORT = "import"
CONTAINERD_PKG="github.com/containerd/containerd"
INSANE_SKIP_${PN} += "ldflags"
INSANE_SKIP:${PN} += "ldflags"
do_configure[noexec] = "1"
@ -91,7 +91,7 @@ do_compile() {
inherit systemd
SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','containerd.service','',d)}"
SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','containerd.service','',d)}"
do_install() {
mkdir -p ${D}/${bindir}
@ -116,12 +116,12 @@ do_install() {
fi
}
FILES_${PN} += "${systemd_system_unitdir}/*"
FILES:${PN} += "${systemd_system_unitdir}/*"
INSANE_SKIP_${PN} += "ldflags already-stripped"
INSANE_SKIP:${PN} += "ldflags already-stripped"
COMPATIBLE_HOST = "^(?!(qemu)?mips).*"
RDEPENDS_${BPN} += " virtual/runc"
RDEPENDS:${BPN} += " virtual/runc"
CVE_PRODUCT = "containerd"

22
recipes-containers/cri-o/cri-o_git.bb
View File

@ -41,7 +41,7 @@ DEPENDS = " \
libseccomp \
libselinux \
"
RDEPENDS_${PN} = " \
RDEPENDS:${PN} = " \
cni \
libdevmapper \
"
@ -50,8 +50,8 @@ PNBLACKLIST[cri-o] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'security', bb
PACKAGES =+ "${PN}-config"
RDEPENDS_${PN} += " virtual/containerd virtual/runc"
RDEPENDS_${PN} += " e2fsprogs-mke2fs conmon util-linux iptables conntrack-tools"
RDEPENDS:${PN} += " virtual/containerd virtual/runc"
RDEPENDS:${PN} += " e2fsprogs-mke2fs conmon util-linux iptables conntrack-tools"
inherit systemd
inherit go
@ -70,8 +70,8 @@ do_compile() {
}
SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','crio.service','',d)}"
SYSTEMD_AUTO_ENABLE_${PN} = "enable"
SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','crio.service','',d)}"
SYSTEMD_AUTO_ENABLE:${PN} = "enable"
do_install() {
set +e
@ -98,15 +98,15 @@ do_install() {
install -m 0644 ${S}/src/import/contrib/systemd/crio-wipe.service ${D}${systemd_unitdir}/system/
}
FILES_${PN}-config = "${sysconfdir}/crio/config/*"
FILES_${PN} += "${systemd_unitdir}/system/*"
FILES_${PN} += "/usr/local/bin/*"
FILES_${PN} += "/usr/share/containers/oci/hooks.d"
FILES:${PN}-config = "${sysconfdir}/crio/config/*"
FILES:${PN} += "${systemd_unitdir}/system/*"
FILES:${PN} += "/usr/local/bin/*"
FILES:${PN} += "/usr/share/containers/oci/hooks.d"
# don't clobber hooks.d
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY:${PN} = "1"
INSANE_SKIP_${PN} += "ldflags already-stripped"
INSANE_SKIP:${PN} += "ldflags already-stripped"
deltask compile_ptest_base

8
recipes-containers/cri-tools/cri-tools_git.bb
View File

@ -29,7 +29,7 @@ GO_IMPORT = "import"
PV = "1.21.0+git${SRCREV_cri-tools}"
RPROVIDES_${PN} += "crictl"
RPROVIDES:${PN} += "crictl"
PACKAGES =+ "${PN}-critest"
inherit go
@ -66,12 +66,12 @@ do_install() {
install -m 755 -D ${S}/src/import/build/bin/* ${D}/${bindir}
}
FILES_${PN}-critest = "${bindir}/critest"
FILES:${PN}-critest = "${bindir}/critest"
# don't clobber hooks.d
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY:${PN} = "1"
INSANE_SKIP_${PN} += "ldflags already-stripped textrel"
INSANE_SKIP:${PN} += "ldflags already-stripped textrel"
deltask compile_ptest_base

20
recipes-containers/criu/criu_git.bb
View File

@ -25,7 +25,7 @@ SRC_URI = "git://github.com/checkpoint-restore/criu.git;branch=criu-dev \
COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux"
DEPENDS += "libnl libcap protobuf-c-native protobuf-c util-linux-native libbsd libnet"
RDEPENDS_${PN} = "bash"
RDEPENDS:${PN} = "bash"
S = "${WORKDIR}/git"
@ -34,17 +34,17 @@ S = "${WORKDIR}/git"
# if the ARCH is ARMv7 or ARMv6.
# ARM BSPs need set CRIU_BUILD_ARCH variable for building CRIU.
#
EXTRA_OEMAKE_arm += "ARCH=arm UNAME-M=${CRIU_BUILD_ARCH} WERROR=0"
EXTRA_OEMAKE_x86-64 += "ARCH=x86 WERROR=0"
EXTRA_OEMAKE_aarch64 += "ARCH=aarch64 WERROR=0"
EXTRA_OEMAKE:arm += "ARCH=arm UNAME-M=${CRIU_BUILD_ARCH} WERROR=0"
EXTRA_OEMAKE:x86-64 += "ARCH=x86 WERROR=0"
EXTRA_OEMAKE:aarch64 += "ARCH=aarch64 WERROR=0"
EXTRA_OEMAKE_append += "SBINDIR=${sbindir} LIBDIR=${libdir} INCLUDEDIR=${includedir} PIEGEN=no"
EXTRA_OEMAKE_append += "LOGROTATEDIR=${sysconfdir} SYSTEMDUNITDIR=${systemd_unitdir}"
EXTRA_OEMAKE:append += "SBINDIR=${sbindir} LIBDIR=${libdir} INCLUDEDIR=${includedir} PIEGEN=no"
EXTRA_OEMAKE:append += "LOGROTATEDIR=${sysconfdir} SYSTEMDUNITDIR=${systemd_unitdir}"
CFLAGS += "-D__USE_GNU -D_GNU_SOURCE "
CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_INCDIR}/libnl3"
CFLAGS_arm += "-D__WORDSIZE"
CFLAGS:arm += "-D__WORDSIZE"
# overide LDFLAGS to allow criu to build without: "x86_64-poky-linux-ld: unrecognized option '-Wl,-O1'"
export LDFLAGS=""
@ -63,7 +63,7 @@ PACKAGECONFIG[selinux] = ",,libselinux"
CLEANBROKEN = "1"
do_compile_prepend() {
do_compile:prepend() {
rm -rf ${S}/images/google/protobuf/descriptor.proto
ln -s ${PKG_CONFIG_SYSROOT_DIR}/usr/include/google/protobuf/descriptor.proto ${S}/images/google/protobuf/descriptor.proto
}
@ -83,13 +83,13 @@ do_install () {
sed -i 's%^\#\!.*%\#\!/usr/bin/env python3%g' ${D}/usr/bin/crit
}
FILES_${PN} += "${systemd_unitdir}/ \
FILES:${PN} += "${systemd_unitdir}/ \
${libdir}/python3*/site-packages/ \
${libdir}/pycriu/ \
${libdir}/crit-0.0.1-py3*.egg-info \
"
FILES_${PN}-staticdev += " \
FILES:${PN}-staticdev += " \
${libexecdir}/compel/std.lib.a \
${libexecdir}/compel/fds.lib.a \
"

2
recipes-containers/crun/crun_git.bb
View File

@ -33,7 +33,7 @@ DEPENDS += "libseccomp"
DEPENDS += "systemd"
DEPENDS += "oci-image-spec oci-runtime-spec"
do_configure_prepend () {
do_configure:prepend () {
./autogen.sh
}

2
recipes-containers/docker-compose/python3-docker-compose_1.29.2.bb
View File

@ -14,7 +14,7 @@ SRC_URI += "file://0001-setup.py-remove-maximum-version-requirements.patch \
DEPENDS += "${PYTHON_PN}-fastentrypoints-native"
RDEPENDS_${PN} = "\
RDEPENDS:${PN} = "\
${PYTHON_PN}-cached-property \
${PYTHON_PN}-certifi \
${PYTHON_PN}-chardet \

16
recipes-containers/docker-distribution/docker-distribution_git.bb
View File

@ -58,16 +58,16 @@ do_install() {
install -d ${D}/${localstatedir}/lib/registry/
}
INSANE_SKIP_${PN} += "ldflags already-stripped"
INSANE_SKIP_${MLPREFIX}docker-registry += "ldflags already-stripped textrel"
INSANE_SKIP:${PN} += "ldflags already-stripped"
INSANE_SKIP:${MLPREFIX}docker-registry += "ldflags already-stripped textrel"
FILES_docker-registry = "${sbindir}/*"
FILES_docker-registry += "${systemd_unitdir}/system/docker-registry.service"
FILES_docker-registry += "${sysconfdir}/docker-distribution/*"
FILES_docker-registry += "${localstatedir}/lib/registry/"
FILES:docker-registry = "${sbindir}/*"
FILES:docker-registry += "${systemd_unitdir}/system/docker-registry.service"
FILES:docker-registry += "${sysconfdir}/docker-distribution/*"
FILES:docker-registry += "${localstatedir}/lib/registry/"
SYSTEMD_SERVICE_docker-registry = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker-registry.service','',d)}"
SYSTEMD_AUTO_ENABLE_docker-registry = "enable"
SYSTEMD_SERVICE:docker-registry = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker-registry.service','',d)}"
SYSTEMD_AUTO_ENABLE:docker-registry = "enable"
RDEPENDS_${PN}-ptest_remove = "${PN}"

38
recipes-containers/docker/docker.inc
View File

@ -20,25 +20,25 @@ DEPENDS = " \
libtool \
"
DEPENDS_append_class-target = " lvm2"
RDEPENDS_${PN} = "util-linux util-linux-unshare iptables \
DEPENDS:append:class-target = " lvm2"
RDEPENDS:${PN} = "util-linux util-linux-unshare iptables \
${@bb.utils.contains('DISTRO_FEATURES', 'aufs', 'aufs-util', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'cgroup-lite', d)} \
bridge-utils \
ca-certificates \
"
RDEPENDS_${PN} += "virtual/containerd virtual/runc"
RDEPENDS:${PN} += "virtual/containerd virtual/runc"
RRECOMMENDS_${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade"
RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade"
PROVIDES += "virtual/docker"
# we want all the docker variant recpes to be installable via "docker"
PACKAGE_NAME = "docker"
RPROVIDES_${PN} += "docker"
RPROVIDES_${PN}-dbg += "docker-dbg"
RPROVIDES_${PN}-dev += "docker-dev"
RPROVIDES_${PN}-contrip += "docker-dev"
RPROVIDES:${PN} += "docker"
RPROVIDES:${PN}-dbg += "docker-dbg"
RPROVIDES:${PN}-dev += "docker-dev"
RPROVIDES:${PN}-contrip += "docker-dev"
inherit pkgconfig
PACKAGECONFIG ??= "docker-init"
@ -139,26 +139,26 @@ do_install() {
SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.socket','',d)}"
SYSTEMD_AUTO_ENABLE_${PN} = "enable"
SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.socket','',d)}"
SYSTEMD_AUTO_ENABLE:${PN} = "enable"
INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}"
INITSCRIPT_NAME_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}"
INITSCRIPT_PARAMS_${PN} = "defaults"
INITSCRIPT_NAME:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}"
INITSCRIPT_PARAMS:${PN} = "defaults"
inherit useradd
USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "-r docker"
GROUPADD_PARAM:${PN} = "-r docker"
COMPATIBLE_HOST = "^(?!(qemu)?mips).*"
INSANE_SKIP_${PN} += "ldflags textrel"
INSANE_SKIP:${PN} += "ldflags textrel"
FILES_${PN} += "${systemd_unitdir}/system/* ${sysconfdir}/docker"
FILES:${PN} += "${systemd_unitdir}/system/* ${sysconfdir}/docker"
PACKAGES =+ "${PN}-contrib"
FILES_${PN}-contrib += "${datadir}/docker/check-config.sh"
RDEPENDS_${PN}-contrib += "bash"
FILES:${PN}-contrib += "${datadir}/docker/check-config.sh"
RDEPENDS:${PN}-contrib += "bash"
# By the docker-packaging repository and https://docs.docker.com/engine/install/centos/#installation-methods
# docker is packaged by most distros with a split between the engine and the CLI.
@ -171,9 +171,9 @@ RDEPENDS_${PN}-contrib += "bash"
# set the DOCKER_UNIFIED_PACKAGE variable to False
#
PACKAGES =+ "${PN}-cli"
FILES_${PN}-cli += "${bindir}/docker"
FILES:${PN}-cli += "${bindir}/docker"
# set to "False" if packages should be generated for the cli and engine, and
# NOT rdepend to get a classic one-package install
DOCKER_UNIFIED_PACKAGE ?= "True"
RDEPENDS_${PN} += "${@bb.utils.contains("DOCKER_UNIFIED_PACKAGE", "True", "${PN}-cli", "", d)}"
RDEPENDS:${PN} += "${@bb.utils.contains("DOCKER_UNIFIED_PACKAGE", "True", "${PN}-cli", "", d)}"

4
recipes-containers/go-digest/go-digest_git.bb
View File

@ -36,6 +36,6 @@ go_digest_file_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
CLEANBROKEN = "1"
CLEANBROKEN = "1"

4
recipes-containers/go-errors/go-errors_git.bb
View File

@ -36,6 +36,6 @@ go_errors_file_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
CLEANBROKEN = "1"
CLEANBROKEN = "1"

4
recipes-containers/go-spf13-cobra/spf13-cobra_git.bb
View File

@ -36,6 +36,6 @@ cobra_file_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
CLEANBROKEN = "1"
CLEANBROKEN = "1"

4
recipes-containers/go-spf13-pflag/spf13-pflag_git.bb
View File

@ -36,6 +36,6 @@ pflag_file_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
CLEANBROKEN = "1"
CLEANBROKEN = "1"

22
recipes-containers/k3s/k3s_git.bb
View File

@ -72,18 +72,18 @@ do_install() {
PACKAGES =+ "${PN}-server ${PN}-agent"
SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}-server ${PN}-agent','',d)}"
SYSTEMD_SERVICE_${PN}-server = "${@bb.utils.contains('DISTRO_FEATURES','systemd','k3s.service','',d)}"
SYSTEMD_SERVICE_${PN}-agent = "${@bb.utils.contains('DISTRO_FEATURES','systemd','k3s-agent.service','',d)}"
SYSTEMD_AUTO_ENABLE_${PN}-agent = "disable"
SYSTEMD_SERVICE:${PN}-server = "${@bb.utils.contains('DISTRO_FEATURES','systemd','k3s.service','',d)}"
SYSTEMD_SERVICE:${PN}-agent = "${@bb.utils.contains('DISTRO_FEATURES','systemd','k3s-agent.service','',d)}"
SYSTEMD_AUTO_ENABLE:${PN}-agent = "disable"
FILES_${PN}-agent = "${BIN_PREFIX}/bin/k3s-agent"
FILES_${PN} += "${BIN_PREFIX}/bin/*"
FILES:${PN}-agent = "${BIN_PREFIX}/bin/k3s-agent"
FILES:${PN} += "${BIN_PREFIX}/bin/*"
RDEPENDS_${PN} = "k3s-cni conntrack-tools coreutils findutils iptables iproute2 ipset virtual/containerd"
RDEPENDS_${PN}-server = "${PN}"
RDEPENDS_${PN}-agent = "${PN}"
RDEPENDS:${PN} = "k3s-cni conntrack-tools coreutils findutils iptables iproute2 ipset virtual/containerd"
RDEPENDS:${PN}-server = "${PN}"
RDEPENDS:${PN}-agent = "${PN}"
RRECOMMENDS_${PN} = "\
RRECOMMENDS:${PN} = "\
kernel-module-xt-addrtype \
kernel-module-xt-nat \
kernel-module-xt-multiport \
@ -95,7 +95,7 @@ RRECOMMENDS_${PN} = "\
kernel-module-xt-masquerade \
"
RCONFLICTS_${PN} = "kubectl"
RCONFLICTS:${PN} = "kubectl"
INHIBIT_PACKAGE_STRIP = "1"
INSANE_SKIP_${PN} += "ldflags already-stripped"
INSANE_SKIP:${PN} += "ldflags already-stripped"

26
recipes-containers/kubernetes/kubernetes_git.bb
View File

@ -87,30 +87,30 @@ do_install() {
PACKAGES =+ "kubeadm kubectl kubelet kube-proxy ${PN}-misc"
ALLOW_EMPTY_${PN} = "1"
INSANE_SKIP_${PN} += "ldflags already-stripped"
INSANE_SKIP_${PN}-misc += "ldflags already-stripped"
ALLOW_EMPTY:${PN} = "1"
INSANE_SKIP:${PN} += "ldflags already-stripped"
INSANE_SKIP:${PN}-misc += "ldflags already-stripped"
# Note: we are explicitly *not* adding docker to the rdepends, since we allow
# backends like cri-o to be used.
RDEPENDS_${PN} += "kubeadm \
RDEPENDS:${PN} += "kubeadm \
kubectl \
kubelet \
cni"
RDEPENDS_kubeadm = "kubelet kubectl"
FILES_kubeadm = "${bindir}/kubeadm ${systemd_unitdir}/system/kubelet.service.d/*"
RDEPENDS:kubeadm = "kubelet kubectl"
FILES:kubeadm = "${bindir}/kubeadm ${systemd_unitdir}/system/kubelet.service.d/*"
RDEPENDS_kubelet = "iptables socat util-linux ethtool iproute2 ebtables iproute2-tc"
FILES_kubelet = "${bindir}/kubelet ${systemd_unitdir}/system/kubelet.service ${sysconfdir}/kubernetes/manifests/"
RDEPENDS:kubelet = "iptables socat util-linux ethtool iproute2 ebtables iproute2-tc"
FILES:kubelet = "${bindir}/kubelet ${systemd_unitdir}/system/kubelet.service ${sysconfdir}/kubernetes/manifests/"
SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kubelet','',d)}"
SYSTEMD_SERVICE_kubelet = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kubelet.service','',d)}"
SYSTEMD_AUTO_ENABLE_kubelet = "enable"
SYSTEMD_SERVICE:kubelet = "${@bb.utils.contains('DISTRO_FEATURES','systemd','kubelet.service','',d)}"
SYSTEMD_AUTO_ENABLE:kubelet = "enable"
FILES_kubectl = "${bindir}/kubectl"
FILES_kube-proxy = "${bindir}/kube-proxy"
FILES_${PN}-misc = "${bindir}"
FILES:kubectl = "${bindir}/kubectl"
FILES:kube-proxy = "${bindir}/kube-proxy"
FILES:${PN}-misc = "${bindir}"
deltask compile_ptest_base

52
recipes-containers/lxc/lxc_4.0.9.bb
View File

@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c
"
DEPENDS = "libxml2 libcap"
RDEPENDS_${PN} = " \
RDEPENDS:${PN} = " \
rsync \
curl \
gzip \
@ -30,11 +30,11 @@ RDEPENDS_${PN} = " \
util-linux-getopt \
"
RDEPENDS_${PN}_append_libc-glibc = " glibc-utils"
RDEPENDS:${PN}:append:libc-glibc = " glibc-utils"
RDEPENDS_${PN}-ptest += "file make gmp nettle gnutls bash libgcc"
RDEPENDS:${PN}-ptest += "file make gmp nettle gnutls bash libgcc"
RDEPENDS_${PN}-networking += "iptables"
RDEPENDS:${PN}-networking += "iptables"
SRC_URI = "http://linuxcontainers.org/downloads/${BPN}/${BPN}-${PV}.tar.gz \
file://lxc-1.0.0-disable-udhcp-from-busybox-template.patch \
@ -90,31 +90,31 @@ export STAGING_LIBDIR
inherit autotools pkgconfig ptest update-rc.d systemd python3native
SYSTEMD_PACKAGES = "${PN} ${PN}-networking"
SYSTEMD_SERVICE_${PN} = "lxc.service"
SYSTEMD_AUTO_ENABLE_${PN} = "disable"
SYSTEMD_SERVICE_${PN}-networking = "lxc-net.service"
SYSTEMD_AUTO_ENABLE_${PN}-networking = "enable"
SYSTEMD_SERVICE:${PN} = "lxc.service"
SYSTEMD_AUTO_ENABLE:${PN} = "disable"
SYSTEMD_SERVICE:${PN}-networking = "lxc-net.service"
SYSTEMD_AUTO_ENABLE:${PN}-networking = "enable"
INITSCRIPT_PACKAGES = "${PN} ${PN}-networking"
INITSCRIPT_NAME_${PN} = "lxc-containers"
INITSCRIPT_PARAMS_${PN} = "defaults"
INITSCRIPT_NAME_${PN}-networking = "lxc-net"
INITSCRIPT_PARAMS_${PN}-networking = "defaults"
INITSCRIPT_NAME:${PN} = "lxc-containers"
INITSCRIPT_PARAMS:${PN} = "defaults"
INITSCRIPT_NAME:${PN}-networking = "lxc-net"
INITSCRIPT_PARAMS:${PN}-networking = "defaults"
FILES_${PN}-doc = "${mandir} ${infodir}"
FILES:${PN}-doc = "${mandir} ${infodir}"
# For LXC the docdir only contains example configuration files and should be included in the lxc package
FILES_${PN} += "${docdir}"
FILES_${PN} += "${libdir}/python3*"
FILES_${PN} += "${datadir}/bash-completion"
FILES_${PN}-dbg += "${libexecdir}/lxc/.debug"
FILES_${PN}-dbg += "${libexecdir}/lxc/hooks/.debug"
FILES:${PN} += "${docdir}"
FILES:${PN} += "${libdir}/python3*"
FILES:${PN} += "${datadir}/bash-completion"
FILES:${PN}-dbg += "${libexecdir}/lxc/.debug"
FILES:${PN}-dbg += "${libexecdir}/lxc/hooks/.debug"
PACKAGES =+ "${PN}-templates ${PN}-networking ${PN}-lua"
FILES_lua-${PN} = "${datadir}/lua ${libdir}/lua"
FILES_lua-${PN}-dbg += "${libdir}/lua/lxc/.debug"
FILES_${PN}-templates += "${datadir}/lxc/templates"
RDEPENDS_${PN}-templates += "bash"
FILES:lua-${PN} = "${datadir}/lua ${libdir}/lua"
FILES:lua-${PN}-dbg += "${libdir}/lua/lxc/.debug"
FILES:${PN}-templates += "${datadir}/lxc/templates"
RDEPENDS:${PN}-templates += "bash"
FILES_${PN}-networking += " \
FILES:${PN}-networking += " \
${sysconfdir}/init.d/lxc-net \
${sysconfdir}/default/lxc-net \
"
@ -125,7 +125,7 @@ CACHED_CONFIGUREVARS += " \
am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \
"
do_install_append() {
do_install:append() {
# The /var/cache/lxc directory created by the Makefile
# is wiped out in volatile, we need to create this at boot.
rm -rf ${D}${localstatedir}/cache
@ -165,13 +165,13 @@ do_install_ptest() {
mv ${D}/usr/bin/lxc-test-* ${D}/${PTEST_PATH}/tests/.
}
pkg_postinst_${PN}() {
pkg_postinst:${PN}() {
if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then
/etc/init.d/populate-volatile.sh update
fi
}
pkg_postinst_${PN}-networking() {
pkg_postinst:${PN}-networking() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
cat >> $D/etc/network/interfaces << EOF

6
recipes-containers/lxcfs/lxcfs_4.0.7.bb
View File

@ -14,12 +14,12 @@ SRC_URI[md5sum] = "9d963976207fb0ca4701428ae0587aeb"
SRC_URI[sha256sum] = "3f28e2f4b04c0090aaf88b72666505f0313768a5254dd48a14c43cf78c543ec8"
DEPENDS += "fuse"
RDEPENDS_${PN} += "fuse"
RDEPENDS:${PN} += "fuse"
FILES_${PN} += "${datadir}/lxc/config/common.conf.d/*"
FILES:${PN} += "${datadir}/lxc/config/common.conf.d/*"
CACHED_CONFIGUREVARS += "ac_cv_path_HELP2MAN='false // No help2man //'"
EXTRA_OECONF += "--with-distro=unknown --with-init-script=${VIRTUAL-RUNTIME_init_manager}"
SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "lxcfs.service"
SYSTEMD_SERVICE:${PN} = "lxcfs.service"

2
recipes-containers/oci-image-spec/oci-image-spec_git.bb
View File

@ -36,6 +36,6 @@ image_spec_file_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
CLEANBROKEN = "1"

2
recipes-containers/oci-image-tools/oci-image-tools_git.bb
View File

@ -62,4 +62,4 @@ do_install() {
install ${S}/src/import/oci-image-tool ${D}/${sbindir}/
}
INSANE_SKIP_${PN} += "ldflags textrel"
INSANE_SKIP:${PN} += "ldflags textrel"

2
recipes-containers/oci-runtime-spec/oci-runtime-spec_git.bb
View File

@ -36,6 +36,6 @@ runtime_spec_file_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
CLEANBROKEN = "1"

2
recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
View File

@ -12,7 +12,7 @@ SRCREV = "6e7da8148f4de2c9e9c9d3b345576898d4f412cb"
PV = "0.1.0+git${SRCPV}"
GO_IMPORT = "import"
INSANE_SKIP_${PN} += "ldflags textrel"
INSANE_SKIP:${PN} += "ldflags textrel"
inherit goarch
inherit go

2
recipes-containers/oci-systemd-hook/oci-systemd-hook_git.bb
View File

@ -32,5 +32,5 @@ do_install() {
oe_runmake 'DESTDIR=${D}' install-exec-am
}
FILES_${PN} += "${libexecdir}/oci/hooks.d/"
FILES:${PN} += "${libexecdir}/oci/hooks.d/"

2
recipes-containers/podman-compose/podman-compose_0.1.5.bb
View File

@ -12,4 +12,4 @@ S = "${WORKDIR}/git"
DEPENDS += "${PYTHON_PN}-pyyaml-native"
RDEPENDS_${PN} += "${PYTHON_PN}-pyyaml"
RDEPENDS:${PN} += "${PYTHON_PN}-pyyaml"

10
recipes-containers/podman/podman_git.bb
View File

@ -100,15 +100,15 @@ do_install() {
fi
}
FILES_${PN} += " \
FILES:${PN} += " \
${systemd_unitdir}/system/* \
${systemd_unitdir}/user/* \
${nonarch_libdir}/tmpfiles.d/* \
${sysconfdir}/cni \
"
SYSTEMD_SERVICE_${PN} = "podman.service podman.socket"
SYSTEMD_SERVICE:${PN} = "podman.service podman.socket"
RDEPENDS_${PN} += "conmon virtual/runc iptables cni skopeo"
RRECOMMENDS_${PN} += "slirp4netns kernel-module-xt-masquerade kernel-module-xt-comment"
RCONFLICTS_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}"
RDEPENDS:${PN} += "conmon virtual/runc iptables cni skopeo"
RRECOMMENDS:${PN} += "slirp4netns kernel-module-xt-masquerade kernel-module-xt-comment"
RCONFLICTS:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}"

2
recipes-containers/riddler/riddler_git.bb
View File

@ -18,7 +18,7 @@ inherit go
# In addition to hosts go does not like, we do not build for mips.
#
COMPATIBLE_HOST_mipsarch = "null"
COMPATIBLE_HOST:mipsarch = "null"
# This disables seccomp and apparmor, which are on by default in the
# go package.

2
recipes-containers/runc/runc.inc
View File

@ -26,7 +26,7 @@ PACKAGECONFIG ??= "static \
PROVIDES += "virtual/runc"
RPROVIDES_${PN} = "virtual/runc"
RPROVIDES:${PN} = "virtual/runc"
GO_IMPORT = "import"

6
recipes-containers/singularity/singularity_git.bb
View File

@ -1,8 +1,8 @@
# Skip QA check for library symbolic links (core issue is a packaging problem within
# Singularity build / config: read up on the dev-so test for more info)
INSANE_SKIP_${PN} += "dev-so"
INSANE_SKIP:${PN} += "dev-so"
RDEPENDS_${PN} += "glibc python3 ca-certificates openssl bash e2fsprogs-mke2fs"
RDEPENDS:${PN} += "glibc python3 ca-certificates openssl bash e2fsprogs-mke2fs"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYRIGHT.md;md5=be78c34e483dd7d8439358b1e024b294 \
@ -21,7 +21,7 @@ S = "${WORKDIR}/git"
inherit python3native autotools-brokensep
EXTRA_OECONF = "--prefix=/usr/local"
pkg_postinst_${PN}() {
pkg_postinst:${PN}() {
# python3 expects CA certificates to be installed in a different place to where
# they are actually installed. These lines link the two locations.
rm -r $D${libdir}/ssl/certs

8
recipes-containers/skopeo/skopeo_git.bb
View File

@ -14,7 +14,7 @@ DEPENDS = " \
inherit go
RDEPENDS_${PN} = " \
RDEPENDS:${PN} = " \
gpgme \
libgpg-error \
libassuan \
@ -81,7 +81,7 @@ do_install() {
install ${WORKDIR}/registries.conf ${D}/${sysconfdir}/containers/registries.conf
}
do_install_append_class-native() {
do_install:append:class-native() {
create_cmdline_wrapper ${D}/${sbindir}/skopeo \
--policy ${sysconfdir}/containers/policy.json
@ -89,11 +89,11 @@ do_install_append_class-native() {
LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE}
}
do_install_append_class-nativesdk() {
do_install:append:class-nativesdk() {
create_cmdline_wrapper ${D}/${sbindir}/skopeo \
--policy ${sysconfdir}/containers/policy.json
}
INSANE_SKIP_${PN} += "ldflags"
INSANE_SKIP:${PN} += "ldflags"
BBCLASSEXTEND = "native nativesdk"

4
recipes-containers/tini/tini_0.19.0.bb
View File

@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
BBCLASSEXTEND = "native"
# tini links with -static, so no PIE for us
SECURITY_CFLAGS_pn-${PN} = "${SECURITY_NO_PIE_CFLAGS}"
SECURITY_CFLAGS:pn-${PN} = "${SECURITY_NO_PIE_CFLAGS}"
inherit cmake
@ -29,4 +29,4 @@ do_install() {
# Tini is the currently the provider for docker-init
PROVIDES += "docker-init"
RPROVIDES_${PN} = "docker-init"
RPROVIDES:${PN} = "docker-init"

8
recipes-containers/umoci/umoci_git.bb
View File

@ -3,8 +3,8 @@ SUMMARY = "umoci modifies Open Container images"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
RDEPENDS_${PN} = "skopeo"
RDEPENDS_${PN}_class-native = ""
RDEPENDS:${PN} = "skopeo"
RDEPENDS:${PN}:class-native = ""
SRCREV_umoci = "758044fc26ad65eb900143e90d1e22c2d6e4484d"
SRC_URI = "git://github.com/opencontainers/umoci.git;branch=master;name=umoci;destsuffix=github.com/opencontainers/umoci \
@ -22,7 +22,7 @@ inherit go
EXTRA_OEMAKE="BUILDTAGS=''"
do_compile_class-native () {
do_compile:class-native () {
export GOARCH="${BUILD_GOARCH}"
# Pass the needed cflags/ldflags so that cgo can find the needed headers files and libraries
@ -76,5 +76,5 @@ do_install() {
install ${S}/umoci ${D}/${sbindir}
}
INSANE_SKIP_${PN} += "ldflags already-stripped"
INSANE_SKIP:${PN} += "ldflags already-stripped"
BBCLASSEXTEND = "native nativesdk"

2
recipes-core/bind/bind_virtualization.inc
View File

@ -1,4 +1,4 @@
# Tell named not to bother listening on the IP address that lxc handles itself.
do_install_append() {
do_install:append() {
sed -i -e 's,^\( *options *{\)$,\1\n\t// lxc would take care of this address itself\n\tlisten-on { ! 10.0.3.1; any;};\n,' ${D}${sysconfdir}/bind/named.conf.options
}

4
recipes-core/busybox/busybox-initrd_1.33.1.bb
View File

@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/busybox-initrd:${COREBASE}/meta/recipes-core/busybox/busybox:${COREBASE}/meta/recipes-core/busybox/files:"
FILESEXTRAPATHS:prepend := "${THISDIR}/busybox-initrd:${COREBASE}/meta/recipes-core/busybox/busybox:${COREBASE}/meta/recipes-core/busybox/files:"
require recipes-core/busybox/busybox_${PV}.bb
@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
SYSROOT_DIRS += "/bin"
BUSYBOX_SPLIT_SUID = "0"
FILES_${PN} += "${sysconfdir}/init.d/*"
FILES:${PN} += "${sysconfdir}/init.d/*"

2
recipes-core/busybox/busybox_virtualization.inc
View File

@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/busybox:"
FILESEXTRAPATHS:prepend := "${THISDIR}/busybox:"
SRC_URI += " \
file://lspci.cfg \

2
recipes-core/busybox/busybox_vmsep.inc
View File

@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/busybox:"
FILESEXTRAPATHS:prepend := "${THISDIR}/busybox:"
SRC_URI += " \
file://static.cfg \
"

2
recipes-core/initscripts/initscripts_virtualization.inc
View File

@ -1,4 +1,4 @@
do_install_append() {
do_install:append() {
echo >> ${D}${sysconfdir}/init.d/functions
echo success \(\) \{ >> ${D}${sysconfdir}/init.d/functions

4
recipes-core/kata-containers/kata-agent_git.bb
View File

@ -8,7 +8,7 @@ SRCREV = "e03f7d7453fabffb17e1540f28666c26178d3cbf"
SRC_URI = "git://${GO_IMPORT}.git \
"
RDEPENDS_${PN}-dev_append = "bash"
RDEPENDS:${PN}-dev:append = "bash"
S = "${WORKDIR}/git"
@ -36,4 +36,4 @@ do_install() {
deltask compile_ptest_base
FILES_${PN} += "${systemd_unitdir}/*"
FILES:${PN} += "${systemd_unitdir}/*"

2
recipes-core/kata-containers/kata-proxy_git.bb
View File

@ -8,7 +8,7 @@ SRCREV = "1148847739f9a9f47b92e34e4f309dc109d4dba9"
SRC_URI = "git://${GO_IMPORT}.git \
"
RDEPENDS_${PN}-dev_append = "bash"
RDEPENDS:${PN}-dev:append = "bash"
S = "${WORKDIR}/git"

6
recipes-core/kata-containers/kata-runtime_git.bb
View File

@ -8,11 +8,11 @@ SRCREV = "04c77eb20e9bd603cab5c711bcbe7c69db58b040"
SRC_URI = "git://${GO_IMPORT}.git \
file://0001-makefile-allow-SKIP_GO_VERSION_CHECK-to-be-overriden.patch \
"
RDEPENDS_${PN}-dev_append = "bash"
RDEPENDS:${PN}-dev:append = "bash"
CONTAINER_KERNEL ?= ""
CONTAINER_INITRD ?= ""
RDEPENDS_${PN} = " \
RDEPENDS:${PN} = " \
qemu \
${CONTAINER_KERNEL} \
${CONTAINER_INITRD} \
@ -55,6 +55,6 @@ do_install() {
# fork/exec /usr/libexec/kata-containers/kata-proxy: no such file or directory
}
FILES_${PN} += "${datadir}/defaults/kata-containers/*"
FILES:${PN} += "${datadir}/defaults/kata-containers/*"
deltask compile_ptest_base

2
recipes-core/kata-containers/kata-shim_git.bb
View File

@ -8,7 +8,7 @@ SRCREV = "bcc35aeca3ef6fa0976005c9e93525906aefed2f"
SRC_URI = "git://${GO_IMPORT}.git \
"
RDEPENDS_${PN}-dev_append = "bash"
RDEPENDS:${PN}-dev:append = "bash"
S = "${WORKDIR}/git"

4
recipes-core/libxcrypt/libxcrypt_%.bbappend
View File

@ -1,4 +1,4 @@
# if vmsep is in distro features, we need a static libxycryp, so we can build
# a static busybox. The end result of this is:
# EXTRA_OECONF_remove = "--disable-static"
EXTRA_OECONF_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', '--disable-static', '', d)}"
# EXTRA_OECONF:remove = "--disable-static"
EXTRA_OECONF:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', '--disable-static', '', d)}"

12
recipes-core/packagegroups/packagegroup-container.bb
View File

@ -16,32 +16,32 @@ PACKAGES = "\
# everything and the kitchen sink, used for building/installing
# many things at once.
RDEPENDS_${PN} = " \
RDEPENDS:${PN} = " \
packagegroup-lxc \
packagegroup-docker \
packagegroup-oci \
"
RDEPENDS_packagegroup-lxc = " \
RDEPENDS:packagegroup-lxc = " \
lxc \
"
RDEPENDS_packagegroup-docker = " \
RDEPENDS:packagegroup-docker = " \
docker \
"
RDEPENDS_packagegroup-podman = " \
RDEPENDS:packagegroup-podman = " \
podman \
"
RDEPENDS_packagegroup-oci = " \
RDEPENDS:packagegroup-oci = " \
virtual/runc \
oci-systemd-hook \
oci-runtime-tools \
oci-image-tools \
"
RDEPENDS_packagegroup-containerd = " \
RDEPENDS:packagegroup-containerd = " \
virtual/containerd \
"

10
recipes-core/packagegroups/packagegroup-kubernetes.bb
View File

@ -18,26 +18,26 @@ PACKAGES = "\
KUBERNETES_CRI ?= "containerd"
RDEPENDS_packagegroup-kubernetes-base = " \
RDEPENDS:packagegroup-kubernetes-base = " \
packagegroup-${KUBERNETES_CRI} \
packagegroup-oci \
"
RDEPENDS_packagegroup-k8s-host = " \
RDEPENDS:packagegroup-k8s-host = " \
packagegroup-kubernetes-base \
"
RDEPENDS_packagegroup-k8s-node = " \
RDEPENDS:packagegroup-k8s-node = " \
packagegroup-kubernetes-base \
"
RDEPENDS_packagegroup-k3s-host = " \
RDEPENDS:packagegroup-k3s-host = " \
packagegroup-kubernetes-base \
k3s-server \
k3s-cni \
"
RDEPENDS_packagegroup-k3s-node = " \
RDEPENDS:packagegroup-k3s-node = " \
packagegroup-kubernetes-base \
k3s-agent \
k3s-cni \

6
recipes-core/runv/runv_git.bb
View File

@ -22,7 +22,7 @@ inherit autotools-brokensep
PACKAGECONFIG[xen] = "--with-xen,--without-xen,"
AUTOTOOLS_SCRIPT_PATH = "${S}/src/import/"
RDEPENDS_${PN} += " qemu hyperstart"
RDEPENDS:${PN} += " qemu hyperstart"
do_compile() {
export GOARCH="${TARGET_GOARCH}"
@ -76,6 +76,6 @@ do_install() {
deltask compile_ptest_base
FILES_${PN} += "/usr/local/bin/*"
FILES:${PN} += "/usr/local/bin/*"
INSANE_SKIP_${PN} += "ldflags already-stripped"
INSANE_SKIP:${PN} += "ldflags already-stripped"

10
recipes-core/runx/runx_git.bb
View File

@ -41,9 +41,9 @@ DEPENDS += "openssl-native coreutils-native util-linux-native xz-native bc-nativ
DEPENDS += "elfutils-native"
DEPENDS += "qemu-native bison-native"
RDEPENDS_${PN} += " jq bash"
RDEPENDS_${PN} += " xen-tools-xl go-build socat daemonize"
RDEPENDS_${PN} += " qemu-system-i386 ca-certificates qemu qemu-keymaps"
RDEPENDS:${PN} += " jq bash"
RDEPENDS:${PN} += " xen-tools-xl go-build socat daemonize"
RDEPENDS:${PN} += " qemu-system-i386 ca-certificates qemu qemu-keymaps"
RUNX_USE_INTERNAL_BUSYBOX ?= ""
@ -120,7 +120,7 @@ do_install() {
deltask compile_ptest_base
FILES_${PN} += "${bindir}/* ${datadir}/runX/*"
FILES:${PN} += "${bindir}/* ${datadir}/runX/*"
INHIBIT_PACKAGE_STRIP = "1"
INSANE_SKIP_${PN} += "ldflags already-stripped"
INSANE_SKIP:${PN} += "ldflags already-stripped"

6
recipes-core/sysvinit/sysvinit-inittab_virtualization.inc
View File

@ -1,9 +1,9 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI += "file://getty-wrapper"
do_install_append() {
do_install:append() {
install -d ${D}${base_sbindir}
install -m 0755 ${WORKDIR}/getty-wrapper ${D}${base_sbindir}/getty-wrapper
}
FILES_${PN} += "${base_sbindir}/getty-wrapper"
FILES:${PN} += "${base_sbindir}/getty-wrapper"

2
recipes-core/sysvinit/sysvinit-inittab_xen.inc
View File

@ -1,4 +1,4 @@
do_install_append() {
do_install:append() {
echo "" >> ${D}${sysconfdir}/inittab
echo "X0:12345:respawn:${base_sbindir}/getty-wrapper 115200 hvc0" >> ${D}${sysconfdir}/inittab
}

4
recipes-devtools/go/compose-file_git.bb
View File

@ -36,6 +36,6 @@ go_compose_file_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
CLEANBROKEN = "1"
CLEANBROKEN = "1"

4
recipes-devtools/go/go-build_git.bb
View File

@ -26,7 +26,7 @@ inherit pkgconfig
GO_IMPORT = "import"
inherit go
RDEPENDS_${PN}-dev = "bash"
RDEPENDS:${PN}-dev = "bash"
do_compile() {
@ -55,4 +55,4 @@ do_install() {
install -m 755 ${B}/src/import/gobuild/serial_fd_handler ${D}${datadir}/runX/
}
FILES_${PN} += "${datadir}/runX/*"
FILES:${PN} += "${datadir}/runX/*"

2
recipes-devtools/go/go-capability_git.bb
View File

@ -26,4 +26,4 @@ go_capability_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"

2
recipes-devtools/go/go-cli_git.bb
View File

@ -26,4 +26,4 @@ go_cli_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"

2
recipes-devtools/go/go-connections_git.bb
View File

@ -36,4 +36,4 @@ go_connections_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"

2
recipes-devtools/go/go-context_git.bb
View File

@ -25,4 +25,4 @@ go_context_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"

2
recipes-devtools/go/go-dbus_git.bb
View File

@ -26,4 +26,4 @@ go_dbus_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"

2
recipes-devtools/go/go-distribution_git.bb
View File

@ -36,4 +36,4 @@ go_distribution_digeset_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"

2
recipes-devtools/go/go-fsnotify_git.bb
View File

@ -26,4 +26,4 @@ go_fsnotify_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"

2
recipes-devtools/go/go-libtrust_git.bb
View File

@ -26,4 +26,4 @@ go_libtrust_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"

2
recipes-devtools/go/go-logrus_git.bb
View File

@ -26,4 +26,4 @@ go_logrus_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"

2
recipes-devtools/go/go-md2man_git.bb
View File

@ -18,6 +18,6 @@ S = "${WORKDIR}/git"
inherit go
do_compile_prepend() {
do_compile:prepend() {
export GO111MODULE=off
}

2
recipes-devtools/go/go-metalinter_git.bb
View File

@ -21,4 +21,4 @@ do_install() {
cp -r ${S}/* ${D}${prefix}/local/go/src/${PKG_NAME}/
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"

2
recipes-devtools/go/go-mux_git.bb
View File

@ -25,4 +25,4 @@ go_mux_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"

2
recipes-devtools/go/go-patricia_git.bb
View File

@ -26,4 +26,4 @@ go_patricia_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"

2
recipes-devtools/go/go-pty_git.bb
View File

@ -25,4 +25,4 @@ go_pty_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"

4
recipes-devtools/go/go-systemd_git.bb
View File

@ -12,7 +12,7 @@ SRC_URI = "git://${PKG_NAME}.git;branch=main"
SRCREV = "b4a58d95188dd092ae20072bac14cece0e67c388"
PV = "4+git${SRCPV}"
RDEPENDS_${PN} += "bash"
RDEPENDS:${PN} += "bash"
S = "${WORKDIR}/git"
@ -28,4 +28,4 @@ go_systemd_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"

2
recipes-devtools/go/grpc-go_git.bb
View File

@ -36,6 +36,6 @@ go_grpc_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += " \
FILES:${PN} += " \
${prefix}/local/go/src/${PKG_NAME}/* \
"

2
recipes-devtools/go/notary_git.bb
View File

@ -36,4 +36,4 @@ go_notary_sysroot_preprocess () {
cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME})
}
FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"
FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*"

2
recipes-devtools/python/python3-boto3_1.17.51.bb
View File

@ -13,4 +13,4 @@ SRC_URI[sha256sum] = "c45e7d3aef8965ae1b42c9855c31ded19fbb38cfad0a34cc37dc880ded
inherit pypi setuptools3
RDEPENDS_${PN} += "python3-botocore python3-urllib3 python3-unixadmin"
RDEPENDS:${PN} += "python3-botocore python3-urllib3 python3-unixadmin"

2
recipes-devtools/python/python3-botocore_1.20.51.bb
View File

@ -7,4 +7,4 @@ SRC_URI[sha256sum] = "c853d6c2321e2f2328282c7d49d7b1a06201826ba0e7049c6975ab5f22
inherit pypi setuptools3
RDEPENDS_${PN} += "python3-jmespath python3-dateutil python3-logging"
RDEPENDS:${PN} += "python3-jmespath python3-dateutil python3-logging"

2
recipes-devtools/python/python3-docker_5.0.0.bb
View File

@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "3e8bc47534e0ca9331d72c32f2881bb13b93ded0bcdeab3c833fb7cf61
DEPENDS += "${PYTHON_PN}-pip-native"
RDEPENDS_${PN} += " \
RDEPENDS:${PN} += " \
${PYTHON_PN}-misc \
${PYTHON_PN}-six \
${PYTHON_PN}-docker-pycreds \

2
recipes-devtools/python/python3-dockerpty_0.4.1.bb
View File

@ -8,7 +8,7 @@ inherit pypi setuptools3
SRC_URI[md5sum] = "028bacb34536f3ee6a2ccd668c27e8e4"
SRC_URI[sha256sum] = "69a9d69d573a0daa31bcd1c0774eeed5c15c295fe719c61aca550ed1393156ce"
RDEPENDS_${PN} += "\
RDEPENDS:${PN} += "\
${PYTHON_PN}-fcntl \
${PYTHON_PN}-io \
${PYTHON_PN}-six \

2
recipes-devtools/python/python3-fastentrypoints_0.12.bb
View File

@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://README.rst;md5=f212a0cb34eb678477972d2011fb365a"
inherit pypi setuptools3
RDEPENDS_${PN} += "${PYTHON_PN}-setuptools ${PYTHON_PN}-pickle"
RDEPENDS:${PN} += "${PYTHON_PN}-setuptools ${PYTHON_PN}-pickle"
SRC_URI[md5sum] = "390ad9a9229164a06156a5b1f0ef1b22"
SRC_URI[sha256sum] = "ff284f1469bd65400599807d2c6284d5b251398e6e28811f5f77fd262292410b"

2
recipes-devtools/python/python3-nacl_1.3.0.bb
View File

@ -16,7 +16,7 @@ DEPENDS += "\
python3-pip-native \
"
RDEPENDS_${PN}_class-target += " \
RDEPENDS:${PN}:class-target += " \
python3-cffi \
python3-pycparser \
"

2
recipes-devtools/python/python3-newrelic_6.2.0.156.bb
View File

@ -16,7 +16,7 @@ DEPENDS += "python3-setuptools-scm-native"
SRC_URI += "file://0001-setup.py-tweak-setuptools_scm-version-dependency.patch"
FILES_${PN}-dbg += "\
FILES:${PN}-dbg += "\
${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/*/.debug \
${PYTHON_SITEPACKAGES_DIR}/newrelic-${PV}/newrelic/packages/*/.debug/ \
"

2
recipes-devtools/python/python3-webob_1.8.7.bb
View File

@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "b64ef5141be559cfade448f044fa45c2260351edcb6a8ef6b7e00c7dce
inherit setuptools3 pypi
RDEPENDS_${PN} += " \
RDEPENDS:${PN} += " \
python3-sphinx \
"

54
recipes-devtools/qemu/qemu-package-split.inc
View File

@ -1,4 +1,4 @@
PACKAGES_prepend_class-target = "${PN}-x86_64 \
PACKAGES:prepend:class-target = "${PN}-x86_64 \
${PN}-aarch64 \
${PN}-arm \
${PN}-i386 \
@ -9,38 +9,38 @@ PACKAGES_prepend_class-target = "${PN}-x86_64 \
${PN}-firmware \
"
FILES_${PN}-x86_64_class-target = "${bindir}/qemu-system-x86_64 ${bindir}/qemu-x86_64"
RDEPENDS_${PN}-x86_64_append_class_target = "${PN}"
INSANE_SKIP_${PN}-x86_64_class-target = "file-rdeps"
FILES:${PN}-x86_64:class-target = "${bindir}/qemu-system-x86_64 ${bindir}/qemu-x86_64"
RDEPENDS:${PN}-x86_64:append_class_target = "${PN}"
INSANE_SKIP:${PN}-x86_64:class-target = "file-rdeps"
FILES_${PN}-i386_class-target = "${bindir}/qemu-i386"
RDEPENDS_${PN}-i386_append_class-target = "${PN}"
INSANE_SKIP_${PN}-i386_class-target = "file-rdeps"
FILES:${PN}-i386:class-target = "${bindir}/qemu-i386"
RDEPENDS:${PN}-i386:append:class-target = "${PN}"
INSANE_SKIP:${PN}-i386:class-target = "file-rdeps"
FILES_${PN}-system-i386_class-target = "${bindir}/qemu-system-i386"
RDEPENDS_${PN}-system-i386_append_class-target = "${PN}"
INSANE_SKIP_${PN}-system-i386_class-target = "file-rdeps"
FILES:${PN}-system-i386:class-target = "${bindir}/qemu-system-i386"
RDEPENDS:${PN}-system-i386:append:class-target = "${PN}"
INSANE_SKIP:${PN}-system-i386:class-target = "file-rdeps"
FILES_${PN}-aarch64_class-target = "${bindir}/qemu-system-aarch64 ${bindir}/qemu-aarch64"
RDEPENDS_${PN}-aarch64_append_class-target = "${PN}"
INSANE_SKIP_${PN}-aarch64_class-target = "file-rdeps"
FILES:${PN}-aarch64:class-target = "${bindir}/qemu-system-aarch64 ${bindir}/qemu-aarch64"
RDEPENDS:${PN}-aarch64:append:class-target = "${PN}"
INSANE_SKIP:${PN}-aarch64:class-target = "file-rdeps"
FILES_${PN}-arm_class-target = "${bindir}/qemu-system-arm ${bindir}/qemu-arm"
RDEPENDS_${PN}-arm_append_class-target = "${PN}"
INSANE_SKIP_${PN}-arm_class-target = "file-rdeps"
FILES:${PN}-arm:class-target = "${bindir}/qemu-system-arm ${bindir}/qemu-arm"
RDEPENDS:${PN}-arm:append:class-target = "${PN}"
INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
FILES_${PN}-microblaze_class-target = "${bindir}/qemu-system-microblaze* ${bindir}/qemu-microblaze*"
RDEPENDS_${PN}-microblaze_append_class-target = "${PN}"
INSANE_SKIP_${PN}-arm_class-target = "file-rdeps"
FILES:${PN}-microblaze:class-target = "${bindir}/qemu-system-microblaze* ${bindir}/qemu-microblaze*"
RDEPENDS:${PN}-microblaze:append:class-target = "${PN}"
INSANE_SKIP:${PN}-arm:class-target = "file-rdeps"
FILES_${PN}-support_class-target = "${bindir}/* ${libexecdir}/*"
RDEPENDS_${PN}-support_class-target = "${PN} bash"
FILES:${PN}-support:class-target = "${bindir}/* ${libexecdir}/*"
RDEPENDS:${PN}-support:class-target = "${PN} bash"
FILES_${PN}-firmware_class-target = "${datadir}/${PN}/*.bin ${datadir}/${PN}/*.rom ${datadir}/${PN}/*.img ${datadir}/${PN}/openbios* ${datadir}/${PN}/*.dtb ${datadir}/${PN}/u-boot*"
RDEPENDS_${PN}-firmware_class-target = "${PN}"
INSANE_SKIP_${PN}-firmware_class-target = "arch"
FILES:${PN}-firmware:class-target = "${datadir}/${PN}/*.bin ${datadir}/${PN}/*.rom ${datadir}/${PN}/*.img ${datadir}/${PN}/openbios* ${datadir}/${PN}/*.dtb ${datadir}/${PN}/u-boot*"
RDEPENDS:${PN}-firmware:class-target = "${PN}"
INSANE_SKIP:${PN}-firmware:class-target = "arch"
FILES_${PN}-keymaps_class-target = "${datadir}/${PN}/keymaps/*"
RDEPENDS_${PN}-keymaps_class-target = "${PN}"
FILES:${PN}-keymaps:class-target = "${datadir}/${PN}/keymaps/*"
RDEPENDS:${PN}-keymaps:class-target = "${PN}"
PACKAGECONFIG_append = " virtfs"
PACKAGECONFIG:append = " virtfs"

4
recipes-devtools/yq/yq_git.bb
View File

@ -30,7 +30,7 @@ GO_IMPORT = "github.com/mikefarah/yq"
inherit go
do_compile_prepend() {
do_compile:prepend() {
# arrange for some of the golang built ins to be found
(
cd ${WORKDIR}/build/src/
@ -43,7 +43,7 @@ do_compile_prepend() {
}
do_install_append() {
do_install:append() {
# these bring in dependencies for the -dev package on bash, and we don't
# need them .. so we remove them to avoid needing that rdepends
rm -rf ${D}/${prefix}/lib/go/src/${GO_IMPORT}/debian/rules

22
recipes-extended/ceph/ceph_15.2.12.bb
View File

@ -29,7 +29,7 @@ DEPENDS = "boost bzip2 curl expat gperf-native \
python3 python3-cython-native rabbitmq-c rocksdb snappy udev \
valgrind xfsprogs zlib \
"
SYSTEMD_SERVICE_${PN} = " \
SYSTEMD_SERVICE:${PN} = " \
ceph-radosgw@.service \
ceph-radosgw.target \
ceph-mon@.service \
@ -72,13 +72,13 @@ EXTRA_OECMAKE = "-DWITH_MANPAGE=OFF \
export STAGING_DIR_HOST
do_configure_prepend () {
do_configure:prepend () {
echo "set( CMAKE_SYSROOT \"${RECIPE_SYSROOT}\" )" >> ${WORKDIR}/toolchain.cmake
echo "set( CMAKE_DESTDIR \"${D}\" )" >> ${WORKDIR}/toolchain.cmake
echo "set( PYTHON_SITEPACKAGES_DIR \"${PYTHON_SITEPACKAGES_DIR}\" )" >> ${WORKDIR}/toolchain.cmake
}
do_install_append () {
do_install:append () {
sed -i -e 's:^#!/usr/bin/python$:&3:' \
-e 's:${WORKDIR}.*python3:${bindir}/python3:' \
${D}${bindir}/ceph ${D}${bindir}/ceph-crash \
@ -94,7 +94,7 @@ do_install_append () {
rm ${D}${systemd_unitdir}/system/ceph-fuse.target ${D}${systemd_unitdir}/system/ceph-fuse@.service
}
do_install_append_class-target () {
do_install:append:class-target () {
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -d ${D}${sysconfdir}/tmpfiles.d
echo "d /var/lib/ceph/crash/posted 0755 root root - -" > ${D}${sysconfdir}/tmpfiles.d/ceph-placeholder.conf
@ -106,28 +106,28 @@ do_install_append_class-target () {
fi
}
pkg_postinst_${PN}() {
pkg_postinst:${PN}() {
if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ] ; then
${sysconfdir}/init.d/populate-volatile.sh update
fi
}
FILES_${PN} += "\
FILES:${PN} += "\
${libdir}/rados-classes/*.so.* \
${libdir}/ceph/compressor/*.so \
${libdir}/rados-classes/*.so \
${libdir}/ceph/*.so \
"
FILES_${PN} += " \
FILES:${PN} += " \
/etc/tmpfiles.d/ceph-placeholder.conf \
/etc/default/volatiles/99_ceph-placeholder \
"
FILES_${PN}-python = "\
FILES:${PN}-python = "\
${PYTHON_SITEPACKAGES_DIR}/* \
"
RDEPENDS_${PN} += "\
RDEPENDS:${PN} += "\
python3-core \
python3-misc \
python3-modules \
@ -138,8 +138,8 @@ COMPATIBLE_HOST = "(x86_64).*"
PACKAGES += " \
${PN}-python \
"
INSANE_SKIP_${PN}-python += "ldflags"
INSANE_SKIP_${PN} += "dev-so"
INSANE_SKIP:${PN}-python += "ldflags"
INSANE_SKIP:${PN} += "dev-so"
CCACHE_DISABLE = "1"
CVE_PRODUCT = "ceph ceph_storage ceph_storage_mon ceph_storage_osd"

16
recipes-extended/cloud-init/cloud-init_20.3.bb
View File

@ -13,10 +13,10 @@ SRC_URI = "git://github.com/canonical/cloud-init \
S = "${WORKDIR}/git"
DISTUTILS_INSTALL_ARGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '--init-system=sysvinit_deb', '', d)}"
DISTUTILS_INSTALL_ARGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--init-system=systemd', '', d)}"
DISTUTILS_INSTALL_ARGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '--init-system=sysvinit_deb', '', d)}"
DISTUTILS_INSTALL_ARGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--init-system=systemd', '', d)}"
do_install_append() {
do_install:append() {
ln -s ${libdir}/${BPN}/uncloud-init ${D}${sysconfdir}/cloud/uncloud-init
ln -s ${libdir}/${BPN}/write-ssh-key-fingerprints ${D}${sysconfdir}/cloud/write-ssh-key-fingerprints
}
@ -33,21 +33,21 @@ inherit python3native
PACKAGES += "${PN}-systemd"
FILES_${PN} += "${sysconfdir}/* \
FILES:${PN} += "${sysconfdir}/* \
${datadir}/*"
FILES_${PN}-systemd += "${systemd_unitdir}/*"
RDEPENDS_${PN}-systemd += " ${PN}"
FILES:${PN}-systemd += "${systemd_unitdir}/*"
RDEPENDS:${PN}-systemd += " ${PN}"
INITSCRIPT_PACKAGES = "${PN}"
INITSCRIPT_NAME_${BPN} = "cloud-init"
INITSCRIPT_NAME:${BPN} = "cloud-init"
DEPENDS += "python3-pyyaml-native \
python3-requests-native \
python3-jinja2-native \
"
RDEPENDS_${PN} = "python3 \
RDEPENDS:${PN} = "python3 \
python3-jinja2 \
python3-configobj \
python3-requests \

2
recipes-extended/dev86/dev86_git.bb
View File

@ -39,4 +39,4 @@ do_install() {
ln -s ../lib/bcc/bcc-cc1 ${D}${prefix}/bin/bcc-cc1
}
FILES_${PN} += "${libdir}/bcc"
FILES:${PN} += "${libdir}/bcc"

4
recipes-extended/diod/diod_1.0.24.bb
View File

@ -26,11 +26,11 @@ S = "${WORKDIR}/git"
inherit autotools systemd
do_install_append () {
do_install:append () {
# install our init based on start-stop-daemon
install -D -m 0755 ${WORKDIR}/diod ${D}${sysconfdir}/init.d/diod
# install a real(not commented) configuration file for diod
install -m 0644 ${WORKDIR}/diod.conf ${D}${sysconfdir}/diod.conf
}
FILES_${PN} += "${systemd_unitdir}"
FILES:${PN} += "${systemd_unitdir}"

2
recipes-extended/hyperstart/hyperstart_git.bb
View File

@ -23,4 +23,4 @@ do_install() {
install -m644 ${S}/build/arch/x86_64/kernel ${D}/var/lib/hyper/
}
FILES_${PN} += "/var/lib/hyper"
FILES:${PN} += "/var/lib/hyper"

2
recipes-extended/images/container-base.bb
View File

@ -22,7 +22,7 @@ IMAGE_INSTALL = " \
"
# If the following is configured in local.conf (or the distro):
# PACKAGE_EXTRA_ARCHS_append = " container-dummy-provides"
# PACKAGE_EXTRA_ARCHS:append = " container-dummy-provides"
#
# it has been explicitly # indicated that we don't want or need a shell, so we'll
# add the dummy provides.

4
recipes-extended/images/xen-guest-image-minimal.bb
View File

@ -10,8 +10,8 @@ IMAGE_INSTALL += " \
IMAGE_INSTALL += "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' xf86-video-fbdev', '', d)}"
# Install xf86-video-vesa on x86 platforms.
IMAGE_INSTALL_append_x86-64 = "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' xf86-video-vesa', '', d)}"
IMAGE_INSTALL_append_x86 = "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' xf86-video-vesa', '', d)}"
IMAGE_INSTALL:append:x86-64 = "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' xf86-video-vesa', '', d)}"
IMAGE_INSTALL:append:x86 = "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' xf86-video-vesa', '', d)}"
REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('IMAGE_FEATURES', 'x11', ' x11', '', d)} xen"

19
recipes-extended/images/xen-image-minimal.bb
View File

@ -21,13 +21,13 @@ IMAGE_INSTALL += " \
do_build[depends] += "xen:do_deploy"
# Networking for HVM-mode guests (x86/64 only) requires the tun kernel module
IMAGE_INSTALL_append_x86 = "kernel-module-tun"
IMAGE_INSTALL_append_x86-64 = "kernel-module-tun"
IMAGE_INSTALL:append:x86 = "kernel-module-tun"
IMAGE_INSTALL:append:x86-64 = "kernel-module-tun"
# Linux kernel option CONFIG_XEN_PCIDEV_BACKEND depends on X86
XEN_PCIBACK_MODULE = ""
XEN_PCIBACK_MODULE_x86 = "kernel-module-xen-pciback"
XEN_PCIBACK_MODULE_x86-64 = "kernel-module-xen-pciback"
XEN_PCIBACK_MODULE:x86 = "kernel-module-xen-pciback"
XEN_PCIBACK_MODULE:x86-64 = "kernel-module-xen-pciback"
LICENSE = "MIT"
@ -41,21 +41,21 @@ do_check_xen_state() {
addtask check_xen_state before do_rootfs
syslinux_iso_populate_append() {
syslinux_iso_populate:append() {
install -m 0444 ${STAGING_DATADIR}/syslinux/libcom32.c32 ${ISODIR}${ISOLINUXDIR}
install -m 0444 ${STAGING_DATADIR}/syslinux/mboot.c32 ${ISODIR}${ISOLINUXDIR}
}
syslinux_hddimg_populate_append() {
syslinux_hddimg_populate:append() {
install -m 0444 ${STAGING_DATADIR}/syslinux/libcom32.c32 ${HDDDIR}${SYSLINUXDIR}
install -m 0444 ${STAGING_DATADIR}/syslinux/mboot.c32 ${HDDDIR}${SYSLINUXDIR}
}
grubefi_populate_append() {
grubefi_populate:append() {
install -m 0644 ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz ${DEST}${EFIDIR}/xen.gz
}
syslinux_populate_append() {
syslinux_populate:append() {
install -m 0644 ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz ${DEST}/xen.gz
}
@ -74,6 +74,7 @@ build_syslinux_cfg () {
# Enable runqemu. eg: runqemu xen-image-minimal nographic slirp
WKS_FILE_x86-64 = "directdisk-xen.wks"
QB_MEM ?= "-m 400"
QB_DEFAULT_KERNEL ?= "none"
QB_DEFAULT_FSTYPE ?= "wic"
QB_DEFAULT_FSTYPE_qemux86-64 = "wic"
@ -81,7 +82,7 @@ QB_FSINFO ?= "wic:kernel-in-fs"
QB_SERIAL_OPT = "-serial mon:stdio"
# qemux86-64 machine does not include 'wic' in IMAGE_FSTYPES, which is needed
# to boot this image, so add it here:
IMAGE_FSTYPES_qemux86-64 += "wic"
IMAGE_FSTYPES:qemux86-64 += "wic"
# Networking: the qemuboot.bbclass default virtio network device works ok
# and so does the emulated e1000 -- choose according to the network device
# drivers that are present in your dom0 Linux kernel. To switch to e1000:

4
recipes-extended/images/xtf-image.bb
View File

@ -14,11 +14,11 @@ DESCRIPTION = "A minimal Xen Test Framework (XTF) image for testing the Xen hype
IMAGE_NAME="xtf"
IMAGE_INSTALL_append = " xtf"
IMAGE_INSTALL:append = " xtf"
QB_DEFAULT_FSTYPE = "wic"
# Set the dom0 memory level lower than that assigned to qemu so that Xen has
# some available memory for allocating to the XTF microkernel guests to run:
QB_MEM = "-m 400"
SYSLINUX_XEN_ARGS_append = " dom0_mem=256M"
SYSLINUX_XEN_ARGS:append = " dom0_mem=256M"

2
recipes-extended/images/xvisor-image-minimal.bb
View File

@ -17,4 +17,4 @@ inherit core-image
# Enable runqemu. eg: runqemu xvisor-image-minimal nographic slirp
QB_DEFAULT_KERNEL = "vmm.bin"
QB_OPT_APPEND_append_riscv64 = " -cpu rv64,x-h=true "
QB_OPT_APPEND:append:riscv64 = " -cpu rv64,x-h=true "

2
recipes-extended/iptables/iptables-meta-virtualization.inc
View File

@ -1,4 +1,4 @@
RRECOMMENDS_${PN} += "kernel-module-ip6-tables \
RRECOMMENDS:${PN} += "kernel-module-ip6-tables \
kernel-module-ip-tables \
kernel-module-ip6table-filter \
kernel-module-iptable-filter \

6
recipes-extended/ipxe/ipxe_git.bb
View File

@ -5,13 +5,13 @@ DEPENDS = "binutils-native perl-native syslinux mtools-native cdrtools-native xz
LIC_FILES_CHKSUM = "file://../COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263"
# syslinux has this restriction
COMPATIBLE_HOST_class-target = '(x86_64|i.86).*-(linux|freebsd.*)'
COMPATIBLE_HOST:class-target = '(x86_64|i.86).*-(linux|freebsd.*)'
SRCREV = "18dc73d27edb55ebe9cb13c58d59af3da3bd374b"
PV = "1.20.1+git${SRCPV}"
PR = "r0"
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI = " \
git://github.com/ipxe/ipxe.git;protocol=https \
@ -21,7 +21,7 @@ SRC_URI = " \
file://build-be-explicit-about-fcommon-compiler-directive.patch \
"
FILES_${PN} = "/usr/share/firmware/*.rom"
FILES:${PN} = "/usr/share/firmware/*.rom"
EXTRA_OEMAKE = " \
ISOLINUX_BIN="${STAGING_DIR_TARGET}/usr/share/syslinux/isolinux.bin" \

2
recipes-extended/irqbalance/irqbalance.inc
View File

@ -21,7 +21,7 @@ INITSCRIPT_PARAMS = "defaults"
inherit autotools update-rc.d pkgconfig systemd
SYSTEMD_PACKAGES = "irqbalance"
SYSTEMD_SERVICE_irqbalance = "irqbalanced.service"
SYSTEMD_SERVICE:irqbalance = "irqbalanced.service"
EXTRA_OECONF = "--program-transform-name= \
"

12
recipes-extended/libibverbs/libibverbs_1.2.1.bb
View File

@ -16,19 +16,19 @@ inherit autotools
DEPENDS = "libnl pkgconfig-native"
PACKAGES += "${PN}-utils"
FILES_${PN} = "${sysconfdir} ${libdir}/*.so.*"
FILES_${PN}-utils = "${bindir}"
FILES:${PN} = "${sysconfdir} ${libdir}/*.so.*"
FILES:${PN}-utils = "${bindir}"
PACKAGECONFIG ??= ""
PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind,"
do_install_append() {
do_install:append() {
mkdir -p ${D}${sysconfdir}/libibverbs.d
rm -f ${D}${libdir}/libibverbs.la
}
PROVIDES = "virtual/libibverbs"
RPROVIDES_${PN} = "virtual/libibverbs"
RPROVIDES:${PN} = "virtual/libibverbs"
COMPATIBLE_HOST_mipsarch = "none"
COMPATIBLE_HOST_arm = "none"
COMPATIBLE_HOST:mipsarch = "none"
COMPATIBLE_HOST:arm = "none"

14
recipes-extended/libvirt/libvirt-python.inc
View File

@ -5,15 +5,15 @@ export STAGING_LIBDIR
export BUILD_SYS
export HOST_SYS
RDEPENDS_${PN}-python += "python3"
RDEPENDS:${PN}-python += "python3"
PACKAGECONFIG_${PN}-python[xen] = ",,,xen-python"
PACKAGES += "${PN}-python-staticdev ${PN}-python-dev ${PN}-python-dbg ${PN}-python"
FILES_${PN}-python-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a"
FILES_${PN}-python-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
FILES_${PN}-python-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/"
FILES_${PN}-python = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
FILES:${PN}-python-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a"
FILES:${PN}-python-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
FILES:${PN}-python-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/"
FILES:${PN}-python = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
SRC_URI += "http://libvirt.org/sources/python/libvirt-python-${PV}.tar.gz;name=libvirt_python"
@ -38,7 +38,7 @@ python __anonymous () {
d.setVar('LIBVIRT_PYTHON_ENABLE', '0')
}
do_compile_append() {
do_compile:append() {
if [ "${LIBVIRT_PYTHON_ENABLE}" = "1" ]; then
# we need the python bindings to look into our source dir, not
# the syroot staged pkgconfig entries. So we clear the sysroot
@ -49,7 +49,7 @@ do_compile_append() {
fi
}
do_install_append() {
do_install:append() {
if [ "${LIBVIRT_PYTHON_ENABLE}" = "1" ]; then
# we need the python bindings to look into our source dir, not
# the syroot staged pkgconfig entries. So we clear the sysroot

Some files were not shown because too many files have changed in this diff Show More