diff options
| author |  Carlos Santos <unixmania@gmail.com> | 2020-03-24 21:30:53 -0300 |
|---|---|---|
| committer |  Peter Korsgaard <peter@korsgaard.com> | 2020-04-07 18:56:42 +0200 |
| commit | 1d7c319a8b59193fae02fab36bb80b46e9a1b7d9 (patch) | |
| tree | 983c09f7d82727bbc29f4e135e6a29103c182ab3 | |
| parent | 0c479e9f2b6877fef68cb3a42758e37f36fb787d (diff) | |
| download | buildroot-1d7c319a8b59193fae02fab36bb80b46e9a1b7d9.tar.gz buildroot-1d7c319a8b59193fae02fab36bb80b46e9a1b7d9.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.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index bf3b8aeec8..3748df8eb0 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -303,11 +303,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 |