diff options
| author | Alexander Kanavin <alex@linutronix.de> | 2025-06-16 11:49:56 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-06-20 12:07:26 +0100 |
| commit | efb0410d388cb389a18e299b87fdb3554d527b39 (patch) | |
| tree | 0ba990254e449a421ab7ec56c3409c69e9100d24 /meta/recipes-core | |
| parent | e1f059f34e7f1e6a252aff1ec5b1eb3376bd4d65 (diff) | |
| download | poky-efb0410d388cb389a18e299b87fdb3554d527b39.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-core')
24 files changed, 24 insertions, 48 deletions
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index 59b084d141..3f01bb35d9 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb | |||
| @@ -25,8 +25,7 @@ SRC_URI = "file://rotation \ | |||
| 25 | file://licenses/GPL-2 \ | 25 | file://licenses/GPL-2 \ |
| 26 | " | 26 | " |
| 27 | 27 | ||
| 28 | S = "${WORKDIR}/sources" | 28 | S = "${UNPACKDIR}" |
| 29 | UNPACKDIR = "${S}" | ||
| 30 | 29 | ||
| 31 | INHIBIT_DEFAULT_DEPS = "1" | 30 | INHIBIT_DEFAULT_DEPS = "1" |
| 32 | 31 | ||
diff --git a/meta/recipes-core/busybox/busybox-inittab_1.37.0.bb b/meta/recipes-core/busybox/busybox-inittab_1.37.0.bb index 4ffc44c808..3bdec248de 100644 --- a/meta/recipes-core/busybox/busybox-inittab_1.37.0.bb +++ b/meta/recipes-core/busybox/busybox-inittab_1.37.0.bb | |||
| @@ -4,8 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;m | |||
| 4 | 4 | ||
| 5 | SRC_URI = "file://inittab" | 5 | SRC_URI = "file://inittab" |
| 6 | 6 | ||
| 7 | S = "${WORKDIR}/sources" | 7 | S = "${UNPACKDIR}" |
| 8 | UNPACKDIR = "${S}" | ||
| 9 | 8 | ||
| 10 | INHIBIT_DEFAULT_DEPS = "1" | 9 | INHIBIT_DEFAULT_DEPS = "1" |
| 11 | 10 | ||
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb index ddf9d1b311..da594d00b7 100644 --- a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb +++ b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb | |||
| @@ -15,8 +15,7 @@ SRC_URI = "file://copyright \ | |||
| 15 | file://interfaces \ | 15 | file://interfaces \ |
| 16 | file://nfsroot" | 16 | file://nfsroot" |
| 17 | 17 | ||
| 18 | S = "${WORKDIR}/sources" | 18 | S = "${UNPACKDIR}" |
| 19 | UNPACKDIR = "${S}" | ||
| 20 | 19 | ||
| 21 | do_install () { | 20 | do_install () { |
| 22 | install -d ${D}${sysconfdir}/init.d \ | 21 | install -d ${D}${sysconfdir}/init.d \ |
diff --git a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb index ec3544c67a..e0a6319ccf 100644 --- a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb | |||
| @@ -3,8 +3,7 @@ LICENSE = "MIT" | |||
| 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
| 4 | SRC_URI = "file://init-boot.sh" | 4 | SRC_URI = "file://init-boot.sh" |
| 5 | 5 | ||
| 6 | S = "${WORKDIR}/sources" | 6 | S = "${UNPACKDIR}" |
| 7 | UNPACKDIR = "${S}" | ||
| 8 | 7 | ||
| 9 | do_install() { | 8 | do_install() { |
| 10 | install -m 0755 ${S}/init-boot.sh ${D}/init | 9 | install -m 0755 ${S}/init-boot.sh ${D}/init |
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index bb4984366d..a3e4e2a7e9 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | |||
| @@ -20,8 +20,7 @@ SRC_URI = "file://init \ | |||
| 20 | file://overlayroot \ | 20 | file://overlayroot \ |
| 21 | " | 21 | " |
| 22 | 22 | ||
| 23 | S = "${WORKDIR}/sources" | 23 | S = "${UNPACKDIR}" |
| 24 | UNPACKDIR = "${S}" | ||
| 25 | 24 | ||
| 26 | do_install() { | 25 | do_install() { |
| 27 | install -d ${D}/init.d | 26 | install -d ${D}/init.d |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb index 40046f30a7..6b99ab1843 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb | |||
| @@ -5,8 +5,7 @@ DEPENDS = "virtual/kernel" | |||
| 5 | RDEPENDS:${PN} = "busybox-mdev" | 5 | RDEPENDS:${PN} = "busybox-mdev" |
| 6 | SRC_URI = "file://init-live.sh" | 6 | SRC_URI = "file://init-live.sh" |
| 7 | 7 | ||
| 8 | S = "${WORKDIR}/sources" | 8 | S = "${UNPACKDIR}" |
| 9 | UNPACKDIR = "${S}" | ||
| 10 | 9 | ||
| 11 | do_install() { | 10 | do_install() { |
| 12 | install -m 0755 ${S}/init-live.sh ${D}/init | 11 | install -m 0755 ${S}/init-live.sh ${D}/init |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb index 7851cc9605..8c8355a53e 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb | |||
| @@ -5,8 +5,7 @@ DEPENDS = "virtual/kernel" | |||
| 5 | RDEPENDS:${PN} = "udev udev-extraconf" | 5 | RDEPENDS:${PN} = "udev udev-extraconf" |
| 6 | SRC_URI = "file://init-live.sh" | 6 | SRC_URI = "file://init-live.sh" |
| 7 | 7 | ||
| 8 | S = "${WORKDIR}/sources" | 8 | S = "${UNPACKDIR}" |
| 9 | UNPACKDIR = "${S}" | ||
| 10 | 9 | ||
| 11 | do_install() { | 10 | do_install() { |
| 12 | install -m 0755 ${S}/init-live.sh ${D}/init | 11 | install -m 0755 ${S}/init-live.sh ${D}/init |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb index 31291bcdf2..e308727320 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb | |||
| @@ -5,8 +5,7 @@ SRC_URI = "file://init-install-efi-testfs.sh" | |||
| 5 | 5 | ||
| 6 | RDEPENDS:${PN} = "parted e2fsprogs-mke2fs dosfstools" | 6 | RDEPENDS:${PN} = "parted e2fsprogs-mke2fs dosfstools" |
| 7 | 7 | ||
| 8 | S = "${WORKDIR}/sources" | 8 | S = "${UNPACKDIR}" |
| 9 | UNPACKDIR = "${S}" | ||
| 10 | 9 | ||
| 11 | do_install() { | 10 | do_install() { |
| 12 | install -m 0755 ${S}/init-install-efi-testfs.sh ${D}/install-efi.sh | 11 | install -m 0755 ${S}/init-install-efi-testfs.sh ${D}/install-efi.sh |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb index ff3b5622db..77462f4425 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb | |||
| @@ -6,8 +6,7 @@ SRC_URI = "file://init-install-efi.sh" | |||
| 6 | RDEPENDS:${PN} = "parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" | 6 | RDEPENDS:${PN} = "parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" |
| 7 | RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | 7 | RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" |
| 8 | 8 | ||
| 9 | S = "${WORKDIR}/sources" | 9 | S = "${UNPACKDIR}" |
| 10 | UNPACKDIR = "${S}" | ||
| 11 | 10 | ||
| 12 | do_install() { | 11 | do_install() { |
| 13 | install -m 0755 ${S}/init-install-efi.sh ${D}/install-efi.sh | 12 | install -m 0755 ${S}/init-install-efi.sh ${D}/install-efi.sh |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb index 19f05f9fec..05f92203cd 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb | |||
| @@ -5,8 +5,7 @@ SRC_URI = "file://init-install-testfs.sh" | |||
| 5 | 5 | ||
| 6 | RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs" | 6 | RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs" |
| 7 | 7 | ||
| 8 | S = "${WORKDIR}/sources" | 8 | S = "${UNPACKDIR}" |
| 9 | UNPACKDIR = "${S}" | ||
| 10 | 9 | ||
| 11 | do_install() { | 10 | do_install() { |
| 12 | install -m 0755 ${S}/init-install-testfs.sh ${D}/install.sh | 11 | install -m 0755 ${S}/init-install-testfs.sh ${D}/install.sh |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb index 1d489e2b64..791bd57171 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb | |||
| @@ -3,8 +3,7 @@ LICENSE = "MIT" | |||
| 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
| 4 | SRC_URI = "file://init-install.sh" | 4 | SRC_URI = "file://init-install.sh" |
| 5 | 5 | ||
| 6 | S = "${WORKDIR}/sources" | 6 | S = "${UNPACKDIR}" |
| 7 | UNPACKDIR = "${S}" | ||
| 8 | 7 | ||
| 9 | RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" | 8 | RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" |
| 10 | RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | 9 | RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb index bb3f275f26..0115741f4c 100644 --- a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb | |||
| @@ -7,8 +7,7 @@ RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | |||
| 7 | 7 | ||
| 8 | SRC_URI = "file://init-install-efi.sh" | 8 | SRC_URI = "file://init-install-efi.sh" |
| 9 | 9 | ||
| 10 | S = "${WORKDIR}/sources" | 10 | S = "${UNPACKDIR}" |
| 11 | UNPACKDIR = "${S}" | ||
| 12 | 11 | ||
| 13 | do_install() { | 12 | do_install() { |
| 14 | install -d ${D}/init.d | 13 | install -d ${D}/init.d |
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb index d6d8348731..96fd8310d2 100644 --- a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb | |||
| @@ -12,8 +12,7 @@ COMPATIBLE_HOST:armv7ve = 'null' | |||
| 12 | 12 | ||
| 13 | SRC_URI = "file://init-install.sh" | 13 | SRC_URI = "file://init-install.sh" |
| 14 | 14 | ||
| 15 | S = "${WORKDIR}/sources" | 15 | S = "${UNPACKDIR}" |
| 16 | UNPACKDIR = "${S}" | ||
| 17 | 16 | ||
| 18 | do_install() { | 17 | do_install() { |
| 19 | install -d ${D}/init.d | 18 | install -d ${D}/init.d |
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb index 4d9ef79a63..c2ab107980 100644 --- a/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb | |||
| @@ -9,8 +9,7 @@ inherit allarch | |||
| 9 | FILESEXTRAPATHS:prepend := "${THISDIR}/initramfs-framework:" | 9 | FILESEXTRAPATHS:prepend := "${THISDIR}/initramfs-framework:" |
| 10 | SRC_URI = "file://setup-live" | 10 | SRC_URI = "file://setup-live" |
| 11 | 11 | ||
| 12 | S = "${WORKDIR}/sources" | 12 | S = "${UNPACKDIR}" |
| 13 | UNPACKDIR = "${S}" | ||
| 14 | 13 | ||
| 15 | do_install() { | 14 | do_install() { |
| 16 | install -d ${D}/init.d | 15 | install -d ${D}/init.d |
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 0bc078c5eb..c984257c5c 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb | |||
| @@ -35,8 +35,7 @@ SRC_URI = "file://functions \ | |||
| 35 | ${@bb.utils.contains('DISTRO_FEATURES','selinux','file://sushell','',d)} \ | 35 | ${@bb.utils.contains('DISTRO_FEATURES','selinux','file://sushell','',d)} \ |
| 36 | " | 36 | " |
| 37 | 37 | ||
| 38 | S = "${WORKDIR}/sources" | 38 | S = "${UNPACKDIR}" |
| 39 | UNPACKDIR = "${S}" | ||
| 40 | 39 | ||
| 41 | SRC_URI:append:arm = " file://alignment.sh" | 40 | SRC_URI:append:arm = " file://alignment.sh" |
| 42 | SRC_URI:append:armeb = " file://alignment.sh" | 41 | SRC_URI:append:armeb = " file://alignment.sh" |
diff --git a/meta/recipes-core/musl/bsd-headers.bb b/meta/recipes-core/musl/bsd-headers.bb index 7d0bdee870..ad9ba81e4f 100644 --- a/meta/recipes-core/musl/bsd-headers.bb +++ b/meta/recipes-core/musl/bsd-headers.bb | |||
| @@ -15,8 +15,7 @@ do_compile[noexec] = "1" | |||
| 15 | 15 | ||
| 16 | INHIBIT_DEFAULT_DEPS = "1" | 16 | INHIBIT_DEFAULT_DEPS = "1" |
| 17 | 17 | ||
| 18 | S = "${WORKDIR}/sources" | 18 | S = "${UNPACKDIR}" |
| 19 | UNPACKDIR = "${S}" | ||
| 20 | 19 | ||
| 21 | do_install() { | 20 | do_install() { |
| 22 | install -Dm 0644 ${S}/sys-queue.h ${D}${includedir}/sys/queue.h | 21 | install -Dm 0644 ${S}/sys-queue.h ${D}${includedir}/sys/queue.h |
diff --git a/meta/recipes-core/musl/libssp-nonshared.bb b/meta/recipes-core/musl/libssp-nonshared.bb index fde3bc97b4..4bcbaef7ea 100644 --- a/meta/recipes-core/musl/libssp-nonshared.bb +++ b/meta/recipes-core/musl/libssp-nonshared.bb | |||
| @@ -17,8 +17,7 @@ DEPENDS = "virtual/cross-binutils \ | |||
| 17 | 17 | ||
| 18 | do_configure[noexec] = "1" | 18 | do_configure[noexec] = "1" |
| 19 | 19 | ||
| 20 | S = "${WORKDIR}/sources" | 20 | S = "${UNPACKDIR}" |
| 21 | UNPACKDIR = "${S}" | ||
| 22 | 21 | ||
| 23 | do_compile() { | 22 | do_compile() { |
| 24 | ${CC} ${CPPFLAGS} ${CFLAGS} -fPIE -c stack_chk.c -o stack_chk.o | 23 | ${CC} ${CPPFLAGS} ${CFLAGS} -fPIE -c stack_chk.c -o stack_chk.o |
diff --git a/meta/recipes-core/musl/musl-legacy-error.bb b/meta/recipes-core/musl/musl-legacy-error.bb index 11a838a6e8..b40075c0b6 100644 --- a/meta/recipes-core/musl/musl-legacy-error.bb +++ b/meta/recipes-core/musl/musl-legacy-error.bb | |||
| @@ -13,8 +13,7 @@ do_compile[noexec] = "1" | |||
| 13 | 13 | ||
| 14 | INHIBIT_DEFAULT_DEPS = "1" | 14 | INHIBIT_DEFAULT_DEPS = "1" |
| 15 | 15 | ||
| 16 | S = "${WORKDIR}/sources" | 16 | S = "${UNPACKDIR}" |
| 17 | UNPACKDIR = "${S}" | ||
| 18 | 17 | ||
| 19 | do_install() { | 18 | do_install() { |
| 20 | install -Dm 0644 ${S}/error.h -t ${D}${includedir} | 19 | install -Dm 0644 ${S}/error.h -t ${D}${includedir} |
diff --git a/meta/recipes-core/systemd/systemd-bootconf_1.00.bb b/meta/recipes-core/systemd/systemd-bootconf_1.00.bb index 0ec49365d0..5efac3e410 100644 --- a/meta/recipes-core/systemd/systemd-bootconf_1.00.bb +++ b/meta/recipes-core/systemd/systemd-bootconf_1.00.bb | |||
| @@ -7,8 +7,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
| 7 | 7 | ||
| 8 | inherit systemd-boot-cfg | 8 | inherit systemd-boot-cfg |
| 9 | 9 | ||
| 10 | S = "${WORKDIR}/sources" | 10 | S = "${UNPACKDIR}" |
| 11 | UNPACKDIR = "${S}" | ||
| 12 | 11 | ||
| 13 | LABELS = "boot" | 12 | LABELS = "boot" |
| 14 | 13 | ||
diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb index 3325739544..187f0d4626 100644 --- a/meta/recipes-core/systemd/systemd-compat-units.bb +++ b/meta/recipes-core/systemd/systemd-compat-units.bb | |||
| @@ -5,8 +5,7 @@ LICENSE = "MIT" | |||
| 5 | 5 | ||
| 6 | PACKAGE_WRITE_DEPS += "systemd-systemctl-native" | 6 | PACKAGE_WRITE_DEPS += "systemd-systemctl-native" |
| 7 | 7 | ||
| 8 | S = "${WORKDIR}/sources" | 8 | S = "${UNPACKDIR}" |
| 9 | UNPACKDIR = "${S}" | ||
| 10 | 9 | ||
| 11 | inherit features_check | 10 | inherit features_check |
| 12 | 11 | ||
diff --git a/meta/recipes-core/systemd/systemd-conf_1.0.bb b/meta/recipes-core/systemd/systemd-conf_1.0.bb index b8bea0c25b..60066cd60a 100644 --- a/meta/recipes-core/systemd/systemd-conf_1.0.bb +++ b/meta/recipes-core/systemd/systemd-conf_1.0.bb | |||
| @@ -21,8 +21,7 @@ SRC_URI = "\ | |||
| 21 | file://wired.network \ | 21 | file://wired.network \ |
| 22 | " | 22 | " |
| 23 | 23 | ||
| 24 | S = "${WORKDIR}/sources" | 24 | S = "${UNPACKDIR}" |
| 25 | UNPACKDIR = "${S}" | ||
| 26 | 25 | ||
| 27 | do_install() { | 26 | do_install() { |
| 28 | install -D -m0644 ${S}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf | 27 | install -D -m0644 ${S}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf |
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index 6ff2ca1bf4..748e5e6d06 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | |||
| @@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;m | |||
| 6 | SRC_URI = "file://inittab \ | 6 | SRC_URI = "file://inittab \ |
| 7 | file://start_getty" | 7 | file://start_getty" |
| 8 | 8 | ||
| 9 | S = "${WORKDIR}/sources" | 9 | S = "${UNPACKDIR}" |
| 10 | UNPACKDIR = "${S}" | ||
| 11 | 10 | ||
| 12 | INHIBIT_DEFAULT_DEPS = "1" | 11 | INHIBIT_DEFAULT_DEPS = "1" |
| 13 | 12 | ||
diff --git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/meta/recipes-core/udev/udev-extraconf_1.1.bb index 0d7e4f4f36..2ba6606c05 100644 --- a/meta/recipes-core/udev/udev-extraconf_1.1.bb +++ b/meta/recipes-core/udev/udev-extraconf_1.1.bb | |||
| @@ -13,8 +13,7 @@ SRC_URI = " \ | |||
| 13 | file://localextra.rules \ | 13 | file://localextra.rules \ |
| 14 | " | 14 | " |
| 15 | 15 | ||
| 16 | S = "${WORKDIR}/sources" | 16 | S = "${UNPACKDIR}" |
| 17 | UNPACKDIR = "${S}" | ||
| 18 | 17 | ||
| 19 | MOUNT_BASE = "/run/media" | 18 | MOUNT_BASE = "/run/media" |
| 20 | MOUNT_GROUP ?= "disk" | 19 | MOUNT_GROUP ?= "disk" |
diff --git a/meta/recipes-core/volatile-binds/volatile-binds.bb b/meta/recipes-core/volatile-binds/volatile-binds.bb index 3597ec7356..857bcc93ff 100644 --- a/meta/recipes-core/volatile-binds/volatile-binds.bb +++ b/meta/recipes-core/volatile-binds/volatile-binds.bb | |||
| @@ -9,8 +9,7 @@ SRC_URI = "\ | |||
| 9 | file://volatile-binds.service.in \ | 9 | file://volatile-binds.service.in \ |
| 10 | " | 10 | " |
| 11 | 11 | ||
| 12 | S = "${WORKDIR}/sources" | 12 | S = "${UNPACKDIR}" |
| 13 | UNPACKDIR = "${S}" | ||
| 14 | 13 | ||
| 15 | inherit allarch systemd features_check | 14 | inherit allarch systemd features_check |
| 16 | 15 | ||
