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-bsp/keymaps/keymaps_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-bsp/keymaps/keymaps_1.0.bb')
-rw-r--r-- | meta/recipes-bsp/keymaps/keymaps_1.0.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb index 3d5d127820..0425197c98 100644 --- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb +++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb | |||
@@ -24,14 +24,15 @@ SRC_URI = "file://keymap.sh" | |||
24 | INITSCRIPT_NAME = "keymap.sh" | 24 | INITSCRIPT_NAME = "keymap.sh" |
25 | INITSCRIPT_PARAMS = "start 01 S ." | 25 | INITSCRIPT_PARAMS = "start 01 S ." |
26 | 26 | ||
27 | S = "${WORKDIR}" | 27 | S = "${WORKDIR}/sources" |
28 | UNPACKDIR = "${S}" | ||
28 | 29 | ||
29 | do_install () { | 30 | do_install () { |
30 | # Only install the script if 'sysvinit' is in DISTRO_FEATURES | 31 | # Only install the script if 'sysvinit' is in DISTRO_FEATURES |
31 | # THe ulitity this script provides could be achieved by systemd-vconsole-setup.service | 32 | # THe ulitity this script provides could be achieved by systemd-vconsole-setup.service |
32 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 33 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
33 | install -d ${D}${sysconfdir}/init.d/ | 34 | install -d ${D}${sysconfdir}/init.d/ |
34 | install -m 0755 ${WORKDIR}/keymap.sh ${D}${sysconfdir}/init.d/ | 35 | install -m 0755 ${S}/keymap.sh ${D}${sysconfdir}/init.d/ |
35 | fi | 36 | fi |
36 | } | 37 | } |
37 | 38 | ||