diff options
Diffstat (limited to 'recipes-containers')
| -rw-r--r-- | recipes-containers/container-host-config/container-host-config.bb | 2 | ||||
| -rw-r--r-- | recipes-containers/cri-tools/cri-tools_git.bb | 2 | ||||
| -rw-r--r-- | recipes-containers/criu/criu_git.bb | 4 | ||||
| -rw-r--r-- | recipes-containers/docker-compose/docker-compose_git.bb | 2 | ||||
| -rw-r--r-- | recipes-containers/docker-distribution/docker-distribution_git.bb | 4 | ||||
| -rw-r--r-- | recipes-containers/docker/docker.inc | 2 | ||||
| -rw-r--r-- | recipes-containers/lxc/lxc_git.bb | 2 | ||||
| -rw-r--r-- | recipes-containers/nerdctl/nerdctl_git.bb | 2 | ||||
| -rw-r--r-- | recipes-containers/oci-image-tools/oci-image-tools_git.bb | 2 | ||||
| -rw-r--r-- | recipes-containers/podman/podman_git.bb | 4 | ||||
| -rw-r--r-- | recipes-containers/riddler/riddler_git.bb | 2 | ||||
| -rw-r--r-- | recipes-containers/runc/runc.inc | 4 | ||||
| -rw-r--r-- | recipes-containers/skopeo/skopeo_git.bb | 2 | ||||
| -rw-r--r-- | recipes-containers/umoci/umoci_git.bb | 2 |
14 files changed, 18 insertions, 18 deletions
diff --git a/recipes-containers/container-host-config/container-host-config.bb b/recipes-containers/container-host-config/container-host-config.bb index eb047da9..dc0ae201 100644 --- a/recipes-containers/container-host-config/container-host-config.bb +++ b/recipes-containers/container-host-config/container-host-config.bb | |||
| @@ -11,7 +11,7 @@ SRC_URI = " \ | |||
| 11 | file://policy.json \ | 11 | file://policy.json \ |
| 12 | " | 12 | " |
| 13 | 13 | ||
| 14 | S="${UNPACKDIR}" | 14 | S = "${UNPACKDIR}" |
| 15 | 15 | ||
| 16 | do_install() { | 16 | do_install() { |
| 17 | install -d ${D}/${sysconfdir}/containers | 17 | install -d ${D}/${sysconfdir}/containers |
diff --git a/recipes-containers/cri-tools/cri-tools_git.bb b/recipes-containers/cri-tools/cri-tools_git.bb index d06e34c5..25f13702 100644 --- a/recipes-containers/cri-tools/cri-tools_git.bb +++ b/recipes-containers/cri-tools/cri-tools_git.bb | |||
| @@ -36,7 +36,7 @@ inherit go | |||
| 36 | inherit goarch | 36 | inherit goarch |
| 37 | inherit pkgconfig | 37 | inherit pkgconfig |
| 38 | 38 | ||
| 39 | EXTRA_OEMAKE="BUILDTAGS=''" | 39 | EXTRA_OEMAKE = "BUILDTAGS = ''" |
| 40 | 40 | ||
| 41 | do_compile() { | 41 | do_compile() { |
| 42 | # link fixups for compilation | 42 | # link fixups for compilation |
diff --git a/recipes-containers/criu/criu_git.bb b/recipes-containers/criu/criu_git.bb index 8ecc1725..811eb7e3 100644 --- a/recipes-containers/criu/criu_git.bb +++ b/recipes-containers/criu/criu_git.bb | |||
| @@ -49,8 +49,8 @@ CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_INCDIR}/libnl3" | |||
| 49 | CFLAGS:append:arm = " -D__WORDSIZE" | 49 | CFLAGS:append:arm = " -D__WORDSIZE" |
| 50 | 50 | ||
| 51 | # overide LDFLAGS to allow criu to build without: "x86_64-poky-linux-ld: unrecognized option '-Wl,-O1'" | 51 | # overide LDFLAGS to allow criu to build without: "x86_64-poky-linux-ld: unrecognized option '-Wl,-O1'" |
| 52 | export LDFLAGS="" | 52 | export LDFLAGS = "" |
| 53 | export C_INCLUDE_PATH="${STAGING_INCDIR}/libnl3" | 53 | export C_INCLUDE_PATH = "${STAGING_INCDIR}/libnl3" |
| 54 | 54 | ||
| 55 | export BUILD_SYS | 55 | export BUILD_SYS |
| 56 | export HOST_SYS | 56 | export HOST_SYS |
diff --git a/recipes-containers/docker-compose/docker-compose_git.bb b/recipes-containers/docker-compose/docker-compose_git.bb index 575ee30e..e48ee9af 100644 --- a/recipes-containers/docker-compose/docker-compose_git.bb +++ b/recipes-containers/docker-compose/docker-compose_git.bb | |||
| @@ -8,7 +8,7 @@ DEPENDS = " \ | |||
| 8 | " | 8 | " |
| 9 | 9 | ||
| 10 | # Specify the first two important SRCREVs as the format | 10 | # Specify the first two important SRCREVs as the format |
| 11 | SRCREV_FORMAT="compose_survey" | 11 | SRCREV_FORMAT = "compose_survey" |
| 12 | SRCREV_compose = "eaf9800948e022573997649656c040a19d4b15c2" | 12 | SRCREV_compose = "eaf9800948e022573997649656c040a19d4b15c2" |
| 13 | 13 | ||
| 14 | SRC_URI = "git://github.com/docker/compose;name=compose;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" | 14 | SRC_URI = "git://github.com/docker/compose;name=compose;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" |
diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb index c6e887f1..22e19ef4 100644 --- a/recipes-containers/docker-distribution/docker-distribution_git.bb +++ b/recipes-containers/docker-distribution/docker-distribution_git.bb | |||
| @@ -3,7 +3,7 @@ SUMMARY = "The Docker toolset to pack, ship, store, and deliver content" | |||
| 3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" |
| 5 | 5 | ||
| 6 | SRCREV_distribution= "f22dd6186008ff9d35f92acc5bc5fd16ba7ef95a" | 6 | SRCREV_distribution = "f22dd6186008ff9d35f92acc5bc5fd16ba7ef95a" |
| 7 | SRC_URI = "git://github.com/docker/distribution.git;branch=main;name=distribution;destsuffix=git/src/github.com/distribution/distribution/v3;protocol=https \ | 7 | SRC_URI = "git://github.com/docker/distribution.git;branch=main;name=distribution;destsuffix=git/src/github.com/distribution/distribution/v3;protocol=https \ |
| 8 | file://docker-registry.service \ | 8 | file://docker-registry.service \ |
| 9 | file://0001-build-use-to-use-cross-go-compiler.patch \ | 9 | file://0001-build-use-to-use-cross-go-compiler.patch \ |
| @@ -20,7 +20,7 @@ inherit goarch go systemd | |||
| 20 | 20 | ||
| 21 | # This disables seccomp and apparmor, which are on by default in the | 21 | # This disables seccomp and apparmor, which are on by default in the |
| 22 | # go package. | 22 | # go package. |
| 23 | EXTRA_OEMAKE="BUILDTAGS=''" | 23 | EXTRA_OEMAKE = "BUILDTAGS = ''" |
| 24 | 24 | ||
| 25 | do_compile() { | 25 | do_compile() { |
| 26 | export GOARCH="${TARGET_GOARCH}" | 26 | export GOARCH="${TARGET_GOARCH}" |
diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc index 3843f3b6..05a14f97 100644 --- a/recipes-containers/docker/docker.inc +++ b/recipes-containers/docker/docker.inc | |||
| @@ -50,7 +50,7 @@ do_configure[noexec] = "1" | |||
| 50 | # Export for possible use in Makefiles, default value comes from go.bbclass | 50 | # Export for possible use in Makefiles, default value comes from go.bbclass |
| 51 | export GO_LINKSHARED | 51 | export GO_LINKSHARED |
| 52 | 52 | ||
| 53 | DOCKER_PKG="github.com/docker/docker" | 53 | DOCKER_PKG = "github.com/docker/docker" |
| 54 | # in order to exclude devicemapper and btrfs - https://github.com/docker/docker/issues/14056 | 54 | # in order to exclude devicemapper and btrfs - https://github.com/docker/docker/issues/14056 |
| 55 | BUILD_TAGS ?= "exclude_graphdriver_btrfs exclude_graphdriver_devicemapper" | 55 | BUILD_TAGS ?= "exclude_graphdriver_btrfs exclude_graphdriver_devicemapper" |
| 56 | 56 | ||
diff --git a/recipes-containers/lxc/lxc_git.bb b/recipes-containers/lxc/lxc_git.bb index fe713a0d..63123590 100644 --- a/recipes-containers/lxc/lxc_git.bb +++ b/recipes-containers/lxc/lxc_git.bb | |||
| @@ -78,7 +78,7 @@ PACKAGECONFIG[doc] = "-Dman=true,-Dman=false,," | |||
| 78 | PACKAGECONFIG[apparmor] = "-Dapparmor=true,-Dapparmor=false,apparmor,apparmor" | 78 | PACKAGECONFIG[apparmor] = "-Dapparmor=true,-Dapparmor=false,apparmor,apparmor" |
| 79 | PACKAGECONFIG[templates] = ",,, ${PN}-templates" | 79 | PACKAGECONFIG[templates] = ",,, ${PN}-templates" |
| 80 | PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,libselinux" | 80 | PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,libselinux" |
| 81 | PACKAGECONFIG[seccomp] ="-Dseccomp=true,-Dseccomp=false,libseccomp,libseccomp" | 81 | PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp,libseccomp" |
| 82 | PACKAGECONFIG[systemd] = "-Dsystemd-unitdir=${sysconfdir}/systemd/system/, -Dsystemd-unitdir=, systemd," | 82 | PACKAGECONFIG[systemd] = "-Dsystemd-unitdir=${sysconfdir}/systemd/system/, -Dsystemd-unitdir=, systemd," |
| 83 | PACKAGECONFIG[systemd] = "-Dinit-script=systemd,-Dinit-script=sysvinit,systemd," | 83 | PACKAGECONFIG[systemd] = "-Dinit-script=systemd,-Dinit-script=sysvinit,systemd," |
| 84 | 84 | ||
diff --git a/recipes-containers/nerdctl/nerdctl_git.bb b/recipes-containers/nerdctl/nerdctl_git.bb index 45e17c27..536c470b 100644 --- a/recipes-containers/nerdctl/nerdctl_git.bb +++ b/recipes-containers/nerdctl/nerdctl_git.bb | |||
| @@ -10,7 +10,7 @@ DEPENDS = " \ | |||
| 10 | " | 10 | " |
| 11 | 11 | ||
| 12 | # Specify the first two important SRCREVs as the format | 12 | # Specify the first two important SRCREVs as the format |
| 13 | SRCREV_FORMAT="nerdcli_cgroups" | 13 | SRCREV_FORMAT = "nerdcli_cgroups" |
| 14 | SRCREV_nerdcli = "497c7cf74d09bf1ddf2678382360ca61e6faebac" | 14 | SRCREV_nerdcli = "497c7cf74d09bf1ddf2678382360ca61e6faebac" |
| 15 | 15 | ||
| 16 | SRC_URI = "git://github.com/containerd/nerdctl.git;name=nerdcli;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" | 16 | SRC_URI = "git://github.com/containerd/nerdctl.git;name=nerdcli;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" |
diff --git a/recipes-containers/oci-image-tools/oci-image-tools_git.bb b/recipes-containers/oci-image-tools/oci-image-tools_git.bb index ade6534d..c2e07889 100644 --- a/recipes-containers/oci-image-tools/oci-image-tools_git.bb +++ b/recipes-containers/oci-image-tools/oci-image-tools_git.bb | |||
| @@ -16,7 +16,7 @@ inherit go | |||
| 16 | 16 | ||
| 17 | # This disables seccomp and apparmor, which are on by default in the | 17 | # This disables seccomp and apparmor, which are on by default in the |
| 18 | # go package. | 18 | # go package. |
| 19 | EXTRA_OEMAKE="BUILDTAGS=''" | 19 | EXTRA_OEMAKE = "BUILDTAGS=''" |
| 20 | 20 | ||
| 21 | S = "${WORKDIR}/git/src/github.com/opencontainers/image-tools" | 21 | S = "${WORKDIR}/git/src/github.com/opencontainers/image-tools" |
| 22 | 22 | ||
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb index be85e512..dd3e78d9 100644 --- a/recipes-containers/podman/podman_git.bb +++ b/recipes-containers/podman/podman_git.bb | |||
| @@ -45,13 +45,13 @@ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | |||
| 45 | exclude_graphdriver_btrfs exclude_graphdriver_devicemapper ${BUILDTAGS_EXTRA}" | 45 | exclude_graphdriver_btrfs exclude_graphdriver_devicemapper ${BUILDTAGS_EXTRA}" |
| 46 | 46 | ||
| 47 | # overide LDFLAGS to allow podman to build without: "flag provided but not # defined: -Wl,-O1 | 47 | # overide LDFLAGS to allow podman to build without: "flag provided but not # defined: -Wl,-O1 |
| 48 | export LDFLAGS="" | 48 | export LDFLAGS = "" |
| 49 | 49 | ||
| 50 | # https://github.com/llvm/llvm-project/issues/53999 | 50 | # https://github.com/llvm/llvm-project/issues/53999 |
| 51 | TOOLCHAIN = "gcc" | 51 | TOOLCHAIN = "gcc" |
| 52 | 52 | ||
| 53 | # podmans Makefile expects BUILDFLAGS to be set but go.bbclass defines them in GOBUILDFLAGS | 53 | # podmans Makefile expects BUILDFLAGS to be set but go.bbclass defines them in GOBUILDFLAGS |
| 54 | export BUILDFLAGS="${GOBUILDFLAGS}" | 54 | export BUILDFLAGS = "${GOBUILDFLAGS}" |
| 55 | 55 | ||
| 56 | inherit go goarch | 56 | inherit go goarch |
| 57 | inherit container-host | 57 | inherit container-host |
diff --git a/recipes-containers/riddler/riddler_git.bb b/recipes-containers/riddler/riddler_git.bb index 3d6581a1..52630563 100644 --- a/recipes-containers/riddler/riddler_git.bb +++ b/recipes-containers/riddler/riddler_git.bb | |||
| @@ -22,7 +22,7 @@ COMPATIBLE_HOST:mipsarch = "null" | |||
| 22 | 22 | ||
| 23 | # This disables seccomp and apparmor, which are on by default in the | 23 | # This disables seccomp and apparmor, which are on by default in the |
| 24 | # go package. | 24 | # go package. |
| 25 | EXTRA_OEMAKE="BUILDTAGS=''" | 25 | EXTRA_OEMAKE = "BUILDTAGS=''" |
| 26 | 26 | ||
| 27 | do_compile() { | 27 | do_compile() { |
| 28 | export GOARCH="${TARGET_GOARCH}" | 28 | export GOARCH="${TARGET_GOARCH}" |
diff --git a/recipes-containers/runc/runc.inc b/recipes-containers/runc/runc.inc index a7c0f618..bcd7f791 100644 --- a/recipes-containers/runc/runc.inc +++ b/recipes-containers/runc/runc.inc | |||
| @@ -30,7 +30,7 @@ RPROVIDES:${PN} = "virtual-runc" | |||
| 30 | 30 | ||
| 31 | GO_IMPORT = "import" | 31 | GO_IMPORT = "import" |
| 32 | 32 | ||
| 33 | LIBCONTAINER_PACKAGE="github.com/opencontainers/runc/libcontainer" | 33 | LIBCONTAINER_PACKAGE = "github.com/opencontainers/runc/libcontainer" |
| 34 | 34 | ||
| 35 | do_configure[noexec] = "1" | 35 | do_configure[noexec] = "1" |
| 36 | 36 | ||
| @@ -38,7 +38,7 @@ do_configure[noexec] = "1" | |||
| 38 | DISTRO_BUILDTAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \ | 38 | DISTRO_BUILDTAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \ |
| 39 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" | 39 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" |
| 40 | 40 | ||
| 41 | EXTRA_OEMAKE="BUILDTAGS='${PACKAGECONFIG_CONFARGS} ${DISTRO_BUILDTAGS}' GO=${GO}" | 41 | EXTRA_OEMAKE = "BUILDTAGS='${PACKAGECONFIG_CONFARGS} ${DISTRO_BUILDTAGS}' GO=${GO}" |
| 42 | 42 | ||
| 43 | do_compile() { | 43 | do_compile() { |
| 44 | # Set GOPATH. See 'PACKAGERS.md'. Don't rely on | 44 | # Set GOPATH. See 'PACKAGERS.md'. Don't rely on |
diff --git a/recipes-containers/skopeo/skopeo_git.bb b/recipes-containers/skopeo/skopeo_git.bb index bc9abb90..fe8cfa16 100644 --- a/recipes-containers/skopeo/skopeo_git.bb +++ b/recipes-containers/skopeo/skopeo_git.bb | |||
| @@ -43,7 +43,7 @@ CVE_STATUS[CVE-2019-10214] = "fixed-version: This CVE was fixed in the container | |||
| 43 | 43 | ||
| 44 | # This disables seccomp and apparmor, which are on by default in the | 44 | # This disables seccomp and apparmor, which are on by default in the |
| 45 | # go package. | 45 | # go package. |
| 46 | EXTRA_OEMAKE="BUILDTAGS=''" | 46 | EXTRA_OEMAKE = "BUILDTAGS=''" |
| 47 | 47 | ||
| 48 | do_compile() { | 48 | do_compile() { |
| 49 | export GOARCH="${TARGET_GOARCH}" | 49 | export GOARCH="${TARGET_GOARCH}" |
diff --git a/recipes-containers/umoci/umoci_git.bb b/recipes-containers/umoci/umoci_git.bb index 317e1137..84f7a40f 100644 --- a/recipes-containers/umoci/umoci_git.bb +++ b/recipes-containers/umoci/umoci_git.bb | |||
| @@ -21,7 +21,7 @@ COMPATIBLE_HOST = "^(?!mips).*" | |||
| 21 | 21 | ||
| 22 | # This disables seccomp and apparmor, which are on by default in the | 22 | # This disables seccomp and apparmor, which are on by default in the |
| 23 | # go package. | 23 | # go package. |
| 24 | EXTRA_OEMAKE="BUILDTAGS=''" | 24 | EXTRA_OEMAKE = "BUILDTAGS=''" |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | do_compile:class-native () { | 27 | do_compile:class-native () { |
