1 |
commit: 95926d37fa1365e5570d08454df33f0500cd5249 |
2 |
Author: Matthew Thode <mthode <AT> mthode <DOT> org> |
3 |
AuthorDate: Tue Jun 4 15:58:11 2019 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 4 15:58:11 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=95926d37 |
7 |
|
8 |
use a more limited stage4 portage confdir |
9 |
|
10 |
and don't set licenses for stages 1-3 |
11 |
|
12 |
releases/weekly/portage/stages/package.license | 3 --- |
13 |
tools-systemd/stage4-amd64.spec | 2 +- |
14 |
2 files changed, 1 insertion(+), 4 deletions(-) |
15 |
|
16 |
diff --git a/releases/weekly/portage/stages/package.license b/releases/weekly/portage/stages/package.license |
17 |
deleted file mode 100644 |
18 |
index c5fd72de..00000000 |
19 |
--- a/releases/weekly/portage/stages/package.license |
20 |
+++ /dev/null |
21 |
@@ -1,3 +0,0 @@ |
22 |
-# Allow linux-firmware and other required packages in @BINARY-REDISTRIBUTABLE |
23 |
-# license group |
24 |
-*/* @BINARY-REDISTRIBUTABLE |
25 |
|
26 |
diff --git a/tools-systemd/stage4-amd64.spec b/tools-systemd/stage4-amd64.spec |
27 |
index 77c13894..72d49923 100644 |
28 |
--- a/tools-systemd/stage4-amd64.spec |
29 |
+++ b/tools-systemd/stage4-amd64.spec |
30 |
@@ -7,7 +7,7 @@ snapshot: current |
31 |
compression_mode: pixz_x |
32 |
decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip |
33 |
source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd |
34 |
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages/ |
35 |
+portage_confdir: @REPO_DIR@/tools-musl/portage.amd64.hardened.stage4 |
36 |
|
37 |
stage4/use: |
38 |
bash-completion |