From ec951fb2a8794a1a07aebc2718a35b8c7ba02677 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 4 Nov 2020 19:55:36 -0500 Subject: [PATCH] specs: Remove sys-apps/hwsetup Package isn't much use these days with udev. Signed-off-by: Matt Turner --- releases/scripts/livecd.sh | 3 --- releases/specs/alpha/installcd-stage1.spec | 1 - releases/specs/alpha/installcd-stage2-minimal.spec | 1 - releases/specs/amd64/hardened/admincd-stage1-selinux.spec | 1 - releases/specs/amd64/hardened/admincd-stage1.spec | 1 - releases/specs/amd64/hardened/admincd-stage2-selinux.spec | 1 - releases/specs/amd64/hardened/admincd-stage2.spec | 1 - releases/specs/amd64/installcd-stage1.spec | 1 - releases/specs/amd64/installcd-stage2-minimal.spec | 1 - releases/specs/amd64/livecd-stage1.spec | 1 - releases/specs/amd64/livedvd-stage1.spec | 1 - releases/specs/hppa/installcd-stage1.spec | 1 - releases/specs/hppa/installcd-stage2-minimal.spec | 1 - releases/specs/ia64/installcd-stage1.spec | 1 - releases/specs/ia64/installcd-stage2-minimal.spec | 1 - releases/specs/ppc/ppc32/installcd-stage1.spec | 1 - releases/specs/ppc/ppc32/installcd-stage2-minimal.spec | 1 - releases/specs/sparc/sparc64/installcd-stage1.spec | 1 - releases/specs/sparc/sparc64/installcd-stage2-minimal.spec | 1 - releases/specs/x86/hardened/admincd-stage1.spec | 1 - releases/specs/x86/hardened/admincd-stage2.spec | 1 - releases/specs/x86/hardened/installcd-stage1.spec | 1 - releases/specs/x86/hardened/installcd-stage2-minimal.spec | 1 - releases/specs/x86/i686/livecd-stage1.spec | 1 - releases/specs/x86/i686/livedvd-stage1.spec | 1 - releases/specs/x86/installcd-stage1.spec | 1 - releases/specs/x86/installcd-stage2-minimal.spec | 1 - 27 files changed, 29 deletions(-) diff --git a/releases/scripts/livecd.sh b/releases/scripts/livecd.sh index 054232d6..92750063 100644 --- a/releases/scripts/livecd.sh +++ b/releases/scripts/livecd.sh @@ -12,9 +12,6 @@ case `uname -m` in echo "# Disable UAC on Alpha" >> /etc/sysctl.conf echo "kernel.uac.noprint = 1" >> /etc/sysctl.conf ;; - i?86|x86_64) - sed -i 's/DRIVER fbdev/DRIVER vesa/' /usr/share/hwdata/Cards - ;; esac # Enforce a unicode font by default diff --git a/releases/specs/alpha/installcd-stage1.spec b/releases/specs/alpha/installcd-stage1.spec index 83101810..46a2a48e 100644 --- a/releases/specs/alpha/installcd-stage1.spec +++ b/releases/specs/alpha/installcd-stage1.spec @@ -48,7 +48,6 @@ livecd/packages: sys-apps/busybox sys-apps/ethtool sys-apps/hdparm - sys-apps/hwsetup sys-apps/iproute2 sys-apps/sdparm sys-apps/usbutils diff --git a/releases/specs/alpha/installcd-stage2-minimal.spec b/releases/specs/alpha/installcd-stage2-minimal.spec index 217e51a8..8e1b3914 100644 --- a/releases/specs/alpha/installcd-stage2-minimal.spec +++ b/releases/specs/alpha/installcd-stage2-minimal.spec @@ -105,7 +105,6 @@ livecd/unmerge: sys-devel/patch sys-libs/db sys-libs/gdbm - sys-libs/libkudzu sys-kernel/genkernel sys-kernel/linux-headers diff --git a/releases/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/specs/amd64/hardened/admincd-stage1-selinux.spec index 8bb923ea..6c2d04f3 100644 --- a/releases/specs/amd64/hardened/admincd-stage1-selinux.spec +++ b/releases/specs/amd64/hardened/admincd-stage1-selinux.spec @@ -140,7 +140,6 @@ livecd/packages: sys-apps/gptfdisk sys-apps/grep sys-apps/hdparm - sys-apps/hwsetup sys-apps/ipmitool sys-apps/iproute2 sys-apps/less diff --git a/releases/specs/amd64/hardened/admincd-stage1.spec b/releases/specs/amd64/hardened/admincd-stage1.spec index 3e8da703..4a178574 100644 --- a/releases/specs/amd64/hardened/admincd-stage1.spec +++ b/releases/specs/amd64/hardened/admincd-stage1.spec @@ -144,7 +144,6 @@ livecd/packages: sys-apps/gptfdisk sys-apps/grep sys-apps/hdparm - sys-apps/hwsetup sys-apps/ipmitool sys-apps/iproute2 sys-apps/less diff --git a/releases/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/specs/amd64/hardened/admincd-stage2-selinux.spec index a197e6d9..3c38e7a9 100644 --- a/releases/specs/amd64/hardened/admincd-stage2-selinux.spec +++ b/releases/specs/amd64/hardened/admincd-stage2-selinux.spec @@ -63,7 +63,6 @@ livecd/unmerge: sys-devel/patch sys-libs/db sys-libs/gdbm - sys-libs/libkudzu sys-kernel/genkernel sys-kernel/linux-headers diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec index 99799a87..cd55c184 100644 --- a/releases/specs/amd64/hardened/admincd-stage2.spec +++ b/releases/specs/amd64/hardened/admincd-stage2.spec @@ -60,7 +60,6 @@ livecd/unmerge: sys-devel/patch sys-libs/db sys-libs/gdbm - sys-libs/libkudzu sys-kernel/genkernel sys-kernel/linux-headers diff --git a/releases/specs/amd64/installcd-stage1.spec b/releases/specs/amd64/installcd-stage1.spec index 10b79c15..f57e4e14 100644 --- a/releases/specs/amd64/installcd-stage1.spec +++ b/releases/specs/amd64/installcd-stage1.spec @@ -71,7 +71,6 @@ livecd/packages: sys-apps/fxload sys-apps/gptfdisk sys-apps/hdparm - sys-apps/hwsetup sys-apps/iproute2 sys-apps/memtester sys-apps/netplug diff --git a/releases/specs/amd64/installcd-stage2-minimal.spec b/releases/specs/amd64/installcd-stage2-minimal.spec index eedb68e2..49d4693f 100644 --- a/releases/specs/amd64/installcd-stage2-minimal.spec +++ b/releases/specs/amd64/installcd-stage2-minimal.spec @@ -58,7 +58,6 @@ livecd/unmerge: sys-devel/patch sys-libs/db sys-libs/gdbm - sys-libs/libkudzu sys-kernel/genkernel sys-kernel/linux-headers diff --git a/releases/specs/amd64/livecd-stage1.spec b/releases/specs/amd64/livecd-stage1.spec index 9c168c32..a7743acd 100644 --- a/releases/specs/amd64/livecd-stage1.spec +++ b/releases/specs/amd64/livecd-stage1.spec @@ -79,7 +79,6 @@ livecd/packages: sys-apps/ethtool sys-apps/fxload sys-apps/hdparm - sys-apps/hwsetup ### Masked (no keywords) # sys-apps/ibm-powerpc-utils ### Masked (no keywords) diff --git a/releases/specs/amd64/livedvd-stage1.spec b/releases/specs/amd64/livedvd-stage1.spec index 878eb15e..3108b607 100644 --- a/releases/specs/amd64/livedvd-stage1.spec +++ b/releases/specs/amd64/livedvd-stage1.spec @@ -184,7 +184,6 @@ livecd/packages: sys-apps/fxload sys-apps/gradm sys-apps/hdparm - sys-apps/hwsetup ### Masked (no keyword) # sys-apps/ibm-powerpc-utils ### Masked (no keyword) diff --git a/releases/specs/hppa/installcd-stage1.spec b/releases/specs/hppa/installcd-stage1.spec index 79e87094..5a490a46 100644 --- a/releases/specs/hppa/installcd-stage1.spec +++ b/releases/specs/hppa/installcd-stage1.spec @@ -53,7 +53,6 @@ livecd/packages: net-proxy/dante sys-apps/ethtool sys-apps/hdparm - sys-apps/hwsetup sys-apps/iproute2 sys-apps/pciutils sys-apps/sdparm diff --git a/releases/specs/hppa/installcd-stage2-minimal.spec b/releases/specs/hppa/installcd-stage2-minimal.spec index 44882a14..d930d53d 100644 --- a/releases/specs/hppa/installcd-stage2-minimal.spec +++ b/releases/specs/hppa/installcd-stage2-minimal.spec @@ -134,7 +134,6 @@ livecd/unmerge: sys-libs/db sys-libs/gdbm sys-libs/cracklib - sys-libs/libkudzu x11-misc/shared-mime-info livecd/empty: diff --git a/releases/specs/ia64/installcd-stage1.spec b/releases/specs/ia64/installcd-stage1.spec index 1e075f69..3b94506e 100644 --- a/releases/specs/ia64/installcd-stage1.spec +++ b/releases/specs/ia64/installcd-stage1.spec @@ -60,7 +60,6 @@ livecd/packages: sys-apps/ethtool sys-apps/fxload sys-apps/hdparm - sys-apps/hwsetup sys-apps/iproute2 # sys-apps/lssbus # sys-apps/memtester diff --git a/releases/specs/ia64/installcd-stage2-minimal.spec b/releases/specs/ia64/installcd-stage2-minimal.spec index f4aa19da..f1d02e41 100644 --- a/releases/specs/ia64/installcd-stage2-minimal.spec +++ b/releases/specs/ia64/installcd-stage2-minimal.spec @@ -83,7 +83,6 @@ livecd/unmerge: sys-devel/patch sys-libs/db sys-libs/gdbm - sys-libs/libkudzu sys-kernel/genkernel sys-kernel/linux-headers diff --git a/releases/specs/ppc/ppc32/installcd-stage1.spec b/releases/specs/ppc/ppc32/installcd-stage1.spec index 0d72c926..d2d456f6 100644 --- a/releases/specs/ppc/ppc32/installcd-stage1.spec +++ b/releases/specs/ppc/ppc32/installcd-stage1.spec @@ -55,7 +55,6 @@ livecd/packages: sys-apps/ethtool sys-apps/fxload sys-apps/hdparm - sys-apps/hwsetup sys-apps/ibm-powerpc-utils sys-apps/iproute2 sys-apps/lm-sensors diff --git a/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec b/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec index 9aaf8341..08a51536 100644 --- a/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec +++ b/releases/specs/ppc/ppc32/installcd-stage2-minimal.spec @@ -127,7 +127,6 @@ livecd/unmerge: sys-devel/patch sys-libs/db sys-libs/gdbm - sys-libs/libkudzu sys-kernel/genkernel sys-kernel/linux-headers diff --git a/releases/specs/sparc/sparc64/installcd-stage1.spec b/releases/specs/sparc/sparc64/installcd-stage1.spec index 06f18642..598fb754 100644 --- a/releases/specs/sparc/sparc64/installcd-stage1.spec +++ b/releases/specs/sparc/sparc64/installcd-stage1.spec @@ -71,7 +71,6 @@ livecd/packages: sys-apps/fxload sys-apps/gptfdisk sys-apps/hdparm - sys-apps/hwsetup sys-apps/iproute2 sys-apps/lssbus sys-apps/memtester diff --git a/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec b/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec index d44ec683..1b168040 100644 --- a/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec +++ b/releases/specs/sparc/sparc64/installcd-stage2-minimal.spec @@ -59,7 +59,6 @@ livecd/unmerge: sys-devel/patch sys-libs/db sys-libs/gdbm - sys-libs/libkudzu sys-kernel/genkernel sys-kernel/linux-headers diff --git a/releases/specs/x86/hardened/admincd-stage1.spec b/releases/specs/x86/hardened/admincd-stage1.spec index 68b37180..7ce6cbf8 100644 --- a/releases/specs/x86/hardened/admincd-stage1.spec +++ b/releases/specs/x86/hardened/admincd-stage1.spec @@ -143,7 +143,6 @@ livecd/packages: sys-apps/gptfdisk sys-apps/grep sys-apps/hdparm - sys-apps/hwsetup sys-apps/ipmitool sys-apps/iproute2 sys-apps/less diff --git a/releases/specs/x86/hardened/admincd-stage2.spec b/releases/specs/x86/hardened/admincd-stage2.spec index 8ec4c375..a70b4bc4 100644 --- a/releases/specs/x86/hardened/admincd-stage2.spec +++ b/releases/specs/x86/hardened/admincd-stage2.spec @@ -57,7 +57,6 @@ livecd/unmerge: sys-devel/patch sys-libs/db sys-libs/gdbm - sys-libs/libkudzu sys-kernel/genkernel sys-kernel/linux-headers diff --git a/releases/specs/x86/hardened/installcd-stage1.spec b/releases/specs/x86/hardened/installcd-stage1.spec index b750acc7..fa629e5e 100644 --- a/releases/specs/x86/hardened/installcd-stage1.spec +++ b/releases/specs/x86/hardened/installcd-stage1.spec @@ -55,7 +55,6 @@ livecd/packages: sys-apps/ethtool sys-apps/fxload sys-apps/hdparm - sys-apps/hwsetup sys-apps/iproute2 sys-apps/memtester sys-apps/netplug diff --git a/releases/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/specs/x86/hardened/installcd-stage2-minimal.spec index 5deae3c7..041dbefb 100644 --- a/releases/specs/x86/hardened/installcd-stage2-minimal.spec +++ b/releases/specs/x86/hardened/installcd-stage2-minimal.spec @@ -120,7 +120,6 @@ livecd/unmerge: sys-devel/patch sys-libs/db sys-libs/gdbm - sys-libs/libkudzu sys-kernel/genkernel sys-kernel/linux-headers diff --git a/releases/specs/x86/i686/livecd-stage1.spec b/releases/specs/x86/i686/livecd-stage1.spec index c21f9941..8e27af8b 100644 --- a/releases/specs/x86/i686/livecd-stage1.spec +++ b/releases/specs/x86/i686/livecd-stage1.spec @@ -77,7 +77,6 @@ livecd/packages: sys-apps/ethtool sys-apps/fxload sys-apps/hdparm - sys-apps/hwsetup # sys-apps/ibm-powerpc-utils # sys-apps/ibm-powerpc-utils-papr sys-apps/iproute2 diff --git a/releases/specs/x86/i686/livedvd-stage1.spec b/releases/specs/x86/i686/livedvd-stage1.spec index ae01fd51..7ea90c55 100644 --- a/releases/specs/x86/i686/livedvd-stage1.spec +++ b/releases/specs/x86/i686/livedvd-stage1.spec @@ -175,7 +175,6 @@ livecd/packages: sys-apps/fxload sys-apps/gradm sys-apps/hdparm - sys-apps/hwsetup # sys-apps/ibm-powerpc-utils # sys-apps/ibm-powerpc-utils-papr sys-apps/iproute2 diff --git a/releases/specs/x86/installcd-stage1.spec b/releases/specs/x86/installcd-stage1.spec index 2ac310ac..7dd5ac62 100644 --- a/releases/specs/x86/installcd-stage1.spec +++ b/releases/specs/x86/installcd-stage1.spec @@ -72,7 +72,6 @@ livecd/packages: sys-apps/fxload sys-apps/gptfdisk sys-apps/hdparm - sys-apps/hwsetup sys-apps/iproute2 sys-apps/memtester sys-apps/netplug diff --git a/releases/specs/x86/installcd-stage2-minimal.spec b/releases/specs/x86/installcd-stage2-minimal.spec index e624025f..feec2218 100644 --- a/releases/specs/x86/installcd-stage2-minimal.spec +++ b/releases/specs/x86/installcd-stage2-minimal.spec @@ -59,7 +59,6 @@ livecd/unmerge: sys-devel/patch sys-libs/db sys-libs/gdbm - sys-libs/libkudzu sys-kernel/genkernel sys-kernel/linux-headers