summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2021-07-22 22:32:05 -0700
committerMatt Turner <mattst88@gmail.com>2021-07-22 22:37:40 -0700
commit04b4776b052c45537acfe1b6e991d5876012b258 (patch)
tree454d47218639b1b8edc44c994c5cc96ac7d4b48b
parent60c461185e9e6ef259ea6d9b7c3e77dba9c98b7a (diff)
Install package.license files
-rw-r--r--base/etc/portage/make.conf.tmpl1
-rw-r--r--base/etc/portage/package.license/firmware2
-rw-r--r--base/etc/portage/package.license/fonts2
-rw-r--r--base/etc/portage/package.license/printer1
-rw-r--r--base/portage.sls7
5 files changed, 12 insertions, 1 deletions
diff --git a/base/etc/portage/make.conf.tmpl b/base/etc/portage/make.conf.tmpl
index 55c4137..bed91e9 100644
--- a/base/etc/portage/make.conf.tmpl
+++ b/base/etc/portage/make.conf.tmpl
@@ -6,7 +6,6 @@ FCFLAGS="${__COMMON_FLAGS}"
FFLAGS="${__COMMON_FLAGS}"
FEATURES="buildpkg binpkg-multi-instance parallel-install"
MAKEOPTS="-j{{ salt.status.nproc() }} -l{{ salt.status.nproc() }}"
-ACCEPT_LICENSE="linux-firmware linux-fw-redistributable no-source-code intel-ucode freedist"
CPU_FLAGS_X86="{{ cpu_flags_x86 }}"
LINGUAS="en en-US"
L10N="en en-US"
diff --git a/base/etc/portage/package.license/firmware b/base/etc/portage/package.license/firmware
new file mode 100644
index 0000000..b109654
--- /dev/null
+++ b/base/etc/portage/package.license/firmware
@@ -0,0 +1,2 @@
+sys-firmware/intel-microcode intel-ucode
+sys-kernel/linux-firmware linux-fw-redistributable no-source-code
diff --git a/base/etc/portage/package.license/fonts b/base/etc/portage/package.license/fonts
new file mode 100644
index 0000000..3400245
--- /dev/null
+++ b/base/etc/portage/package.license/fonts
@@ -0,0 +1,2 @@
+media-fonts/corefonts MSttfEULA
+media-fonts/texcm-ttf bakoma
diff --git a/base/etc/portage/package.license/printer b/base/etc/portage/package.license/printer
new file mode 100644
index 0000000..abb0162
--- /dev/null
+++ b/base/etc/portage/package.license/printer
@@ -0,0 +1 @@
+media-gfx/brscan4 Brother
diff --git a/base/portage.sls b/base/portage.sls
index 1edb65c..528eeaa 100644
--- a/base/portage.sls
+++ b/base/portage.sls
@@ -8,6 +8,7 @@ hierarchy:
- /etc/portage/env
- /etc/portage/package.accept_keywords
- /etc/portage/package.env
+ - /etc/portage/package.license
- /etc/portage/package.use
- /etc/portage/profile
- /etc/portage/profile/package.mask
@@ -25,6 +26,12 @@ hierarchy:
- include_empty: True
- clean: True
+/etc/portage/package.license/50-common:
+ file.recurse:
+ - source: salt://base/etc/portage/package.license
+ - include_empty: True
+ - clean: True
+
/etc/portage/package.use/50-common:
file.recurse:
- source: salt://base/etc/portage/package.use