summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRomain Naour <romain.naour@smile.fr>2018-01-19 10:15:09 (GMT)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-05-03 21:15:07 (GMT)
commit311c9eebc4dcfb764e3a7082706daf68e0603188 (patch)
tree35080e825fd9c10931c3b218d15881b0049c38c4
parent849d748ae61badfbead9630454a6c1c93ee81bb8 (diff)
downloadbuildroot-311c9eebc4dcfb764e3a7082706daf68e0603188.tar.gz
buildroot-311c9eebc4dcfb764e3a7082706daf68e0603188.tar.bz2
package/bash: use target finalize hook
Arnout reported an issue with the upcoming top-level parallel build. The file /etc/shells can be modified by several packages (shell providers) Signed-off-by: Romain Naour <romain.naour@smile.fr> Cc: Arnout Vandecappelle <arnout@mind.be> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/bash/bash.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index 2182bed..bb52bf3 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -39,14 +39,18 @@ BASH_CONF_ENV += bash_cv_getenv_redef=yes
endif
endif
-# Add /bin/bash to /etc/shells otherwise some login tools like dropbear
-# can reject the user connexion. See man shells.
define BASH_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
DESTDIR=$(TARGET_DIR) exec_prefix=/ install
rm -f $(TARGET_DIR)/bin/bashbug
+endef
+
+# Add /bin/bash to /etc/shells otherwise some login tools like dropbear
+# can reject the user connection. See man shells.
+define BASH_ADD_MKSH_TO_SHELLS
grep -qsE '^/bin/bash$$' $(TARGET_DIR)/etc/shells \
|| echo "/bin/bash" >> $(TARGET_DIR)/etc/shells
endef
+BASH_TARGET_FINALIZE_HOOKS += BASH_ADD_MKSH_TO_SHELLS
$(eval $(autotools-package))