| Message ID | 20200325003053.6305-1-unixmania@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/busybox: fix target-finalize hook | expand |
On Tue, 24 Mar 2020 21:30:53 -0300 unixmania@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
>>>>> "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.
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