1 |
commit: 6ca51d9ebebcf52984a80a6db95ab8623d95d1f3 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 28 23:28:19 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 28 23:28:19 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6ca51d9e |
7 |
|
8 |
tools-systemd: fix bug #653128 |
9 |
|
10 |
tools-systemd/portage.amd64/package.use/iputils | 1 + |
11 |
tools-systemd/portage.amd64/package.use/pam | 1 + |
12 |
tools-systemd/portage.i686/package.use/iputils | 1 + |
13 |
tools-systemd/portage.i686/package.use/pam | 1 + |
14 |
tools-systemd/run.sh | 1 + |
15 |
tools-systemd/stage-all.conf.template | 1 + |
16 |
6 files changed, 6 insertions(+) |
17 |
|
18 |
diff --git a/tools-systemd/portage.amd64/package.use/iputils b/tools-systemd/portage.amd64/package.use/iputils |
19 |
new file mode 100644 |
20 |
index 00000000..9cde931b |
21 |
--- /dev/null |
22 |
+++ b/tools-systemd/portage.amd64/package.use/iputils |
23 |
@@ -0,0 +1 @@ |
24 |
+net-misc/iputils -caps -filecaps |
25 |
|
26 |
diff --git a/tools-systemd/portage.amd64/package.use/pam b/tools-systemd/portage.amd64/package.use/pam |
27 |
new file mode 100644 |
28 |
index 00000000..6cec48a7 |
29 |
--- /dev/null |
30 |
+++ b/tools-systemd/portage.amd64/package.use/pam |
31 |
@@ -0,0 +1 @@ |
32 |
+sys-libs/pam -filecaps |
33 |
|
34 |
diff --git a/tools-systemd/portage.i686/package.use/iputils b/tools-systemd/portage.i686/package.use/iputils |
35 |
new file mode 100644 |
36 |
index 00000000..9cde931b |
37 |
--- /dev/null |
38 |
+++ b/tools-systemd/portage.i686/package.use/iputils |
39 |
@@ -0,0 +1 @@ |
40 |
+net-misc/iputils -caps -filecaps |
41 |
|
42 |
diff --git a/tools-systemd/portage.i686/package.use/pam b/tools-systemd/portage.i686/package.use/pam |
43 |
new file mode 100644 |
44 |
index 00000000..6cec48a7 |
45 |
--- /dev/null |
46 |
+++ b/tools-systemd/portage.i686/package.use/pam |
47 |
@@ -0,0 +1 @@ |
48 |
+sys-libs/pam -filecaps |
49 |
|
50 |
diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh |
51 |
index 0f16c4d1..bdaf5a4d 100755 |
52 |
--- a/tools-systemd/run.sh |
53 |
+++ b/tools-systemd/run.sh |
54 |
@@ -28,6 +28,7 @@ prepare_confs() { |
55 |
-e "s:SARCH:${arch}:g" \ |
56 |
-e "s:PARCH:${parch}:g" \ |
57 |
-e "s:@REPO_DIR@:${repo_dir}:g" \ |
58 |
+ -e "s:MYCATALYST:$(pwd):g" \ |
59 |
> stage${s}-${arch}-systemd.conf |
60 |
done |
61 |
} |
62 |
|
63 |
diff --git a/tools-systemd/stage-all.conf.template b/tools-systemd/stage-all.conf.template |
64 |
index eeff0e98..2be2284f 100644 |
65 |
--- a/tools-systemd/stage-all.conf.template |
66 |
+++ b/tools-systemd/stage-all.conf.template |
67 |
@@ -5,3 +5,4 @@ rel_type: systemd/SARCH |
68 |
profile: default/linux/PARCH/17.0/systemd |
69 |
snapshot: current |
70 |
source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd |
71 |
+portage_confdir: MYCATALYST/portage.SARCH |