mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-05 05:15:25 +02:00
metadata: add whitespace around assignments
With: https://lists.openembedded.org/g/bitbake-devel/message/17508 there are many WARNINGs from this layer will cover src_uri.inc files in next commit. Signed-off-by: Martin Jansa <martin.jansa@gmail.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
parent
0aca307071
commit
c01273e001
|
@ -11,7 +11,7 @@ SRC_URI = " \
|
|||
file://policy.json \
|
||||
"
|
||||
|
||||
S="${UNPACKDIR}"
|
||||
S = "${UNPACKDIR}"
|
||||
|
||||
do_install() {
|
||||
install -d ${D}/${sysconfdir}/containers
|
||||
|
|
|
@ -36,7 +36,7 @@ inherit go
|
|||
inherit goarch
|
||||
inherit pkgconfig
|
||||
|
||||
EXTRA_OEMAKE="BUILDTAGS=''"
|
||||
EXTRA_OEMAKE = "BUILDTAGS = ''"
|
||||
|
||||
do_compile() {
|
||||
# link fixups for compilation
|
||||
|
|
|
@ -49,8 +49,8 @@ CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_INCDIR}/libnl3"
|
|||
CFLAGS:append:arm = " -D__WORDSIZE"
|
||||
|
||||
# overide LDFLAGS to allow criu to build without: "x86_64-poky-linux-ld: unrecognized option '-Wl,-O1'"
|
||||
export LDFLAGS=""
|
||||
export C_INCLUDE_PATH="${STAGING_INCDIR}/libnl3"
|
||||
export LDFLAGS = ""
|
||||
export C_INCLUDE_PATH = "${STAGING_INCDIR}/libnl3"
|
||||
|
||||
export BUILD_SYS
|
||||
export HOST_SYS
|
||||
|
|
|
@ -8,7 +8,7 @@ DEPENDS = " \
|
|||
"
|
||||
|
||||
# Specify the first two important SRCREVs as the format
|
||||
SRCREV_FORMAT="compose_survey"
|
||||
SRCREV_FORMAT = "compose_survey"
|
||||
SRCREV_compose = "eaf9800948e022573997649656c040a19d4b15c2"
|
||||
|
||||
SRC_URI = "git://github.com/docker/compose;name=compose;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}"
|
||||
|
|
|
@ -3,7 +3,7 @@ SUMMARY = "The Docker toolset to pack, ship, store, and deliver content"
|
|||
LICENSE = "Apache-2.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
|
||||
|
||||
SRCREV_distribution= "f22dd6186008ff9d35f92acc5bc5fd16ba7ef95a"
|
||||
SRCREV_distribution = "f22dd6186008ff9d35f92acc5bc5fd16ba7ef95a"
|
||||
SRC_URI = "git://github.com/docker/distribution.git;branch=main;name=distribution;destsuffix=git/src/github.com/distribution/distribution/v3;protocol=https \
|
||||
file://docker-registry.service \
|
||||
file://0001-build-use-to-use-cross-go-compiler.patch \
|
||||
|
@ -20,7 +20,7 @@ inherit goarch go systemd
|
|||
|
||||
# This disables seccomp and apparmor, which are on by default in the
|
||||
# go package.
|
||||
EXTRA_OEMAKE="BUILDTAGS=''"
|
||||
EXTRA_OEMAKE = "BUILDTAGS = ''"
|
||||
|
||||
do_compile() {
|
||||
export GOARCH="${TARGET_GOARCH}"
|
||||
|
|
|
@ -50,7 +50,7 @@ do_configure[noexec] = "1"
|
|||
# Export for possible use in Makefiles, default value comes from go.bbclass
|
||||
export GO_LINKSHARED
|
||||
|
||||
DOCKER_PKG="github.com/docker/docker"
|
||||
DOCKER_PKG = "github.com/docker/docker"
|
||||
# in order to exclude devicemapper and btrfs - https://github.com/docker/docker/issues/14056
|
||||
BUILD_TAGS ?= "exclude_graphdriver_btrfs exclude_graphdriver_devicemapper"
|
||||
|
||||
|
|
|
@ -78,7 +78,7 @@ PACKAGECONFIG[doc] = "-Dman=true,-Dman=false,,"
|
|||
PACKAGECONFIG[apparmor] = "-Dapparmor=true,-Dapparmor=false,apparmor,apparmor"
|
||||
PACKAGECONFIG[templates] = ",,, ${PN}-templates"
|
||||
PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,libselinux"
|
||||
PACKAGECONFIG[seccomp] ="-Dseccomp=true,-Dseccomp=false,libseccomp,libseccomp"
|
||||
PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp,libseccomp"
|
||||
PACKAGECONFIG[systemd] = "-Dsystemd-unitdir=${sysconfdir}/systemd/system/, -Dsystemd-unitdir=, systemd,"
|
||||
PACKAGECONFIG[systemd] = "-Dinit-script=systemd,-Dinit-script=sysvinit,systemd,"
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ DEPENDS = " \
|
|||
"
|
||||
|
||||
# Specify the first two important SRCREVs as the format
|
||||
SRCREV_FORMAT="nerdcli_cgroups"
|
||||
SRCREV_FORMAT = "nerdcli_cgroups"
|
||||
SRCREV_nerdcli = "497c7cf74d09bf1ddf2678382360ca61e6faebac"
|
||||
|
||||
SRC_URI = "git://github.com/containerd/nerdctl.git;name=nerdcli;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}"
|
||||
|
|
|
@ -16,7 +16,7 @@ inherit go
|
|||
|
||||
# This disables seccomp and apparmor, which are on by default in the
|
||||
# go package.
|
||||
EXTRA_OEMAKE="BUILDTAGS=''"
|
||||
EXTRA_OEMAKE = "BUILDTAGS=''"
|
||||
|
||||
S = "${WORKDIR}/git/src/github.com/opencontainers/image-tools"
|
||||
|
||||
|
|
|
@ -45,13 +45,13 @@ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
|
|||
exclude_graphdriver_btrfs exclude_graphdriver_devicemapper ${BUILDTAGS_EXTRA}"
|
||||
|
||||
# overide LDFLAGS to allow podman to build without: "flag provided but not # defined: -Wl,-O1
|
||||
export LDFLAGS=""
|
||||
export LDFLAGS = ""
|
||||
|
||||
# https://github.com/llvm/llvm-project/issues/53999
|
||||
TOOLCHAIN = "gcc"
|
||||
|
||||
# podmans Makefile expects BUILDFLAGS to be set but go.bbclass defines them in GOBUILDFLAGS
|
||||
export BUILDFLAGS="${GOBUILDFLAGS}"
|
||||
export BUILDFLAGS = "${GOBUILDFLAGS}"
|
||||
|
||||
inherit go goarch
|
||||
inherit container-host
|
||||
|
|
|
@ -22,7 +22,7 @@ COMPATIBLE_HOST:mipsarch = "null"
|
|||
|
||||
# This disables seccomp and apparmor, which are on by default in the
|
||||
# go package.
|
||||
EXTRA_OEMAKE="BUILDTAGS=''"
|
||||
EXTRA_OEMAKE = "BUILDTAGS=''"
|
||||
|
||||
do_compile() {
|
||||
export GOARCH="${TARGET_GOARCH}"
|
||||
|
|
|
@ -30,7 +30,7 @@ RPROVIDES:${PN} = "virtual-runc"
|
|||
|
||||
GO_IMPORT = "import"
|
||||
|
||||
LIBCONTAINER_PACKAGE="github.com/opencontainers/runc/libcontainer"
|
||||
LIBCONTAINER_PACKAGE = "github.com/opencontainers/runc/libcontainer"
|
||||
|
||||
do_configure[noexec] = "1"
|
||||
|
||||
|
@ -38,7 +38,7 @@ do_configure[noexec] = "1"
|
|||
DISTRO_BUILDTAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}"
|
||||
|
||||
EXTRA_OEMAKE="BUILDTAGS='${PACKAGECONFIG_CONFARGS} ${DISTRO_BUILDTAGS}' GO=${GO}"
|
||||
EXTRA_OEMAKE = "BUILDTAGS='${PACKAGECONFIG_CONFARGS} ${DISTRO_BUILDTAGS}' GO=${GO}"
|
||||
|
||||
do_compile() {
|
||||
# Set GOPATH. See 'PACKAGERS.md'. Don't rely on
|
||||
|
|
|
@ -43,7 +43,7 @@ CVE_STATUS[CVE-2019-10214] = "fixed-version: This CVE was fixed in the container
|
|||
|
||||
# This disables seccomp and apparmor, which are on by default in the
|
||||
# go package.
|
||||
EXTRA_OEMAKE="BUILDTAGS=''"
|
||||
EXTRA_OEMAKE = "BUILDTAGS=''"
|
||||
|
||||
do_compile() {
|
||||
export GOARCH="${TARGET_GOARCH}"
|
||||
|
|
|
@ -21,7 +21,7 @@ COMPATIBLE_HOST = "^(?!mips).*"
|
|||
|
||||
# This disables seccomp and apparmor, which are on by default in the
|
||||
# go package.
|
||||
EXTRA_OEMAKE="BUILDTAGS=''"
|
||||
EXTRA_OEMAKE = "BUILDTAGS=''"
|
||||
|
||||
|
||||
do_compile:class-native () {
|
||||
|
|
|
@ -4,8 +4,8 @@ DESCRIPTION = "Xen Runtime for OCI"
|
|||
|
||||
SRCREV_runx = "edc9350a79ede0365066c9743080e3dc6430d602"
|
||||
|
||||
KERNEL_SRC_VER="linux-5.4"
|
||||
KERNEL_URL_VER="v5.x"
|
||||
KERNEL_SRC_VER = "linux-5.4"
|
||||
KERNEL_URL_VER = "v5.x"
|
||||
|
||||
SRC_URI = "\
|
||||
git://github.com/lf-edge/runx;nobranch=1;name=runx;protocol=https \
|
||||
|
|
|
@ -11,7 +11,7 @@ SRCREV_cobra = "b43be995ebb4bee335a787bd44498b91aef7619c"
|
|||
SRCREV_pflag = "2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab"
|
||||
SRCREV_logging = "b2cb9fa56473e98db8caba80237377e83fe44db5"
|
||||
SRCREV_yaml = "f6f7691b1fdeb513f56608cd2c32c51f8194bf51"
|
||||
SRCREV_xerrors="65e65417b02f28de84b55f16b46a1e789149973a"
|
||||
SRCREV_xerrors = "65e65417b02f28de84b55f16b46a1e789149973a"
|
||||
SRCREV_envsubst = "16035fe3571ad42c7796bf554f978bb2df64231b"
|
||||
SRCREV_participle = "49f4822ed012d9818c80ca4fcdeb7e2d55c04806"
|
||||
SRCREV_utfbom = "6ae8f945ca96f30defc7e8ab12ec5d10cf86ded4"
|
||||
|
|
|
@ -18,7 +18,7 @@ SRC_URI = "gitsm://github.com/ceph/ceph.git;protocol=https;branch=main \
|
|||
file://0001-rgw-setup.py-allow-incompatible-pointer-types.patch \
|
||||
"
|
||||
|
||||
SRCREV= "a53e858fd7cc6fd8c04f37d503ce9ed7080f2da6"
|
||||
SRCREV = "a53e858fd7cc6fd8c04f37d503ce9ed7080f2da6"
|
||||
PV = "20.0.0+git"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
|
|
@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only"
|
|||
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
|
||||
SECTION = "console/tools"
|
||||
|
||||
BASE_PV="0.16.21"
|
||||
BASE_PV = "0.16.21"
|
||||
PV = "${BASE_PV}+git"
|
||||
SRCREV = "e254e0b19651d3b8a20225b40281c9974a95dec4"
|
||||
SRC_URI = "git://github.com/jbruchon/${BPN}.git;protocol=https;branch=master \
|
||||
|
|
|
@ -2,7 +2,7 @@ SUMMARY = "Basic container image with development tools"
|
|||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
||||
|
||||
CONTAINER_SHELL="bash"
|
||||
CONTAINER_SHELL = "bash"
|
||||
|
||||
CORE_DEV_IMAGE_EXTRA_INSTALL ?= ""
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ DESCRIPTION = "A minimal Xen Test Framework (XTF) image for testing the Xen hype
|
|||
# For testimage, see the qemu boot log: ${WORKDIR}/testimage/qemu_boot_log.*
|
||||
# and the test log: ${WORKDIR}/temp/log.do_testimage
|
||||
|
||||
IMAGE_NAME="xtf"
|
||||
IMAGE_NAME = "xtf"
|
||||
|
||||
IMAGE_INSTALL:append = " xtf"
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ PV = "5.10.0+git"
|
|||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
EXTRA_OEMAKE='V=1 EXTRA_CFLAGS="-I${STAGING_KERNEL_BUILDDIR}/include/generated -I${STAGING_KERNEL_BUILDDIR}/arch/${ARCH}/include/generated"'
|
||||
EXTRA_OEMAKE = 'V=1 EXTRA_CFLAGS="-I${STAGING_KERNEL_BUILDDIR}/include/generated -I${STAGING_KERNEL_BUILDDIR}/arch/${ARCH}/include/generated"'
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${bindir}
|
||||
|
|
|
@ -25,7 +25,7 @@ SRC_URI[libvirt_python.sha256sum] = "00efb9a781087668512d6a002eb9cd136e44ff8701a
|
|||
export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml"
|
||||
export LIBVIRT_CFLAGS = "-I${S}/include"
|
||||
export LIBVIRT_LIBS = "-L${B}/src/.libs -lvirt -ldl"
|
||||
export LDFLAGS="-L${B}/src/.libs"
|
||||
export LDFLAGS = "-L${B}/src/.libs"
|
||||
|
||||
LIBVIRT_INSTALL_ARGS = "--root=${D} \
|
||||
--prefix=${prefix} \
|
||||
|
|
|
@ -13,7 +13,7 @@ DEPENDS = " \
|
|||
rsync-native \
|
||||
"
|
||||
# Specify the first two important SRCREVs as the format
|
||||
SRCREV_FORMAT="rootless"
|
||||
SRCREV_FORMAT = "rootless"
|
||||
SRCREV_rootless = "530859a92629689c0c17c96d9ab145f4d04b5b5a"
|
||||
|
||||
SRC_URI = "git://github.com/rootless-containers/rootlesskit;name=rootless;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}"
|
||||
|
|
|
@ -114,4 +114,4 @@ KCONFIG_CONFIG_ROOTDIR = "${S}/xen"
|
|||
|
||||
# Xen is setting all CC flags on its own. Make sure that they are not modified
|
||||
# for aarch64, e.g. with architecture-specific optimizations.
|
||||
TUNE_CCARGS:aarch64=""
|
||||
TUNE_CCARGS:aarch64 = ""
|
||||
|
|
|
@ -721,14 +721,14 @@ FILES:${PN}-test += "\
|
|||
# test-cpu-policy and test-tsx only exist in 4.16 for x86
|
||||
ALLOW_EMPTY:${PN}-test = "1"
|
||||
|
||||
FILES:${PN}-xen-mceinj +="\
|
||||
FILES:${PN}-xen-mceinj += "\
|
||||
${sbindir}/xen-mceinj \
|
||||
"
|
||||
|
||||
# xen-mceinj is only built for x86 4.16, so allow empty package
|
||||
ALLOW_EMPTY:${PN}-xen-mceinj = "1"
|
||||
|
||||
FILES:${PN}-xen-vmtrace +="\
|
||||
FILES:${PN}-xen-vmtrace += "\
|
||||
${sbindir}/xen-vmtrace \
|
||||
"
|
||||
|
||||
|
|
|
@ -73,20 +73,20 @@ libexecdir = "${libdir}"
|
|||
export XEN_OS = "Linux"
|
||||
|
||||
# this is used for the header (#!${bindir}/python) of the install python scripts
|
||||
export PYTHONPATH="${bindir}/env python3"
|
||||
export ac_cv_path_PYTHONPATH="${bindir}/env python3"
|
||||
export PYTHONPATH = "${bindir}/env python3"
|
||||
export ac_cv_path_PYTHONPATH = "${bindir}/env python3"
|
||||
export DISTUTILS_BUILD_ARGS
|
||||
export DISTUTILS_INSTALL_ARGS
|
||||
|
||||
# xen and seabios require HOSTCC and HOSTCXX set to cross-compile
|
||||
export HOSTCC="${BUILD_CC}"
|
||||
export HOSTCXX="${BUILD_CXX}"
|
||||
export HOSTCC = "${BUILD_CC}"
|
||||
export HOSTCXX = "${BUILD_CXX}"
|
||||
|
||||
# make xen requires CROSS_COMPILE set by hand as it does not abide by ./configure
|
||||
export CROSS_COMPILE="${TARGET_PREFIX}"
|
||||
export CROSS_COMPILE = "${TARGET_PREFIX}"
|
||||
|
||||
# overide LDFLAGS to allow xen to build without: "x86_64-oe-linux-ld: unrecognized option '-Wl,-O1'"
|
||||
export LDFLAGS=""
|
||||
export LDFLAGS = ""
|
||||
|
||||
# No additional C flags for the main hypervisor build
|
||||
EXTRA_CFLAGS_XEN_CORE ?= ""
|
||||
|
@ -99,7 +99,7 @@ DEBUG_PREFIX_MAP:append = " \
|
|||
# - The Xen tools build for x86 systems with HVM-mode enabled includes hvmloader
|
||||
# which fails to build when "-m64" is included in flags set via the
|
||||
# EXTRA_CFLAGS_XEN_TOOLS: so clear TUNE_CCARGS on x86 to prevent that.
|
||||
TUNE_CCARGS:x86-64=""
|
||||
TUNE_CCARGS:x86-64 = ""
|
||||
|
||||
# - Yocto supplies the _FORTIFY_SOURCE flag via CC/CPP/CXX but then passes the
|
||||
# optimization -O via C*FLAGS which is problematic when the CFLAGS are cleared
|
||||
|
@ -110,11 +110,11 @@ TUNE_CCARGS:x86-64=""
|
|||
# It must not be compiled with SSE compiler options enabled and the Xen build
|
||||
# explicitly clears CFLAGS to ensure that, so such options must not be passed
|
||||
# in via the tool variable. hvmloader is required to run HVM-mode guest VMs.
|
||||
CC="${CCACHE}${HOST_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${DEBUG_PREFIX_MAP} ${CC_REPRODUCIBLE_OPTIONS}"
|
||||
EXTRA_CFLAGS_XEN_TOOLS="${HOST_CC_ARCH} ${CFLAGS}"
|
||||
CC = "${CCACHE}${HOST_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${DEBUG_PREFIX_MAP} ${CC_REPRODUCIBLE_OPTIONS}"
|
||||
EXTRA_CFLAGS_XEN_TOOLS = "${HOST_CC_ARCH} ${CFLAGS}"
|
||||
# 32-bit ARM needs the TUNE_CCARGS component of HOST_CC_ARCH to be passed
|
||||
# in CC to ensure that configure can compile binaries for the right arch.
|
||||
CC:arm="${CCACHE}${HOST_PREFIX}gcc ${TUNE_CCARGS} ${TOOLCHAIN_OPTIONS} ${DEBUG_PREFIX_MAP} ${CC_REPRODUCIBLE_OPTIONS}"
|
||||
CC:arm = "${CCACHE}${HOST_PREFIX}gcc ${TUNE_CCARGS} ${TOOLCHAIN_OPTIONS} ${DEBUG_PREFIX_MAP} ${CC_REPRODUCIBLE_OPTIONS}"
|
||||
|
||||
# There are no Xen-provided variables for C++, so append to the tool variables:
|
||||
CPP:append = " ${CPPFLAGS}"
|
||||
|
|
Loading…
Reference in New Issue
Block a user