* [Buildroot] [PATCH] package/busybox: fix target-finalize hook
@ 2020-03-25 0:30 unixmania at gmail.com
2020-03-25 6:35 ` Thomas Petazzoni
2020-04-07 18:13 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: unixmania at gmail.com @ 2020-03-25 0:30 UTC (permalink / raw)
To: buildroot
From: Carlos Santos <unixmania@gmail.com>
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>
---
package/busybox/busybox.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 767499b0c0..0da73b4eab 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -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
--
2.18.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] package/busybox: fix target-finalize hook
2020-03-25 0:30 [Buildroot] [PATCH] package/busybox: fix target-finalize hook unixmania at gmail.com
@ 2020-03-25 6:35 ` Thomas Petazzoni
2020-04-07 18:13 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2020-03-25 6:35 UTC (permalink / raw)
To: buildroot
On Tue, 24 Mar 2020 21:30:53 -0300
unixmania at gmail.com wrote:
> From: Carlos Santos <unixmania@gmail.com>
>
> 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>
> ---
> package/busybox/busybox.mk | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] package/busybox: fix target-finalize hook
2020-03-25 0:30 [Buildroot] [PATCH] package/busybox: fix target-finalize hook unixmania at gmail.com
2020-03-25 6:35 ` Thomas Petazzoni
@ 2020-04-07 18:13 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2020-04-07 18:13 UTC (permalink / raw)
To: buildroot
>>>>> "unixmania" == unixmania <unixmania@gmail.com> writes:
> From: Carlos Santos <unixmania@gmail.com>
> 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>
Committed to 2019.02.x, 2019.11.x and 2020.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-07 18:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-25 0:30 [Buildroot] [PATCH] package/busybox: fix target-finalize hook unixmania at gmail.com
2020-03-25 6:35 ` Thomas Petazzoni
2020-04-07 18:13 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.