package/busybox: fix target-finalize hook
PATCH 1/1 package/busybox: fix target-finalize hook
From: Carlos Santos <[email protected]>
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.
--- package/busybox/busybox.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/busybox/busybox.mk +2 -2
@@ -329,11 +329,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
Signature · 1 line
2.18.2
Thomas Petazzoni
AppliedPATCH 1/1 package/busybox: fix target-finalize hook
Quoted 10 lines · On Tue, 24 Mar 2020 21:30:53 -0300 unixmania at gmail.com wrote:
From: Carlos Santos <[email protected]>
It was searching for
CONFIG_ASH=yandCONFIG_HUSH=yat $(@D)/.config, which does not contain the package build path at the target-finalize step. Use $(BUSYBOX_DIR), instead.Signed-off-by Carlos Santos <[email protected]>--- package/busybox/busybox.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/busybox: fix target-finalize hook
In reply to unixmania at gmail.comQuoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"unixmania" == unixmania <[email protected]> writes:
From: Carlos Santos <[email protected]>
It was searching forCONFIG_ASH=yandCONFIG_HUSH=yat $(@D)/.config, which does not contain the package build path at the target-finalize step. Use $(BUSYBOX_DIR), instead.Signed-off-by Carlos Santos <[email protected]>
Committed to 2019.02.x, 2019.11.x and 2020.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard