aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Carlos Santos <unixmania@gmail.com>2020-03-24 21:30:53 -0300
committerGravatar Peter Korsgaard <peter@korsgaard.com>2020-04-07 18:56:35 +0200
commitc8fc35b6d7ed44422a04db0c24e34931bce35c41 (patch)
tree24aaa562ea5d4f7e96783f380fc8316080852dce
parentb7b4788b66f2c105e339d74c37c74e8a8da07d76 (diff)
downloadbuildroot-c8fc35b6d7ed44422a04db0c24e34931bce35c41.tar.gz
buildroot-c8fc35b6d7ed44422a04db0c24e34931bce35c41.tar.bz2
package/busybox: fix target-finalize hook
It was searching for CONFIG_ASH=y and CONFIG_HUSH=y at $(@D)/.config, which does not contain the package build path at the target-finalize step. Use $(BUSYBOX_DIR), instead. Signed-off-by: Carlos Santos <unixmania@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit 9ab1d565eef8935694d12bff2cd33c64b7a97f0f) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/busybox/busybox.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index dfcd9d392c..b9d82ed71e 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -318,11 +318,11 @@ endef
# Add /bin/{a,hu}sh to /etc/shells otherwise some login tools like dropbear
# can reject the user connection. See man shells.
define BUSYBOX_INSTALL_ADD_TO_SHELLS
- if grep -q CONFIG_ASH=y $(@D)/.config; then \
+ if grep -q CONFIG_ASH=y $(BUSYBOX_DIR)/.config; then \
grep -qsE '^/bin/ash$$' $(TARGET_DIR)/etc/shells \
|| echo "/bin/ash" >> $(TARGET_DIR)/etc/shells; \
fi
- if grep -q CONFIG_HUSH=y $(@D)/.config; then \
+ if grep -q CONFIG_HUSH=y $(BUSYBOX_DIR)/.config; then \
grep -qsE '^/bin/hush$$' $(TARGET_DIR)/etc/shells \
|| echo "/bin/hush" >> $(TARGET_DIR)/etc/shells; \
fi