[gentoo-commits] proj/releng:master commit in: tools-systemd/, releases/weekly/portage/stages/

[gentoo-commits] proj/releng:master commit in: tools-systemd/, releases/weekly/portage/stages/

[Matthew Thode]

commit:     95926d37fa1365e5570d08454df33f0500cd5249
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Tue Jun  4 15:58:11 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 15:58:11 2019 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=95926d37

use a more limited stage4 portage confdir

and don't set licenses for stages 1-3

 releases/weekly/portage/stages/package.license | 3 ---
 tools-systemd/stage4-amd64.spec                | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/releases/weekly/portage/stages/package.license b/releases/weekly/portage/stages/package.license
deleted file mode 100644
index c5fd72de..00000000
--- a/releases/weekly/portage/stages/package.license
+++ /dev/null
@@ -1,3 +0,0 @@
-# Allow linux-firmware and other required packages in @BINARY-REDISTRIBUTABLE
-# license group
-*/* @BINARY-REDISTRIBUTABLE

diff --git a/tools-systemd/stage4-amd64.spec b/tools-systemd/stage4-amd64.spec
index 77c13894..72d49923 100644
--- a/tools-systemd/stage4-amd64.spec
+++ b/tools-systemd/stage4-amd64.spec
@@ -7,7 +7,7 @@ snapshot: current
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages/
+portage_confdir: @REPO_DIR@/tools-musl/portage.amd64.hardened.stage4
 
 stage4/use:
 	bash-completion