summaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/bind/bind_virtualization.inc2
-rw-r--r--recipes-core/busybox/busybox-initrd.bb2
-rw-r--r--recipes-core/kata-containers/kata-agent_git.bb6
-rw-r--r--recipes-core/kata-containers/kata-proxy_git.bb4
-rw-r--r--recipes-core/kata-containers/kata-runtime_git.bb6
-rw-r--r--recipes-core/kata-containers/kata-shim_git.bb4
-rw-r--r--recipes-core/packagegroups/packagegroup-container.bb31
-rw-r--r--recipes-core/packagegroups/packagegroup-kubernetes.bb1
-rw-r--r--recipes-core/runv/runv_git.bb87
-rw-r--r--recipes-core/runx/runx_git.bb5
-rw-r--r--recipes-core/sysvinit/sysvinit-inittab_virtualization.inc2
11 files changed, 42 insertions, 108 deletions
diff --git a/recipes-core/bind/bind_virtualization.inc b/recipes-core/bind/bind_virtualization.inc
index a6e39049..bb4e22b2 100644
--- a/recipes-core/bind/bind_virtualization.inc
+++ b/recipes-core/bind/bind_virtualization.inc
@@ -1,4 +1,4 @@
1# Tell named not to bother listening on the IP address that lxc and libvirtd handles itself. 1# Tell named not to bother listening on the IP address that lxc and libvirtd handles itself.
2do_install:append() { 2do_install:append() {
3 sed -i -e 's,^\( *options *{\)$,\1\n\t// lxc and libvirtd would take care of this address itself\n\tlisten-on { ! 10.0.3.1; ! 192.168.122.1; any;};\n,' ${D}${sysconfdir}/bind/named.conf.options 3 sed -i -e 's,^\( *options *{\)$,\1\n\t// lxc and libvirtd would take care of this address itself\n\tlisten-on { ! 10.0.3.1; ! 192.168.122.1; any;};\n\tlisten-on-v6 { ! fc42:5009:ba4b:5ab0::1; any;};\n,' ${D}${sysconfdir}/bind/named.conf.options
4} 4}
diff --git a/recipes-core/busybox/busybox-initrd.bb b/recipes-core/busybox/busybox-initrd.bb
index 513ed135..8fc3fb2a 100644
--- a/recipes-core/busybox/busybox-initrd.bb
+++ b/recipes-core/busybox/busybox-initrd.bb
@@ -22,7 +22,7 @@ SRC_URI += "file://init.cfg \
22 ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'file://static.cfg', '', d)} \ 22 ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'file://static.cfg', '', d)} \
23 file://initrd.cfg" 23 file://initrd.cfg"
24 24
25S = "${WORKDIR}/busybox-${PV}" 25S = "${UNPACKDIR}/busybox-${PV}"
26 26
27# override security-flags settings, we have some warnings to ignore 27# override security-flags settings, we have some warnings to ignore
28SECURITY_STRINGFORMAT = "" 28SECURITY_STRINGFORMAT = ""
diff --git a/recipes-core/kata-containers/kata-agent_git.bb b/recipes-core/kata-containers/kata-agent_git.bb
index de28235c..3ad94783 100644
--- a/recipes-core/kata-containers/kata-agent_git.bb
+++ b/recipes-core/kata-containers/kata-agent_git.bb
@@ -12,8 +12,6 @@ RDEPENDS:${PN}-dev:append = "bash"
12 12
13SKIP_RECIPE[kata-agent] ?= "kata containers are currently broken, patches accepted" 13SKIP_RECIPE[kata-agent] ?= "kata containers are currently broken, patches accepted"
14 14
15S = "${WORKDIR}/git"
16
17inherit go 15inherit go
18 16
19do_compile() { 17do_compile() {
@@ -30,10 +28,10 @@ do_compile() {
30 28
31do_install() { 29do_install() {
32 mkdir -p ${D}/${bindir}/ 30 mkdir -p ${D}/${bindir}/
33 cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-agent ${D}/${bindir} 31 cp ${UNPACKDIR}/git/src/${GO_IMPORT}/kata-agent ${D}/${bindir}
34 32
35 mkdir -p ${D}/${systemd_unitdir}/system 33 mkdir -p ${D}/${systemd_unitdir}/system
36 cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-agent.service ${D}/${systemd_unitdir}/system 34 cp ${UNPACKDIR}/git/src/${GO_IMPORT}/kata-agent.service ${D}/${systemd_unitdir}/system
37} 35}
38 36
39deltask compile_ptest_base 37deltask compile_ptest_base
diff --git a/recipes-core/kata-containers/kata-proxy_git.bb b/recipes-core/kata-containers/kata-proxy_git.bb
index d835e4d2..03784ae8 100644
--- a/recipes-core/kata-containers/kata-proxy_git.bb
+++ b/recipes-core/kata-containers/kata-proxy_git.bb
@@ -13,8 +13,6 @@ SKIP_RECIPE[kata-proxy] ?= "kata containers are currently broken, patches accept
13 13
14RDEPENDS:${PN}-dev:append = "bash" 14RDEPENDS:${PN}-dev:append = "bash"
15 15
16S = "${WORKDIR}/git"
17
18inherit go 16inherit go
19 17
20do_compile() { 18do_compile() {
@@ -31,7 +29,7 @@ do_compile() {
31 29
32do_install() { 30do_install() {
33 mkdir -p ${D}/${libexecdir}/kata-containers 31 mkdir -p ${D}/${libexecdir}/kata-containers
34 cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-proxy ${D}/${libexecdir}/kata-containers 32 cp ${UNPACKDIR}/git/src/${GO_IMPORT}/kata-proxy ${D}/${libexecdir}/kata-containers
35} 33}
36 34
37deltask compile_ptest_base 35deltask compile_ptest_base
diff --git a/recipes-core/kata-containers/kata-runtime_git.bb b/recipes-core/kata-containers/kata-runtime_git.bb
index c0d7c4cb..30ed4229 100644
--- a/recipes-core/kata-containers/kata-runtime_git.bb
+++ b/recipes-core/kata-containers/kata-runtime_git.bb
@@ -21,8 +21,6 @@ DEPENDS += "yq-native"
21 21
22SKIP_RECIPE[kata-runtime] ?= "kata containers are currently broken, patches accepted" 22SKIP_RECIPE[kata-runtime] ?= "kata containers are currently broken, patches accepted"
23 23
24S = "${WORKDIR}/git"
25
26inherit go 24inherit go
27 25
28do_compile() { 26do_compile() {
@@ -41,10 +39,10 @@ do_compile() {
41 39
42do_install() { 40do_install() {
43 mkdir -p ${D}/${bindir} 41 mkdir -p ${D}/${bindir}
44 cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-runtime ${D}/${bindir} 42 cp ${UNPACKDIR}/git/src/${GO_IMPORT}/kata-runtime ${D}/${bindir}
45 43
46 mkdir -p ${D}/${datadir}/defaults/kata-containers/ 44 mkdir -p ${D}/${datadir}/defaults/kata-containers/
47 cp ${WORKDIR}/git/src/${GO_IMPORT}/cli/config/configuration-qemu.toml ${D}/${datadir}/defaults/kata-containers/configuration.toml 45 cp ${UNPACKDIR}/git/src/${GO_IMPORT}/cli/config/configuration-qemu.toml ${D}/${datadir}/defaults/kata-containers/configuration.toml
48 46
49 sed -e 's|/usr/bin/qemu-lite-system-x86_64|/usr/bin/qemu-system-x86_64|' -i ${D}/${datadir}/defaults/kata-containers/configuration.toml 47 sed -e 's|/usr/bin/qemu-lite-system-x86_64|/usr/bin/qemu-system-x86_64|' -i ${D}/${datadir}/defaults/kata-containers/configuration.toml
50 sed -e 's|/usr/share/kata-containers/vmlinuz.container|/var/lib/hyper/kernel|' -i ${D}/${datadir}/defaults/kata-containers/configuration.toml 48 sed -e 's|/usr/share/kata-containers/vmlinuz.container|/var/lib/hyper/kernel|' -i ${D}/${datadir}/defaults/kata-containers/configuration.toml
diff --git a/recipes-core/kata-containers/kata-shim_git.bb b/recipes-core/kata-containers/kata-shim_git.bb
index 8a7cb78a..b8c7540c 100644
--- a/recipes-core/kata-containers/kata-shim_git.bb
+++ b/recipes-core/kata-containers/kata-shim_git.bb
@@ -12,8 +12,6 @@ SKIP_RECIPE[kata-shim] ?= "kata containers are currently broken, patches accepte
12 12
13RDEPENDS:${PN}-dev:append = "bash" 13RDEPENDS:${PN}-dev:append = "bash"
14 14
15S = "${WORKDIR}/git"
16
17inherit go 15inherit go
18 16
19do_compile() { 17do_compile() {
@@ -30,7 +28,7 @@ do_compile() {
30 28
31do_install() { 29do_install() {
32 mkdir -p ${D}/${libexecdir}/kata-containers 30 mkdir -p ${D}/${libexecdir}/kata-containers
33 cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-shim ${D}/${libexecdir}/kata-containers 31 cp ${UNPACKDIR}/git/src/${GO_IMPORT}/kata-shim ${D}/${libexecdir}/kata-containers
34} 32}
35 33
36deltask compile_ptest_base 34deltask compile_ptest_base
diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb
index 4b1ad009..b94e6799 100644
--- a/recipes-core/packagegroups/packagegroup-container.bb
+++ b/recipes-core/packagegroups/packagegroup-container.bb
@@ -2,6 +2,8 @@ SUMMARY = "All packages for container host"
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" 3LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
4 4
5PACKAGE_ARCH = "${MACHINE_ARCH}"
6
5inherit packagegroup 7inherit packagegroup
6 8
7COMPATIBLE_HOST = "^(?!(mips|riscv)).*" 9COMPATIBLE_HOST = "^(?!(mips|riscv)).*"
@@ -11,6 +13,9 @@ PACKAGES = "\
11 packagegroup-lxc \ 13 packagegroup-lxc \
12 packagegroup-docker \ 14 packagegroup-docker \
13 packagegroup-oci \ 15 packagegroup-oci \
16 packagegroup-cni \
17 packagegroup-netavark \
18 packagegroup-container-tools \
14 ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp ipv6', \ 19 ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp ipv6', \
15 'packagegroup-podman', '', d)} \ 20 'packagegroup-podman', '', d)} \
16 packagegroup-containerd \ 21 packagegroup-containerd \
@@ -36,8 +41,28 @@ RDEPENDS:packagegroup-podman = " \
36 podman \ 41 podman \
37" 42"
38 43
44RDEPENDS:packagegroup-cni = " \
45 cni \
46 iptables \
47 iproute2 \
48 ipset \
49 bridge-utils \
50"
51
52RDEPENDS:packagegroup-netavark = " \
53 ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'netavark aardvark-dns', '', d)} \
54"
55
56RDEPENDS:packagegroup-container-tools = " \
57 skopeo \
58 ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'conmon', '', d)} \
59 umoci \
60 ${@bb.utils.contains('VIRTUAL-RUNTIME_container_engine','podman','podman-tui nerdctl podman-compose','',d)} \
61 ${@bb.utils.contains_any('VIRTUAL-RUNTIME_container_engine','docker docker-moby','docker-compose','',d)} \
62"
63
39RDEPENDS:packagegroup-oci = " \ 64RDEPENDS:packagegroup-oci = " \
40 virtual-runc \ 65 ${VIRTUAL-RUNTIME_container_runtime} \
41 oci-systemd-hook \ 66 oci-systemd-hook \
42 oci-runtime-tools \ 67 oci-runtime-tools \
43 oci-image-tools \ 68 oci-image-tools \
@@ -45,5 +70,9 @@ RDEPENDS:packagegroup-oci = " \
45 70
46RDEPENDS:packagegroup-containerd = " \ 71RDEPENDS:packagegroup-containerd = " \
47 virtual-containerd \ 72 virtual-containerd \
73 packagegroup-cni \
74 containerd-cni \
75 nerdctl \
76 tini \
48" 77"
49 78
diff --git a/recipes-core/packagegroups/packagegroup-kubernetes.bb b/recipes-core/packagegroups/packagegroup-kubernetes.bb
index d518fc15..e06b1cb4 100644
--- a/recipes-core/packagegroups/packagegroup-kubernetes.bb
+++ b/recipes-core/packagegroups/packagegroup-kubernetes.bb
@@ -28,6 +28,7 @@ RDEPENDS:packagegroup-kubernetes-base = " \
28RDEPENDS:packagegroup-k8s-host = " \ 28RDEPENDS:packagegroup-k8s-host = " \
29 packagegroup-kubernetes-base \ 29 packagegroup-kubernetes-base \
30 kubernetes \ 30 kubernetes \
31 cri-tools \
31" 32"
32 33
33RDEPENDS:packagegroup-k8s-node = " \ 34RDEPENDS:packagegroup-k8s-node = " \
diff --git a/recipes-core/runv/runv_git.bb b/recipes-core/runv/runv_git.bb
deleted file mode 100644
index 73cd81a6..00000000
--- a/recipes-core/runv/runv_git.bb
+++ /dev/null
@@ -1,87 +0,0 @@
1HOMEPAGE = "https://github.com/hyperhq/runv"
2SUMMARY = "Hypervisor-based Runtime for OCI"
3DESCRIPTION = "Hypervisor-based Runtime for OCI"
4
5SRCREV_runv = "b360a686abc6c6e896382990ef1b93ef07c7a677"
6SRC_URI = "\
7 git://github.com/hyperhq/runv.git;nobranch=1;name=runv;protocol=https \
8 "
9
10LICENSE = "Apache-2.0"
11LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=4106a50540bdec3b9734f9c70882d382"
12
13GO_IMPORT = "import"
14
15PV = "0.4.0+git${SRCREV_runv}"
16
17inherit go
18inherit goarch
19inherit pkgconfig
20inherit autotools-brokensep
21
22# accord with qemu
23COMPATIBLE_HOST:mipsarchn32 = "null"
24COMPATIBLE_HOST:mipsarchn64 = "null"
25COMPATIBLE_HOST:riscv32 = "null"
26COMPATIBLE_HOST:powerpc = "null"
27
28PACKAGECONFIG[xen] = "--with-xen,--without-xen,"
29AUTOTOOLS_SCRIPT_PATH = "${S}/src/import/"
30
31RDEPENDS:${PN} += " qemu hyperstart"
32
33do_compile() {
34 export GOARCH="${TARGET_GOARCH}"
35 export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
36 export GOPATH="${S}/src/import:${S}/src/import/vendor"
37
38 # Pass the needed cflags/ldflags so that cgo
39 # can find the needed headers files and libraries
40 export CGO_ENABLED="1"
41 export CFLAGS=""
42 export LDFLAGS=""
43 export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
44 export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
45
46 # link fixups for compilation
47 rm -f ${S}/src/import/vendor/src
48 ln -sf ./ ${S}/src/import/vendor/src
49
50 mkdir -p ${S}/src/import/vendor/github.com/hyperhq/runv
51
52 echo fff
53 pwd
54 ln -sf src/import/cli
55 ln -sf ../../../../api ${S}/src/import/vendor/github.com/hyperhq/runv/api
56 ln -sf ../../../../cli ${S}/src/import/vendor/github.com/hyperhq/runv/cli
57 ln -sf ../../../../lib ${S}/src/import/vendor/github.com/hyperhq/runv/lib
58 ln -sf ../../../../driverloader ${S}/src/import/vendor/github.com/hyperhq/runv/driverloader
59 ln -sf ../../../../factory ${S}/src/import/vendor/github.com/hyperhq/runv/factory
60 ln -sf ../../../../hyperstart ${S}/src/import/vendor/github.com/hyperhq/runv/hyperstart
61 ln -sf ../../../../hypervisor ${S}/src/import/vendor/github.com/hyperhq/runv/hypervisor
62 ln -sf ../../../../template ${S}/src/import/vendor/github.com/hyperhq/runv/template
63
64 export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go"
65 export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go"
66
67 # Pass the needed cflags/ldflags so that cgo
68 # can find the needed headers files and libraries
69 export CGO_ENABLED="1"
70 export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
71 export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
72
73 oe_runmake build-runv
74}
75
76do_install() {
77 localbindir="/usr/local/bin"
78
79 install -d ${D}${localbindir}
80 install -m 755 ${S}/runv ${D}/${localbindir}
81}
82
83deltask compile_ptest_base
84
85FILES:${PN} += "/usr/local/bin/*"
86
87INSANE_SKIP:${PN} += "ldflags already-stripped"
diff --git a/recipes-core/runx/runx_git.bb b/recipes-core/runx/runx_git.bb
index 831360ba..618bff45 100644
--- a/recipes-core/runx/runx_git.bb
+++ b/recipes-core/runx/runx_git.bb
@@ -4,8 +4,8 @@ DESCRIPTION = "Xen Runtime for OCI"
4 4
5SRCREV_runx = "edc9350a79ede0365066c9743080e3dc6430d602" 5SRCREV_runx = "edc9350a79ede0365066c9743080e3dc6430d602"
6 6
7KERNEL_SRC_VER="linux-5.4" 7KERNEL_SRC_VER = "linux-5.4"
8KERNEL_URL_VER="v5.x" 8KERNEL_URL_VER = "v5.x"
9 9
10SRC_URI = "\ 10SRC_URI = "\
11 git://github.com/lf-edge/runx;nobranch=1;name=runx;protocol=https \ 11 git://github.com/lf-edge/runx;nobranch=1;name=runx;protocol=https \
@@ -21,7 +21,6 @@ SRC_URI[sha256sum] = "bf338980b1670bca287f9994b7441c2361907635879169c64ae78364ef
21LICENSE = "Apache-2.0" 21LICENSE = "Apache-2.0"
22LIC_FILES_CHKSUM = "file://LICENSE;md5=945fc9aa694796a6337395cc291ddd8c" 22LIC_FILES_CHKSUM = "file://LICENSE;md5=945fc9aa694796a6337395cc291ddd8c"
23 23
24S = "${WORKDIR}/git"
25PV = "v1.0-git${SRCREV_runx}" 24PV = "v1.0-git${SRCREV_runx}"
26 25
27inherit features_check 26inherit features_check
diff --git a/recipes-core/sysvinit/sysvinit-inittab_virtualization.inc b/recipes-core/sysvinit/sysvinit-inittab_virtualization.inc
index bf52da0e..5010dfd3 100644
--- a/recipes-core/sysvinit/sysvinit-inittab_virtualization.inc
+++ b/recipes-core/sysvinit/sysvinit-inittab_virtualization.inc
@@ -4,6 +4,6 @@ SRC_URI += "file://getty-wrapper"
4 4
5do_install:append() { 5do_install:append() {
6 install -d ${D}${base_sbindir} 6 install -d ${D}${base_sbindir}
7 install -m 0755 ${WORKDIR}/getty-wrapper ${D}${base_sbindir}/getty-wrapper 7 install -m 0755 ${UNPACKDIR}/getty-wrapper ${D}${base_sbindir}/getty-wrapper
8} 8}
9FILES:${PN} += "${base_sbindir}/getty-wrapper" 9FILES:${PN} += "${base_sbindir}/getty-wrapper"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-28 16:38:51 +0000