Skip to content

Commit

Permalink
package/busybox: fix target-finalize hook
Browse files Browse the repository at this point in the history
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 9ab1d56)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  • Loading branch information
casantos authored and jacmet committed Apr 7, 2020
1 parent 73e918e commit e11ad9e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions package/busybox/busybox.mk
Expand Up @@ -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
Expand Down

0 comments on commit e11ad9e

Please sign in to comment.