1 |
commit: 4ee90d795db8ed83dd117f45c14fa4a7b4b6d2d5 |
2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 1 08:24:18 2018 +0000 |
4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 7 03:31:14 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4ee90d79 |
7 |
|
8 |
Add caps and filecaps use flags to the admin-cd. Drop sys-fs/nilfs-utils from the admin-cd - bug 591084. Add app-editors/nano to the packages list of the install-cd and the admin-cd so that it isn't |
9 |
depcleaned - bug 642856. |
10 |
|
11 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
12 |
|
13 |
releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec | 4 +++- |
14 |
releases/weekly/specs/amd64/hardened/admincd-stage1.spec | 4 +++- |
15 |
releases/weekly/specs/amd64/installcd-stage1.spec | 1 + |
16 |
releases/weekly/specs/x86/hardened/admincd-stage1.spec | 4 +++- |
17 |
releases/weekly/specs/x86/installcd-stage1.spec | 1 + |
18 |
5 files changed, 11 insertions(+), 3 deletions(-) |
19 |
|
20 |
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec |
21 |
index 81032fed..e5920c50 100644 |
22 |
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec |
23 |
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec |
24 |
@@ -9,8 +9,10 @@ compression_mode: pixz_x |
25 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/isos |
26 |
|
27 |
livecd/use: |
28 |
+ caps |
29 |
deprecated |
30 |
fbcon |
31 |
+ filecaps |
32 |
ipv6 |
33 |
livecd |
34 |
loop-aes |
35 |
@@ -59,6 +61,7 @@ livecd/packages: |
36 |
app-editors/hexcurse |
37 |
app-editors/hexedit |
38 |
app-editors/mg |
39 |
+ app-editors/nano |
40 |
app-editors/vim |
41 |
app-emacs/ebuild-mode |
42 |
app-emulation/xen-tools |
43 |
@@ -186,7 +189,6 @@ livecd/packages: |
44 |
sys-fs/mac-fdisk |
45 |
sys-fs/mdadm |
46 |
sys-fs/multipath-tools |
47 |
- sys-fs/nilfs-utils |
48 |
sys-fs/ntfs3g |
49 |
sys-fs/reiserfsprogs |
50 |
sys-fs/xfsprogs |
51 |
|
52 |
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec |
53 |
index 45d0077a..f88dd449 100644 |
54 |
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec |
55 |
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec |
56 |
@@ -9,8 +9,10 @@ compression_mode: pixz_x |
57 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/isos |
58 |
|
59 |
livecd/use: |
60 |
+ caps |
61 |
deprecated |
62 |
fbcon |
63 |
+ filecaps |
64 |
ipv6 |
65 |
livecd |
66 |
loop-aes |
67 |
@@ -60,6 +62,7 @@ livecd/packages: |
68 |
app-editors/hexcurse |
69 |
app-editors/hexedit |
70 |
app-editors/mg |
71 |
+ app-editors/nano |
72 |
app-editors/vim |
73 |
app-emacs/ebuild-mode |
74 |
app-emulation/cloud-init |
75 |
@@ -189,7 +192,6 @@ livecd/packages: |
76 |
sys-fs/mac-fdisk |
77 |
sys-fs/mdadm |
78 |
sys-fs/multipath-tools |
79 |
- sys-fs/nilfs-utils |
80 |
sys-fs/ntfs3g |
81 |
sys-fs/reiserfsprogs |
82 |
sys-fs/xfsprogs |
83 |
|
84 |
diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec b/releases/weekly/specs/amd64/installcd-stage1.spec |
85 |
index 5ee6c258..e9b24e29 100644 |
86 |
--- a/releases/weekly/specs/amd64/installcd-stage1.spec |
87 |
+++ b/releases/weekly/specs/amd64/installcd-stage1.spec |
88 |
@@ -37,6 +37,7 @@ livecd/packages: |
89 |
app-arch/unzip |
90 |
app-crypt/gnupg |
91 |
app-editors/mg |
92 |
+ app-editors/nano |
93 |
app-misc/screen |
94 |
app-portage/mirrorselect |
95 |
app-text/wgetpaste |
96 |
|
97 |
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/weekly/specs/x86/hardened/admincd-stage1.spec |
98 |
index 3c37f663..563f6292 100644 |
99 |
--- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec |
100 |
+++ b/releases/weekly/specs/x86/hardened/admincd-stage1.spec |
101 |
@@ -9,8 +9,10 @@ compression_mode: pixz_x |
102 |
portage_confdir: @REPO_DIR@/releases/weekly/portage/isos |
103 |
|
104 |
livecd/use: |
105 |
+ caps |
106 |
deprecated |
107 |
fbcon |
108 |
+ filecaps |
109 |
ipv6 |
110 |
livecd |
111 |
loop-aes |
112 |
@@ -60,6 +62,7 @@ livecd/packages: |
113 |
app-editors/hexcurse |
114 |
app-editors/hexedit |
115 |
app-editors/mg |
116 |
+ app-editors/nano |
117 |
app-editors/vim |
118 |
app-emacs/ebuild-mode |
119 |
app-emulation/cloud-init |
120 |
@@ -189,7 +192,6 @@ livecd/packages: |
121 |
sys-fs/mac-fdisk |
122 |
sys-fs/mdadm |
123 |
sys-fs/multipath-tools |
124 |
- sys-fs/nilfs-utils |
125 |
sys-fs/ntfs3g |
126 |
sys-fs/reiserfsprogs |
127 |
sys-fs/xfsprogs |
128 |
|
129 |
diff --git a/releases/weekly/specs/x86/installcd-stage1.spec b/releases/weekly/specs/x86/installcd-stage1.spec |
130 |
index 42a967ed..65a5d292 100644 |
131 |
--- a/releases/weekly/specs/x86/installcd-stage1.spec |
132 |
+++ b/releases/weekly/specs/x86/installcd-stage1.spec |
133 |
@@ -35,6 +35,7 @@ livecd/packages: |
134 |
app-arch/unzip |
135 |
app-crypt/gnupg |
136 |
app-editors/mg |
137 |
+ app-editors/nano |
138 |
app-misc/screen |
139 |
app-portage/mirrorselect |
140 |
app-text/wgetpaste |