| 1 |
commit: 6832ba9f66f1b0360e1468aa06f08d8d1f13f80c |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 1 16:24:06 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 1 16:31:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6832ba9f |
| 7 |
|
| 8 |
sys-apps/systemd: grab patches from v238-stable branch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6_p81 |
| 11 |
|
| 12 |
sys-apps/systemd/Manifest | 1 + |
| 13 |
.../systemd/{systemd-9999.ebuild => systemd-238-r3.ebuild} | 12 ++++++++---- |
| 14 |
sys-apps/systemd/systemd-9999.ebuild | 10 +++++++--- |
| 15 |
3 files changed, 16 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest |
| 18 |
index 4907d8f2d32..f5ba7882937 100644 |
| 19 |
--- a/sys-apps/systemd/Manifest |
| 20 |
+++ b/sys-apps/systemd/Manifest |
| 21 |
@@ -5,4 +5,5 @@ DIST systemd-236-patches-2.tar.gz 54737 BLAKE2B bce5f9e234c975a2b6e474ca2a0c2c82 |
| 22 |
DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d |
| 23 |
DIST systemd-237-patches-0.tar.gz 74617 BLAKE2B 52750bb08731e9e694a00fedc1e42beb7c6ad7736d3b6567f2ab094d4356506d10ec11e1c4c62623078d647c3314c71c9f141eb7c8628b610fd8a5e818b90ec6 SHA512 a6db99b330585e57c722bb0e692b0d988d5fbfef60c6cc87efbb7b903e55642c2f03bf6cdc80f15da22d0c41b5051387dac23a2f04238331f235154b17f32d1b |
| 24 |
DIST systemd-237.tar.gz 6871350 BLAKE2B 4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91 SHA512 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b |
| 25 |
+DIST systemd-238-patches-0.tar.gz 30019 BLAKE2B 0f393865cd6bcd815c1a6e932c0e5a25e125768d2bdef072d5fa7830b9ea012d0986380a1cdea8e369e1fffe89ea7657e4d55de2bae0d785ae374796a4e7c64b SHA512 f7e6fb7bf3b5cde2717a9e5dcd779a4595d6185d1ecdad8405a075edbb55b32c2573558f6af119ff50ea0df8eacef12ae7ee710fadd269f83db0985d76eb22dc |
| 26 |
DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8 |
| 27 |
|
| 28 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-238-r3.ebuild |
| 29 |
similarity index 98% |
| 30 |
copy from sys-apps/systemd/systemd-9999.ebuild |
| 31 |
copy to sys-apps/systemd/systemd-238-r3.ebuild |
| 32 |
index 44e359bc511..813d4f96708 100644 |
| 33 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 34 |
+++ b/sys-apps/systemd/systemd-238-r3.ebuild |
| 35 |
@@ -7,8 +7,9 @@ if [[ ${PV} == 9999 ]]; then |
| 36 |
EGIT_REPO_URI="https://github.com/systemd/systemd.git" |
| 37 |
inherit git-r3 |
| 38 |
else |
| 39 |
- SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz" |
| 40 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" |
| 41 |
+ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz |
| 42 |
+ https://dev.gentoo.org/~floppym/dist/${P}-patches-0.tar.gz" |
| 43 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
| 44 |
fi |
| 45 |
|
| 46 |
PYTHON_COMPAT=( python{3_4,3_5,3_6} ) |
| 47 |
@@ -147,11 +148,14 @@ src_unpack() { |
| 48 |
} |
| 49 |
|
| 50 |
src_prepare() { |
| 51 |
- local PATCHES=( |
| 52 |
- ) |
| 53 |
+ local PATCHES=() |
| 54 |
|
| 55 |
[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) |
| 56 |
|
| 57 |
+ PATCHES+=( |
| 58 |
+ "${FILESDIR}/238-libmount-include.patch" |
| 59 |
+ ) |
| 60 |
+ |
| 61 |
if ! use vanilla; then |
| 62 |
PATCHES+=( |
| 63 |
"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch" |
| 64 |
|
| 65 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 66 |
index 44e359bc511..560fc8c4f15 100644 |
| 67 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 68 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 69 |
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then |
| 70 |
inherit git-r3 |
| 71 |
else |
| 72 |
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz" |
| 73 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" |
| 74 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
| 75 |
fi |
| 76 |
|
| 77 |
PYTHON_COMPAT=( python{3_4,3_5,3_6} ) |
| 78 |
@@ -147,11 +147,15 @@ src_unpack() { |
| 79 |
} |
| 80 |
|
| 81 |
src_prepare() { |
| 82 |
- local PATCHES=( |
| 83 |
- ) |
| 84 |
+ # Do NOT add patches here |
| 85 |
+ local PATCHES=() |
| 86 |
|
| 87 |
[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) |
| 88 |
|
| 89 |
+ # Add local patches here |
| 90 |
+ PATCHES+=( |
| 91 |
+ ) |
| 92 |
+ |
| 93 |
if ! use vanilla; then |
| 94 |
PATCHES+=( |
| 95 |
"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch" |
Archives