From bad74e9c4c113a076f853f0c2792e33cde56009a Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 3 Apr 2020 23:01:42 -0700 Subject: Make this actually work in salt --- base/base.sls | 15 --------- base/braswell.sls | 5 --- base/init.sls | 17 ++++++++++ base/macbook.sls | 5 --- base/skylake.sls | 5 --- base/top.sls | 12 -------- .../savedconfig/sys-kernel/linux-firmware-20180416 | 1 - braswell/init.sls | 3 ++ .../savedconfig/sys-kernel/linux-firmware-20180416 | 1 - macbook/init.sls | 3 ++ .../portage/savedconfig/sys-kernel/linux-firmware | 36 ++++++++++++++++++++-- .../savedconfig/sys-kernel/linux-firmware-20180416 | 1 - skylake/init.sls | 3 ++ top.sls | 9 ++++++ 14 files changed, 68 insertions(+), 48 deletions(-) delete mode 100644 base/base.sls delete mode 100644 base/braswell.sls create mode 100644 base/init.sls delete mode 100644 base/macbook.sls delete mode 100644 base/skylake.sls delete mode 100644 base/top.sls delete mode 120000 braswell/etc/portage/savedconfig/sys-kernel/linux-firmware-20180416 create mode 100644 braswell/init.sls delete mode 120000 macbook/etc/portage/savedconfig/sys-kernel/linux-firmware-20180416 create mode 100644 macbook/init.sls delete mode 120000 skylake/etc/portage/savedconfig/sys-kernel/linux-firmware-20180416 create mode 100644 skylake/init.sls create mode 100644 top.sls diff --git a/base/base.sls b/base/base.sls deleted file mode 100644 index 7e9e837..0000000 --- a/base/base.sls +++ /dev/null @@ -1,15 +0,0 @@ -/etc: - file.recurse: - - source: salt://etc - - include_empty: True - -clean: - file.absent: - - names: - - /etc/portage/package.use/no-gles2 - - /etc/portage/package.use/no-cramfs - - /etc/portage/package.use/no-netifrc - - /etc/portage/package.keywords/jpeg - - /etc/portage/package.keywords/iptables - - /etc/portage/package.keywords/gnome-3.24 - - /etc/portage/package.use/audacious diff --git a/base/braswell.sls b/base/braswell.sls deleted file mode 100644 index a0c8329..0000000 --- a/base/braswell.sls +++ /dev/null @@ -1,5 +0,0 @@ -/etc/portage/savedconfig/sys-kernel: - file.recurse: - - source: salt://etc/portage/savedconfig/sys-kernel - - include_empty: True - - clean: True diff --git a/base/init.sls b/base/init.sls new file mode 100644 index 0000000..3333f12 --- /dev/null +++ b/base/init.sls @@ -0,0 +1,17 @@ +/etc/portage/package.accept_keywords/50-common: + file.recurse: + - source: salt://base/etc/portage/package.accept_keywords/50-common + - include_empty: True + - clean: True + +/etc/portage/package.use/50-common: + file.recurse: + - source: salt://base/etc/portage/package.use/50-common + - include_empty: True + - clean: True + +/etc/portage/package.mask/50-common: + file.recurse: + - source: salt://base/etc/portage/package.mask/50-common + - include_empty: True + - clean: True diff --git a/base/macbook.sls b/base/macbook.sls deleted file mode 100644 index a0c8329..0000000 --- a/base/macbook.sls +++ /dev/null @@ -1,5 +0,0 @@ -/etc/portage/savedconfig/sys-kernel: - file.recurse: - - source: salt://etc/portage/savedconfig/sys-kernel - - include_empty: True - - clean: True diff --git a/base/skylake.sls b/base/skylake.sls deleted file mode 100644 index a0c8329..0000000 --- a/base/skylake.sls +++ /dev/null @@ -1,5 +0,0 @@ -/etc/portage/savedconfig/sys-kernel: - file.recurse: - - source: salt://etc/portage/savedconfig/sys-kernel - - include_empty: True - - clean: True diff --git a/base/top.sls b/base/top.sls deleted file mode 100644 index f83ce05..0000000 --- a/base/top.sls +++ /dev/null @@ -1,12 +0,0 @@ -base: - '*.mattst88.com': - - base -braswell: - 'braswell.mattst88.com': - - braswell -macbook: - 'macbook.mattst88.com': - - macbook -skylake: - 'skl*.mattst88.com': - - skylake diff --git a/braswell/etc/portage/savedconfig/sys-kernel/linux-firmware-20180416 b/braswell/etc/portage/savedconfig/sys-kernel/linux-firmware-20180416 deleted file mode 120000 index 9a0010a..0000000 --- a/braswell/etc/portage/savedconfig/sys-kernel/linux-firmware-20180416 +++ /dev/null @@ -1 +0,0 @@ -linux-firmware \ No newline at end of file diff --git a/braswell/init.sls b/braswell/init.sls new file mode 100644 index 0000000..47a6204 --- /dev/null +++ b/braswell/init.sls @@ -0,0 +1,3 @@ +/etc/portage/savedconfig/sys-kernel/linux-firmware: + file.managed: + - source: salt://braswell/etc/portage/savedconfig/sys-kernel/linux-firmware diff --git a/macbook/etc/portage/savedconfig/sys-kernel/linux-firmware-20180416 b/macbook/etc/portage/savedconfig/sys-kernel/linux-firmware-20180416 deleted file mode 120000 index 9a0010a..0000000 --- a/macbook/etc/portage/savedconfig/sys-kernel/linux-firmware-20180416 +++ /dev/null @@ -1 +0,0 @@ -linux-firmware \ No newline at end of file diff --git a/macbook/init.sls b/macbook/init.sls new file mode 100644 index 0000000..295dc25 --- /dev/null +++ b/macbook/init.sls @@ -0,0 +1,3 @@ +/etc/portage/savedconfig/sys-kernel/linux-firmware: + file.managed: + - source: salt://macbook/etc/portage/savedconfig/sys-kernel/linux-firmware diff --git a/skylake/etc/portage/savedconfig/sys-kernel/linux-firmware b/skylake/etc/portage/savedconfig/sys-kernel/linux-firmware index ac2775e..a10ab87 100644 --- a/skylake/etc/portage/savedconfig/sys-kernel/linux-firmware +++ b/skylake/etc/portage/savedconfig/sys-kernel/linux-firmware @@ -1,7 +1,37 @@ +i915/kbl_dmc_ver1_04.bin +i915/skl_dmc_ver1_27.bin intel/ibt-11-5.ddc intel/ibt-11-5.sfi intel/ibt-12-16.ddc intel/ibt-12-16.sfi -iwlwifi-8000C-27.ucode -iwlwifi-8000C-31.ucode -i915/skl_dmc_ver1_26.bin +intel/ibt-17-0-1.ddc +intel/ibt-17-0-1.sfi +intel/ibt-17-16-1.ddc +intel/ibt-17-16-1.sfi +intel/ibt-17-1.ddc +intel/ibt-17-1.sfi +intel/ibt-17-2.ddc +intel/ibt-17-2.sfi +intel/ibt-18-0-1.ddc +intel/ibt-18-0-1.sfi +intel/ibt-18-16-1.ddc +intel/ibt-18-16-1.sfi +intel/ibt-18-1.ddc +intel/ibt-18-1.sfi +intel/ibt-18-2.ddc +intel/ibt-18-2.sfi +intel/ibt-20-0-3.ddc +intel/ibt-20-0-3.sfi +intel/ibt-20-1-3.ddc +intel/ibt-20-1-3.sfi +intel/ibt-hw-37.7.10-fw-1.0.1.2d.d.bseq +intel/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq +intel/ibt-hw-37.7.10-fw-1.80.1.2d.d.bseq +intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq +intel/ibt-hw-37.7.bseq +intel/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq +intel/ibt-hw-37.8.10-fw-1.10.3.11.e.bseq +intel/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq +intel/ibt-hw-37.8.bseq +iwlwifi-8000C-36.ucode +iwlwifi-8265-36.ucode diff --git a/skylake/etc/portage/savedconfig/sys-kernel/linux-firmware-20180416 b/skylake/etc/portage/savedconfig/sys-kernel/linux-firmware-20180416 deleted file mode 120000 index 9a0010a..0000000 --- a/skylake/etc/portage/savedconfig/sys-kernel/linux-firmware-20180416 +++ /dev/null @@ -1 +0,0 @@ -linux-firmware \ No newline at end of file diff --git a/skylake/init.sls b/skylake/init.sls new file mode 100644 index 0000000..9a157b5 --- /dev/null +++ b/skylake/init.sls @@ -0,0 +1,3 @@ +/etc/portage/savedconfig/sys-kernel/linux-firmware: + file.managed: + - source: salt://skylake/etc/portage/savedconfig/sys-kernel/linux-firmware diff --git a/top.sls b/top.sls new file mode 100644 index 0000000..15b76aa --- /dev/null +++ b/top.sls @@ -0,0 +1,9 @@ +base: + '*.mattst88.com': + - base + 'braswell.mattst88.com': + - braswell + 'macbook.mattst88.com': + - macbook + 'skl*.mattst88.com': + - skylake -- cgit v1.2.3