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/sysvinit/sysvinit-inittab_2.88dsf.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/sysvinit/sysvinit-inittab_2.88dsf.bb')
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index 6bbe517df1..6ff2ca1bf4 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | |||
@@ -6,7 +6,8 @@ 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}" | 9 | S = "${WORKDIR}/sources" |
10 | UNPACKDIR = "${S}" | ||
10 | 11 | ||
11 | INHIBIT_DEFAULT_DEPS = "1" | 12 | INHIBIT_DEFAULT_DEPS = "1" |
12 | 13 | ||
@@ -16,9 +17,9 @@ do_compile() { | |||
16 | 17 | ||
17 | do_install() { | 18 | do_install() { |
18 | install -d ${D}${sysconfdir} | 19 | install -d ${D}${sysconfdir} |
19 | install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab | 20 | install -m 0644 ${S}/inittab ${D}${sysconfdir}/inittab |
20 | install -d ${D}${base_bindir} | 21 | install -d ${D}${base_bindir} |
21 | install -m 0755 ${WORKDIR}/start_getty ${D}${base_bindir}/start_getty | 22 | install -m 0755 ${S}/start_getty ${D}${base_bindir}/start_getty |
22 | sed -e 's,/usr/bin,${bindir},g' -i ${D}${base_bindir}/start_getty | 23 | sed -e 's,/usr/bin,${bindir},g' -i ${D}${base_bindir}/start_getty |
23 | 24 | ||
24 | CONSOLES="${SERIAL_CONSOLES}" | 25 | CONSOLES="${SERIAL_CONSOLES}" |