From 9b10cd911e81904a3fb6bfbf6ee559e76f3bd6df Mon Sep 17 00:00:00 2001 From: Gabe Date: Mon, 30 Nov 2015 11:47:08 -0800 Subject: [PATCH 1/3] Updated patches to CC branch --- openwrt-base-files.patch | 21 +++++---------------- openwrt-kernel-config.patch | 11 ----------- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/openwrt-base-files.patch b/openwrt-base-files.patch index d281d1c..ce4de4e 100644 --- a/openwrt-base-files.patch +++ b/openwrt-base-files.patch @@ -1,25 +1,14 @@ -Terrible hacks to avoid conflicts between base-files and systemd. - -Requires further discussion with upstream, not a patch submission! - -Signed-off-by: Jeff Waugh ---- - Makefile | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/package/base-files/Makefile b/package/base-files/Makefile -index e0bf915..6f42f11 100644 ---- a/package/base-files/Makefile -+++ b/package/base-files/Makefile -@@ -29,7 +29,6 @@ endif +--- ./package/base-files/Makefile.orig 2015-11-30 11:23:32.027998990 -0800 ++++ ./package/base-files/Makefile 2015-11-30 11:24:19.365973177 -0800 +@@ -31,7 +31,6 @@ define Package/base-files SECTION:=base CATEGORY:=Base system -- DEPENDS:=+netifd +libc +procd +jsonfilter +- DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign TITLE:=Base filesystem for OpenWrt URL:=http://openwrt.org/ VERSION:=$(PKG_RELEASE)-$(REVISION) -@@ -135,7 +134,7 @@ define Package/base-files/install +@@ -156,7 +155,7 @@ mkdir -p $(1)/root $(LN) /proc/mounts $(1)/etc/mtab rm -f $(1)/var diff --git a/openwrt-kernel-config.patch b/openwrt-kernel-config.patch index ccc738c..23db0cc 100644 --- a/openwrt-kernel-config.patch +++ b/openwrt-kernel-config.patch @@ -1,14 +1,3 @@ -Add support for various kernel options required by systemd. -c.f. http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?&view=markup#l118 - -Signed-off-by: Jeff Waugh -Signed-off-by: Adam Porter ---- - config/Config-kernel.in | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/config/Config-kernel.in b/config/Config-kernel.in -index a0bd13e..33d1e3c 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -26,6 +26,26 @@ config KERNEL_DEBUG_FS From 509fbfefd89366b7a30cd68ca6b7f01dc6b95e9f Mon Sep 17 00:00:00 2001 From: Hugo Rodriguez Date: Sat, 26 Dec 2015 12:31:25 -0500 Subject: [PATCH 2/3] Remove base patch and Added myself as a contributor --- README.md | 1 + openwrt-base-files.patch | 19 ------------------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 openwrt-base-files.patch diff --git a/README.md b/README.md index bf6d539..003ebea 100644 --- a/README.md +++ b/README.md @@ -44,3 +44,4 @@ make menuconfig - Jeff [@jdub](https://github.com/jdub) Waugh, current maintainer - Gabe [@thagabe](https://github.com/thagabe) Rodriguez - Adam [@aport](https://github.com/aport) Porter, creator +- Hugo [@hugoard](https://github.com/hugoard) Rodriguez diff --git a/openwrt-base-files.patch b/openwrt-base-files.patch deleted file mode 100644 index ce4de4e..0000000 --- a/openwrt-base-files.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ./package/base-files/Makefile.orig 2015-11-30 11:23:32.027998990 -0800 -+++ ./package/base-files/Makefile 2015-11-30 11:24:19.365973177 -0800 -@@ -31,7 +31,6 @@ - define Package/base-files - SECTION:=base - CATEGORY:=Base system -- DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign - TITLE:=Base filesystem for OpenWrt - URL:=http://openwrt.org/ - VERSION:=$(PKG_RELEASE)-$(REVISION) -@@ -156,7 +155,7 @@ - mkdir -p $(1)/root - $(LN) /proc/mounts $(1)/etc/mtab - rm -f $(1)/var -- $(LN) /tmp $(1)/var -+ #$(LN) /tmp $(1)/var - mkdir -p $(1)/etc - $(LN) /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/ - From 33fe8911958ead865f34dda15685aa4dc112aa84 Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Sat, 26 Dec 2015 13:56:06 -0500 Subject: [PATCH 3/3] Revert "Remove base patch and Added myself as a contributor" --- README.md | 1 - openwrt-base-files.patch | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 openwrt-base-files.patch diff --git a/README.md b/README.md index 003ebea..bf6d539 100644 --- a/README.md +++ b/README.md @@ -44,4 +44,3 @@ make menuconfig - Jeff [@jdub](https://github.com/jdub) Waugh, current maintainer - Gabe [@thagabe](https://github.com/thagabe) Rodriguez - Adam [@aport](https://github.com/aport) Porter, creator -- Hugo [@hugoard](https://github.com/hugoard) Rodriguez diff --git a/openwrt-base-files.patch b/openwrt-base-files.patch new file mode 100644 index 0000000..ce4de4e --- /dev/null +++ b/openwrt-base-files.patch @@ -0,0 +1,19 @@ +--- ./package/base-files/Makefile.orig 2015-11-30 11:23:32.027998990 -0800 ++++ ./package/base-files/Makefile 2015-11-30 11:24:19.365973177 -0800 +@@ -31,7 +31,6 @@ + define Package/base-files + SECTION:=base + CATEGORY:=Base system +- DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign + TITLE:=Base filesystem for OpenWrt + URL:=http://openwrt.org/ + VERSION:=$(PKG_RELEASE)-$(REVISION) +@@ -156,7 +155,7 @@ + mkdir -p $(1)/root + $(LN) /proc/mounts $(1)/etc/mtab + rm -f $(1)/var +- $(LN) /tmp $(1)/var ++ #$(LN) /tmp $(1)/var + mkdir -p $(1)/etc + $(LN) /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/ +