diff options
author | Petter Mabäcker <petter@technux.se> | 2015-01-06 22:29:04 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-23 11:36:27 +0000 |
commit | 4eb3db9a2ca8eaff64b64b8f56dac25d4734571c (patch) | |
tree | 000a810f0f115a87e20469d144f93ac08f30c8c1 /meta/recipes-bsp | |
parent | 00fbca6950505446748580fe58bd64ab673d5cc9 (diff) | |
download | poky-4eb3db9a2ca8eaff64b64b8f56dac25d4734571c.tar.gz |
meta: set proper S value
After removal of auto-creating S we must ensure that all recipes are
using a proper value for S.
Fix all recipes that only need to set S equals to WORKDIR.
[YOCTO #5627]
(From OE-Core rev: 9d220b1bfe4589736604dd5a7129e3699377d830)
Signed-off-by: Petter Mabäcker <petter@technux.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r-- | meta/recipes-bsp/alsa-state/alsa-state.bb | 2 | ||||
-rw-r--r-- | meta/recipes-bsp/hostap/hostap-conf_1.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-bsp/keymaps/keymaps_1.0.bb | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb index 17c2d002d5..d0f7bb3305 100644 --- a/meta/recipes-bsp/alsa-state/alsa-state.bb +++ b/meta/recipes-bsp/alsa-state/alsa-state.bb | |||
@@ -18,6 +18,8 @@ SRC_URI = "\ | |||
18 | file://alsa-state-init \ | 18 | file://alsa-state-init \ |
19 | " | 19 | " |
20 | 20 | ||
21 | S = "${WORKDIR}" | ||
22 | |||
21 | # As the recipe doesn't inherit systemd.bbclass, we need to set this variable | 23 | # As the recipe doesn't inherit systemd.bbclass, we need to set this variable |
22 | # manually to avoid unnecessary postinst/preinst generated. | 24 | # manually to avoid unnecessary postinst/preinst generated. |
23 | python __anonymous() { | 25 | python __anonymous() { |
diff --git a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb index e2c7cc0344..e1d4c5477c 100644 --- a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb +++ b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb | |||
@@ -10,6 +10,8 @@ SRC_URI = "file://hostap_cs.modalias \ | |||
10 | 10 | ||
11 | inherit allarch | 11 | inherit allarch |
12 | 12 | ||
13 | S = "${WORKDIR}" | ||
14 | |||
13 | do_compile() { | 15 | do_compile() { |
14 | } | 16 | } |
15 | 17 | ||
diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb index 925161b5d2..5793a76529 100644 --- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb +++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb | |||
@@ -26,6 +26,8 @@ SRC_URI = "file://keymap.sh \ | |||
26 | INITSCRIPT_NAME = "keymap.sh" | 26 | INITSCRIPT_NAME = "keymap.sh" |
27 | INITSCRIPT_PARAMS = "start 01 S ." | 27 | INITSCRIPT_PARAMS = "start 01 S ." |
28 | 28 | ||
29 | S = "${WORKDIR}" | ||
30 | |||
29 | do_install () { | 31 | do_install () { |
30 | # Only install the script if 'sysvinit' is in DISTRO_FEATURES | 32 | # Only install the script if 'sysvinit' is in DISTRO_FEATURES |
31 | # THe ulitity this script provides could be achieved by systemd-vconsole-setup.service | 33 | # THe ulitity this script provides could be achieved by systemd-vconsole-setup.service |