| 1 |
commit: 8651869c1abe8dc845ca153d3e779ab3892aa27c |
| 2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 4 02:54:49 2016 +0000 |
| 4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 4 03:02:29 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8651869c |
| 7 |
|
| 8 |
sys-apps/tuned: fix wrong systemd path if rpm installed |
| 9 |
|
| 10 |
Gentoo-Bug: 563396 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.2 |
| 13 |
|
| 14 |
sys-apps/tuned/files/tuned-2.7.1-makefile-rpm.patch | 19 +++++++++++++++++++ |
| 15 |
sys-apps/tuned/files/tuned-2.7.1-makefile.patch | 15 --------------- |
| 16 |
sys-apps/tuned/tuned-2.7.1-r2.ebuild | 2 +- |
| 17 |
3 files changed, 20 insertions(+), 16 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-apps/tuned/files/tuned-2.7.1-makefile-rpm.patch b/sys-apps/tuned/files/tuned-2.7.1-makefile-rpm.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000..408ef2b |
| 22 |
--- /dev/null |
| 23 |
+++ b/sys-apps/tuned/files/tuned-2.7.1-makefile-rpm.patch |
| 24 |
@@ -0,0 +1,19 @@ |
| 25 |
+diff --git a/Makefile b/Makefile |
| 26 |
+index df2a139..6200cae 100644 |
| 27 |
+--- a/Makefile |
| 28 |
++++ b/Makefile |
| 29 |
+@@ -19,8 +19,12 @@ else |
| 30 |
+ GIT_PSUFFIX = .$(GIT_SUFFIX) |
| 31 |
+ RPM_VERSION = $(NAME)-$(VERSION)-1$(GIT_PSUFFIX) |
| 32 |
+ endif |
| 33 |
+-UNITDIR = $(shell rpm --eval '%{_unitdir}' 2>/dev/null || echo /usr/lib/systemd/system) |
| 34 |
+-TMPFILESDIR = $(shell rpm --eval '%{_tmpfilesdir}' 2>/dev/null || echo /usr/lib/tmpfiles.d) |
| 35 |
++UNITDIR_FALLBACK = /usr/lib/systemd/system |
| 36 |
++UNITDIR_DETECT = $(shell rpm --eval '%{_unitdir}' 2>/dev/null || echo $(UNITDIR_FALLBACK)) |
| 37 |
++UNITDIR = $(UNITDIR_DETECT:%{_unitdir}=$(UNITDIR_FALLBACK)) |
| 38 |
++TMPFILESDIR_FALLBACK = /usr/lib/tmpfiles.d |
| 39 |
++TMPFILESDIR_DETECT = $(shell rpm --eval '%{_tmpfilesdir}' 2>/dev/null || echo $(TMPFILESDIR_FALLBACK)) |
| 40 |
++TMPFILESDIR = $(TMPFILESDIR_DETECT:%{_tmpfilesdir}=$(TMPFILESDIR_FALLBACK)) |
| 41 |
+ VERSIONED_NAME = $(NAME)-$(VERSION)$(GIT_PSUFFIX) |
| 42 |
+ |
| 43 |
+ DATADIR = /usr/share |
| 44 |
|
| 45 |
diff --git a/sys-apps/tuned/files/tuned-2.7.1-makefile.patch b/sys-apps/tuned/files/tuned-2.7.1-makefile.patch |
| 46 |
deleted file mode 100644 |
| 47 |
index 54e89a1..00000000 |
| 48 |
--- a/sys-apps/tuned/files/tuned-2.7.1-makefile.patch |
| 49 |
+++ /dev/null |
| 50 |
@@ -1,15 +0,0 @@ |
| 51 |
-diff --git a/Makefile b/Makefile |
| 52 |
-index 9e2d8fe..6de30d0 100644 |
| 53 |
---- a/Makefile |
| 54 |
-+++ b/Makefile |
| 55 |
-@@ -19,8 +19,8 @@ else |
| 56 |
- GIT_PSUFFIX = .$(GIT_SUFFIX) |
| 57 |
- RPM_VERSION = $(NAME)-$(VERSION)-1$(GIT_PSUFFIX) |
| 58 |
- endif |
| 59 |
--UNITDIR = $(shell rpm --eval '%{_unitdir}' 2>/dev/null || echo /usr/lib/systemd/system) |
| 60 |
--TMPFILESDIR = $(shell rpm --eval '%{_tmpfilesdir}' 2>/dev/null || echo /usr/lib/tmpfiles.d) |
| 61 |
-+UNITDIR = $(shell if which rpm > /dev/null 2>&1; then rpm --eval '%{_unitdir}' 2>/dev/null; else echo /usr/lib/systemd/system; fi) |
| 62 |
-+TMPFILESDIR = $(shell if which rpm > /dev/null 2>&1; then rpm --eval '%{_tmpfilesdir}' 2>/dev/null; else echo /usr/lib/tmpfiles.d; fi) |
| 63 |
- VERSIONED_NAME = $(NAME)-$(VERSION)$(GIT_PSUFFIX) |
| 64 |
- |
| 65 |
- DATADIR = /usr/share |
| 66 |
|
| 67 |
diff --git a/sys-apps/tuned/tuned-2.7.1-r2.ebuild b/sys-apps/tuned/tuned-2.7.1-r2.ebuild |
| 68 |
index 6c58913..eed443e 100644 |
| 69 |
--- a/sys-apps/tuned/tuned-2.7.1-r2.ebuild |
| 70 |
+++ b/sys-apps/tuned/tuned-2.7.1-r2.ebuild |
| 71 |
@@ -37,7 +37,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 72 |
|
| 73 |
src_prepare() { |
| 74 |
epatch "${FILESDIR}"/${P}-sysctl.patch |
| 75 |
- epatch "${FILESDIR}"/${P}-makefile.patch |
| 76 |
+ epatch "${FILESDIR}"/${P}-makefile-rpm.patch |
| 77 |
|
| 78 |
sed -i \ |
| 79 |
-e "/\$(DESTDIR)\/run\/tuned/d" \ |
Archives