From 6f819a201243c33e4873bc7ac1aadb61a47bca97 Mon Sep 17 00:00:00 2001 From: Michal Hrusecky <Michal@Hrusecky.net> Date: Sat, 21 Jul 2018 00:53:34 +0200 Subject: [PATCH] busybox: Get back ugly hack as INSTALL_NO_USR doesn't work --- ...01-busybox-Try-to-install-everything-into-s-bin.patch | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/patches/openwrt/hack/0001-busybox-Try-to-install-everything-into-s-bin.patch b/patches/openwrt/hack/0001-busybox-Try-to-install-everything-into-s-bin.patch index 97f7749a4..1aa79ccd4 100644 --- a/patches/openwrt/hack/0001-busybox-Try-to-install-everything-into-s-bin.patch +++ b/patches/openwrt/hack/0001-busybox-Try-to-install-everything-into-s-bin.patch @@ -12,10 +12,17 @@ diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index fc882d3..5d4ba1d 100644 --- a/package/utils/busybox/Makefile +++ b/package/utils/busybox/Makefile -@@ -132,6 +132,8 @@ endef +@@ -132,6 +132,15 @@ endef define Package/busybox/install $(INSTALL_DIR) $(1)/etc/init.d $(CP) $(PKG_INSTALL_DIR)/* $(1)/ ++ for i in $(1)/usr/bin/*; do \ ++ [ "$$$$(basename $$$$i)" \!= env ] || continue; \ ++ rm -f $$$$i && ln -s busybox $(1)/bin/`basename $$$$i`; \ ++ done ++ for i in $(1)/usr/sbin/*; do \ ++ rm -f $$$$i && ln -s ../bin/busybox $(1)/sbin/`basename $$$$i`; \ ++ done + [ -e $(1)/usr/bin/env ] || ln -s ../../bin/busybox $(1)/usr/bin/env + rm -f $(1)/sbin/ifup $(1)/sbin/ifdown ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_CROND),) -- GitLab