From cb84b174d7fa4fc7f08776eb2a2551dffa79b313 Mon Sep 17 00:00:00 2001 From: Ben Kohler Date: Tue, 5 Mar 2024 11:46:34 -0600 Subject: [PATCH] specs/{amd64,x86}: add broadcom-sta to isos Bug: https://bugs.gentoo.org/926215 Signed-off-by: Ben Kohler --- releases/specs/amd64/hardened/admincd-stage2.spec | 2 +- releases/specs/amd64/installcd-stage2-minimal.spec | 2 ++ releases/specs/amd64/livegui/livegui-stage2.spec | 2 +- releases/specs/x86/hardened/admincd-stage2-openrc.spec | 2 ++ releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec | 2 ++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec index 4c85c72e..42d43a1b 100644 --- a/releases/specs/amd64/hardened/admincd-stage2.spec +++ b/releases/specs/amd64/hardened/admincd-stage2.spec @@ -18,7 +18,7 @@ boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/amd64-6.6.13.config -boot/kernel/gentoo/packages: --usepkg n zfs zfs-kmod +boot/kernel/gentoo/packages: --usepkg n zfs zfs-kmod broadcom-sta livecd/unmerge: app-admin/eselect diff --git a/releases/specs/amd64/installcd-stage2-minimal.spec b/releases/specs/amd64/installcd-stage2-minimal.spec index 9efd0a6f..db21bb42 100644 --- a/releases/specs/amd64/installcd-stage2-minimal.spec +++ b/releases/specs/amd64/installcd-stage2-minimal.spec @@ -18,6 +18,8 @@ boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/amd64-6.6.13.config +boot/kernel/gentoo/packages: --usepkg n broadcom-sta + livecd/unmerge: app-admin/eselect app-admin/eselect-ctags diff --git a/releases/specs/amd64/livegui/livegui-stage2.spec b/releases/specs/amd64/livegui/livegui-stage2.spec index 3e6690fd..1d575f1b 100644 --- a/releases/specs/amd64/livegui/livegui-stage2.spec +++ b/releases/specs/amd64/livegui/livegui-stage2.spec @@ -27,4 +27,4 @@ boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/livegui-amd64-5.15.23.config -boot/kernel/gentoo/packages: --usepkg n zfs zfs-kmod +boot/kernel/gentoo/packages: --usepkg n zfs zfs-kmod broadcom-sta diff --git a/releases/specs/x86/hardened/admincd-stage2-openrc.spec b/releases/specs/x86/hardened/admincd-stage2-openrc.spec index 2d509e2f..73aa8cbd 100644 --- a/releases/specs/x86/hardened/admincd-stage2-openrc.spec +++ b/releases/specs/x86/hardened/admincd-stage2-openrc.spec @@ -18,6 +18,8 @@ boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/x86/x86-5.4.38.config +boot/kernel/gentoo/packages: --usepkg n broadcom-sta + livecd/unmerge: app-admin/eselect app-admin/eselect-ctags diff --git a/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec index 9f2c89fe..787eaa2f 100644 --- a/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec +++ b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec @@ -19,6 +19,8 @@ boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/x86/x86-5.4.38.config +boot/kernel/gentoo/packages: --usepkg n broadcom-sta + livecd/unmerge: app-admin/eselect app-admin/eselect-ctags