MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

core: adjust to OE-core UNPACKDIR changes

Browse Source 
Adjusting our core recipes to work with the OE core source handling.

Note: some of these recipes don't work at runtime, but this makes
them parse.

These changes are explicit S assignment removal and replacement
of WORKDIR with UNPACKDIR.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2025-06-25 22:53:19 -04:00
parent c962fc6a78
commit da1a107081
6 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-core/busybox/busybox-initrd.bb
View File

@ -22,7 +22,7 @@ SRC_URI += "file://init.cfg \
${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'file://static.cfg', '', d)} \
file://initrd.cfg"
S = "${WORKDIR}/busybox-${PV}"
S = "${UNPACKDIR}/busybox-${PV}"
# override security-flags settings, we have some warnings to ignore
SECURITY_STRINGFORMAT = ""

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

@ -12,8 +12,6 @@ RDEPENDS:${PN}-dev:append = "bash"
SKIP_RECIPE[kata-agent] ?= "kata containers are currently broken, patches accepted"
S = "${WORKDIR}/git"
inherit go
do_compile() {
@ -30,10 +28,10 @@ do_compile() {
do_install() {
mkdir -p ${D}/${bindir}/
cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-agent ${D}/${bindir}
cp ${UNPACKDIR}/git/src/${GO_IMPORT}/kata-agent ${D}/${bindir}
mkdir -p ${D}/${systemd_unitdir}/system
cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-agent.service ${D}/${systemd_unitdir}/system
cp ${UNPACKDIR}/git/src/${GO_IMPORT}/kata-agent.service ${D}/${systemd_unitdir}/system
}
deltask compile_ptest_base

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

@ -13,8 +13,6 @@ SKIP_RECIPE[kata-proxy] ?= "kata containers are currently broken, patches accept
RDEPENDS:${PN}-dev:append = "bash"
S = "${WORKDIR}/git"
inherit go
do_compile() {
@ -31,7 +29,7 @@ do_compile() {
do_install() {
mkdir -p ${D}/${libexecdir}/kata-containers
cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-proxy ${D}/${libexecdir}/kata-containers
cp ${UNPACKDIR}/git/src/${GO_IMPORT}/kata-proxy ${D}/${libexecdir}/kata-containers
}
deltask compile_ptest_base

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

@ -21,8 +21,6 @@ DEPENDS += "yq-native"
SKIP_RECIPE[kata-runtime] ?= "kata containers are currently broken, patches accepted"
S = "${WORKDIR}/git"
inherit go
do_compile() {
@ -41,10 +39,10 @@ do_compile() {
do_install() {
mkdir -p ${D}/${bindir}
cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-runtime ${D}/${bindir}
cp ${UNPACKDIR}/git/src/${GO_IMPORT}/kata-runtime ${D}/${bindir}
mkdir -p ${D}/${datadir}/defaults/kata-containers/
cp ${WORKDIR}/git/src/${GO_IMPORT}/cli/config/configuration-qemu.toml ${D}/${datadir}/defaults/kata-containers/configuration.toml
cp ${UNPACKDIR}/git/src/${GO_IMPORT}/cli/config/configuration-qemu.toml ${D}/${datadir}/defaults/kata-containers/configuration.toml
sed -e 's|/usr/bin/qemu-lite-system-x86_64|/usr/bin/qemu-system-x86_64|' -i ${D}/${datadir}/defaults/kata-containers/configuration.toml
sed -e 's|/usr/share/kata-containers/vmlinuz.container|/var/lib/hyper/kernel|' -i ${D}/${datadir}/defaults/kata-containers/configuration.toml

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

@ -12,8 +12,6 @@ SKIP_RECIPE[kata-shim] ?= "kata containers are currently broken, patches accepte
RDEPENDS:${PN}-dev:append = "bash"
S = "${WORKDIR}/git"
inherit go
do_compile() {
@ -30,7 +28,7 @@ do_compile() {
do_install() {
mkdir -p ${D}/${libexecdir}/kata-containers
cp ${WORKDIR}/git/src/${GO_IMPORT}/kata-shim ${D}/${libexecdir}/kata-containers
cp ${UNPACKDIR}/git/src/${GO_IMPORT}/kata-shim ${D}/${libexecdir}/kata-containers
}
deltask compile_ptest_base

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

@ -21,7 +21,6 @@ SRC_URI[sha256sum] = "bf338980b1670bca287f9994b7441c2361907635879169c64ae78364ef
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=945fc9aa694796a6337395cc291ddd8c"
S = "${WORKDIR}/git"
PV = "v1.0-git${SRCREV_runx}"
inherit features_check