From 458a97be8a6bb4b95fa3de5ad6af3d8950a88be2 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal.hrusecky@nic.cz>
Date: Fri, 20 Jul 2018 11:22:05 +0200
Subject: [PATCH] busybox: Get part of the hack back
Need to avoid conflicts between busybox and netifd
---
...Try-to-install-everything-into-s-bin.patch | 26 +++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 patches/openwrt/hack/0001-busybox-Try-to-install-everything-into-s-bin.patch
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
new file mode 100644
index 000000000..97f7749a4
--- /dev/null
+++ b/patches/openwrt/hack/0001-busybox-Try-to-install-everything-into-s-bin.patch
@@ -0,0 +1,26 @@
+From 709c24eb908ceb268c9dcb1b8665716c33d3dbef Mon Sep 17 00:00:00 2001
+From: Michal Hrusecky <Michal@Hrusecky.net>
+Date: Tue, 27 Feb 2018 17:24:33 +0100
+Subject: [PATCH] busybox: Try to install everything into /{s,}bin
+
+Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
+---
+ package/utils/busybox/Makefile | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+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
+ define Package/busybox/install
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(CP) $(PKG_INSTALL_DIR)/* $(1)/
++ [ -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),)
+ $(INSTALL_BIN) ./files/cron $(1)/etc/init.d/cron
+ endif
+--
+2.16.2
+
--
GitLab