1
0
mirror of https://git.yoctoproject.org/poky synced 2026-07-15 15:37:03 +00:00

meta: set S from UNPACKDIR in recipes that use only local files

There is no need to have two assignments; also setting S from
UNPACKDIR (and not vice versa) is more logical as unpack
task comes first, and tasks that come after unpack use S to access
unpack results.

Also adjust reference test data in selftest/recipeutils to reflect changes in test recipes.

(From OE-Core rev: f64b7e5fb3181734c8dde87b27e872a026261a74)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2025-06-16 11:49:56 +02:00
committed by Richard Purdie
parent e1f059f34e
commit efb0410d38
86 changed files with 87 additions and 172 deletions
@@ -3,8 +3,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = "file://init-boot.sh"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
S = "${UNPACKDIR}"
do_install() {
install -m 0755 ${S}/init-boot.sh ${D}/init
@@ -20,8 +20,7 @@ SRC_URI = "file://init \
file://overlayroot \
"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
S = "${UNPACKDIR}"
do_install() {
install -d ${D}/init.d
@@ -5,8 +5,7 @@ DEPENDS = "virtual/kernel"
RDEPENDS:${PN} = "busybox-mdev"
SRC_URI = "file://init-live.sh"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
S = "${UNPACKDIR}"
do_install() {
install -m 0755 ${S}/init-live.sh ${D}/init
@@ -5,8 +5,7 @@ DEPENDS = "virtual/kernel"
RDEPENDS:${PN} = "udev udev-extraconf"
SRC_URI = "file://init-live.sh"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
S = "${UNPACKDIR}"
do_install() {
install -m 0755 ${S}/init-live.sh ${D}/init
@@ -5,8 +5,7 @@ SRC_URI = "file://init-install-efi-testfs.sh"
RDEPENDS:${PN} = "parted e2fsprogs-mke2fs dosfstools"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
S = "${UNPACKDIR}"
do_install() {
install -m 0755 ${S}/init-install-efi-testfs.sh ${D}/install-efi.sh
@@ -6,8 +6,7 @@ SRC_URI = "file://init-install-efi.sh"
RDEPENDS:${PN} = "parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}"
RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
S = "${UNPACKDIR}"
do_install() {
install -m 0755 ${S}/init-install-efi.sh ${D}/install-efi.sh
@@ -5,8 +5,7 @@ SRC_URI = "file://init-install-testfs.sh"
RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
S = "${UNPACKDIR}"
do_install() {
install -m 0755 ${S}/init-install-testfs.sh ${D}/install.sh
@@ -3,8 +3,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = "file://init-install.sh"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
S = "${UNPACKDIR}"
RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}"
RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}"
@@ -7,8 +7,7 @@ RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}"
SRC_URI = "file://init-install-efi.sh"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
S = "${UNPACKDIR}"
do_install() {
install -d ${D}/init.d
@@ -12,8 +12,7 @@ COMPATIBLE_HOST:armv7ve = 'null'
SRC_URI = "file://init-install.sh"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
S = "${UNPACKDIR}"
do_install() {
install -d ${D}/init.d
@@ -9,8 +9,7 @@ inherit allarch
FILESEXTRAPATHS:prepend := "${THISDIR}/initramfs-framework:"
SRC_URI = "file://setup-live"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
S = "${UNPACKDIR}"
do_install() {
install -d ${D}/init.d