Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated patches to CC branch #6

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Updated patches to CC branch #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b10cd9
Updated patches to CC branch
thagabe Nov 30, 2015
509fbfe
Remove base patch and Added myself as a contributor
hugoard Dec 26, 2015
bb5f9d7
Merge pull request #1 from hugoard/master
thagabe Dec 26, 2015
33fe891
Revert "Remove base patch and Added myself as a contributor"
thagabe Dec 26, 2015
16f04bf
Merge pull request #3 from thagabe/revert-1-master
thagabe Dec 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions openwrt-base-files.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <jdub at bethesignal.org>
---
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
Expand Down
11 changes: 0 additions & 11 deletions openwrt-kernel-config.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <jdub at bethesignal.org>
Signed-off-by: Adam Porter <porter.adam at gmail.com>
---
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
Expand Down