From 25d672af86d2862742cfb3749e57a76655f41f12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Sat, 29 Jun 2019 11:05:31 +0200
Subject: [PATCH] patches/openwrt: merge releavnt patch to hack patch
There were two patches in patches/openwrt/to-upstream directory that
were fixes of hack patch. Those of course should not be send to upstream
and should be part of that specific patch. This commit merges those
patches to that patch.
---
...Try-to-install-everything-into-s-bin.patch | 32 +++++++++++++++----
...tpd-sbin-ntpd-is-installed-as-link-t.patch | 30 -----------------
...e-we-have-usr-sbin-before-installing.patch | 25 ---------------
3 files changed, 26 insertions(+), 61 deletions(-)
delete mode 100644 patches/openwrt/to-upstream/0004-busybox-fix-sysntpd-sbin-ntpd-is-installed-as-link-t.patch
delete mode 100644 patches/openwrt/to-upstream/0005-busybox-Make-sure-we-have-usr-sbin-before-installing.patch
diff --git a/patches/openwrt/hack/0003-busybox-Try-to-install-everything-into-s-bin.patch b/patches/openwrt/hack/0003-busybox-Try-to-install-everything-into-s-bin.patch
index a8242cbbd..5f3e4a00d 100644
--- a/patches/openwrt/hack/0003-busybox-Try-to-install-everything-into-s-bin.patch
+++ b/patches/openwrt/hack/0003-busybox-Try-to-install-everything-into-s-bin.patch
@@ -1,18 +1,19 @@
-From 1673cd73f29973a6819c0741217dd3ccd32d405b Mon Sep 17 00:00:00 2001
+From cf98cbddd79580817177d491e0bb4c00a8787196 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 | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
+ package/utils/busybox/Makefile | 13 +++++++++++++
+ package/utils/busybox/files/sysntpd | 2 +-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
-index a3c87aa661..3844cf82a9 100644
+index f6bc12a..765c23a 100644
--- a/package/utils/busybox/Makefile
+++ b/package/utils/busybox/Makefile
-@@ -147,6 +147,18 @@ define Package/busybox/install
+@@ -132,11 +132,24 @@ define Package/busybox/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
@@ -31,6 +32,25 @@ index a3c87aa661..3844cf82a9 100644
ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_CROND),)
$(INSTALL_BIN) ./files/cron $(1)/etc/init.d/cron
endif
+ ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_NTPD),)
+ $(INSTALL_BIN) ./files/sysntpd $(1)/etc/init.d/sysntpd
++ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) ./files/ntpd-hotplug $(1)/usr/sbin/ntpd-hotplug
+ endif
+ -rm -rf $(1)/lib64
+diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd
+index 52866ba..320e3a1 100755
+--- a/package/utils/busybox/files/sysntpd
++++ b/package/utils/busybox/files/sysntpd
+@@ -4,7 +4,7 @@
+ START=98
+
+ USE_PROCD=1
+-PROG=/usr/sbin/ntpd
++PROG=/sbin/ntpd
+ HOTPLUG_SCRIPT=/usr/sbin/ntpd-hotplug
+
+ get_dhcp_ntp_servers() {
--
-2.21.0
+2.22.0
diff --git a/patches/openwrt/to-upstream/0004-busybox-fix-sysntpd-sbin-ntpd-is-installed-as-link-t.patch b/patches/openwrt/to-upstream/0004-busybox-fix-sysntpd-sbin-ntpd-is-installed-as-link-t.patch
deleted file mode 100644
index b1ee82eff..000000000
--- a/patches/openwrt/to-upstream/0004-busybox-fix-sysntpd-sbin-ntpd-is-installed-as-link-t.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a1f4a635e00ad9e0febadf26fbd0ec9bc0ca7ac8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
-Date: Tue, 29 May 2018 14:22:28 +0200
-Subject: [PATCH] busybox: fix sysntpd /sbin/ntpd is installed as link to
- /sbin/ntpd
-
-I don't know the original state but at the moment both ntpd and busybox
-implementation are installed to /sbin/ntpd. There is no implementation
-in /usr/sbin/ntpd to my knowledge. But either way it's invalid at least
-for busybox at the moment and this fixes it.
----
- package/utils/busybox/files/sysntpd | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd
-index e693e40..2b9eb6b 100755
---- a/package/utils/busybox/files/sysntpd
-+++ b/package/utils/busybox/files/sysntpd
-@@ -4,7 +4,7 @@
- START=98
-
- USE_PROCD=1
--PROG=/usr/sbin/ntpd
-+PROG=/sbin/ntpd
- HOTPLUG_SCRIPT=/usr/sbin/ntpd-hotplug
-
- get_dhcp_ntp_servers() {
---
-2.17.0
-
diff --git a/patches/openwrt/to-upstream/0005-busybox-Make-sure-we-have-usr-sbin-before-installing.patch b/patches/openwrt/to-upstream/0005-busybox-Make-sure-we-have-usr-sbin-before-installing.patch
deleted file mode 100644
index 74ca13ea6..000000000
--- a/patches/openwrt/to-upstream/0005-busybox-Make-sure-we-have-usr-sbin-before-installing.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b1adf14b1ca00fd21d8bb1b3ca8dfa4119b902ba Mon Sep 17 00:00:00 2001
-From: Michal Hrusecky <Michal@Hrusecky.net>
-Date: Tue, 24 Jul 2018 22:58:13 +0200
-Subject: [PATCH] busybox: Make sure we have /usr/sbin before installing files
- inside
-
----
- package/utils/busybox/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
-index ff8cdde..79261b9 100644
---- a/package/utils/busybox/Makefile
-+++ b/package/utils/busybox/Makefile
-@@ -145,6 +145,7 @@ ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_CROND),)
- endif
- ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_NTPD),)
- $(INSTALL_BIN) ./files/sysntpd $(1)/etc/init.d/sysntpd
-+ $(INSTALL_DIR) $(1)/usr/sbin
- $(INSTALL_BIN) ./files/ntpd-hotplug $(1)/usr/sbin/ntpd-hotplug
- endif
- -rm -rf $(1)/lib64
---
-2.18.0
-
--
GitLab