diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-25 17:01:30 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-26 15:43:43 +0100 |
commit | c5312dd92bd9fd88948567938a0f3b66782ae869 (patch) | |
tree | 6fafaa4c430beb023cb75344ec9a3293a2f90392 /meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | |
parent | 39b85616adc434fc12aaa260268cebf3b4d9395f (diff) | |
download | poky-c5312dd92bd9fd88948567938a0f3b66782ae869.tar.gz |
recipes: Avoid S = WORKDIR
Where recipes use S = ${WORKDIR}, change them to set UNPACKDIR to
a subdir of WORKDIR and make S point at this instead.
Where WORKDIR is referenced in do_compile/do_install and similar, switch
to using ${S} which conceptually makes more sense.
(From OE-Core rev: d0c1ae3ffacacc762f957b9b306dfb0a912c4859)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb')
-rw-r--r-- | meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 39ea51ccbd..bb4984366d 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | |||
@@ -20,37 +20,38 @@ SRC_URI = "file://init \ | |||
20 | file://overlayroot \ | 20 | file://overlayroot \ |
21 | " | 21 | " |
22 | 22 | ||
23 | S = "${WORKDIR}" | 23 | S = "${WORKDIR}/sources" |
24 | UNPACKDIR = "${S}" | ||
24 | 25 | ||
25 | do_install() { | 26 | do_install() { |
26 | install -d ${D}/init.d | 27 | install -d ${D}/init.d |
27 | 28 | ||
28 | # base | 29 | # base |
29 | install -m 0755 ${WORKDIR}/init ${D}/init | 30 | install -m 0755 ${S}/init ${D}/init |
30 | install -m 0755 ${WORKDIR}/nfsrootfs ${D}/init.d/85-nfsrootfs | 31 | install -m 0755 ${S}/nfsrootfs ${D}/init.d/85-nfsrootfs |
31 | install -m 0755 ${WORKDIR}/rootfs ${D}/init.d/90-rootfs | 32 | install -m 0755 ${S}/rootfs ${D}/init.d/90-rootfs |
32 | install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish | 33 | install -m 0755 ${S}/finish ${D}/init.d/99-finish |
33 | 34 | ||
34 | # exec | 35 | # exec |
35 | install -m 0755 ${WORKDIR}/exec ${D}/init.d/89-exec | 36 | install -m 0755 ${S}/exec ${D}/init.d/89-exec |
36 | 37 | ||
37 | # mdev | 38 | # mdev |
38 | install -m 0755 ${WORKDIR}/mdev ${D}/init.d/01-mdev | 39 | install -m 0755 ${S}/mdev ${D}/init.d/01-mdev |
39 | 40 | ||
40 | # udev | 41 | # udev |
41 | install -m 0755 ${WORKDIR}/udev ${D}/init.d/01-udev | 42 | install -m 0755 ${S}/udev ${D}/init.d/01-udev |
42 | 43 | ||
43 | # e2fs | 44 | # e2fs |
44 | install -m 0755 ${WORKDIR}/e2fs ${D}/init.d/10-e2fs | 45 | install -m 0755 ${S}/e2fs ${D}/init.d/10-e2fs |
45 | 46 | ||
46 | # debug | 47 | # debug |
47 | install -m 0755 ${WORKDIR}/debug ${D}/init.d/00-debug | 48 | install -m 0755 ${S}/debug ${D}/init.d/00-debug |
48 | 49 | ||
49 | # lvm | 50 | # lvm |
50 | install -m 0755 ${WORKDIR}/lvm ${D}/init.d/09-lvm | 51 | install -m 0755 ${S}/lvm ${D}/init.d/09-lvm |
51 | 52 | ||
52 | # overlayroot needs to run after rootfs module but before finish | 53 | # overlayroot needs to run after rootfs module but before finish |
53 | install -m 0755 ${WORKDIR}/overlayroot ${D}/init.d/91-overlayroot | 54 | install -m 0755 ${S}/overlayroot ${D}/init.d/91-overlayroot |
54 | 55 | ||
55 | # Create device nodes expected by some kernels in initramfs | 56 | # Create device nodes expected by some kernels in initramfs |
56 | # before even executing /init. | 57 | # before even executing /init. |