From d648dc98efac5fcc533ec7bad0265f53fab40a8b Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Wed, 18 Oct 2023 21:44:48 -0500 Subject: configs: Horizon: DRY config via multi-inheritance --- configs/horizon/aarch64-horizon.installfile | 11 +---------- configs/horizon/armv7-horizon.installfile | 11 +---------- configs/horizon/firmware.installfile | 4 ++++ configs/horizon/horizon.installfile | 9 +++++++++ configs/horizon/pmmx-horizon-fw.installfile | 6 +----- configs/horizon/pmmx-horizon.installfile | 11 +---------- configs/horizon/ppc-horizon-fw.installfile | 6 +----- configs/horizon/ppc-horizon.installfile | 11 +---------- configs/horizon/ppc64-horizon-fw.installfile | 6 +----- configs/horizon/ppc64-horizon.installfile | 11 +---------- configs/horizon/x86_64-horizon-fw.installfile | 6 +----- configs/horizon/x86_64-horizon.installfile | 11 +---------- 12 files changed, 23 insertions(+), 80 deletions(-) create mode 100644 configs/horizon/firmware.installfile create mode 100644 configs/horizon/horizon.installfile diff --git a/configs/horizon/aarch64-horizon.installfile b/configs/horizon/aarch64-horizon.installfile index 6bc3a28..3192d19 100644 --- a/configs/horizon/aarch64-horizon.installfile +++ b/configs/horizon/aarch64-horizon.installfile @@ -1,11 +1,2 @@ -# System Installation -pkginstall horizon horizon-qt5 horizon-boot xorg-drivers xorg-server ttf-liberation xsetroot - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - +inherit horizon.installfile inherit ../arch/aarch64.installfile diff --git a/configs/horizon/armv7-horizon.installfile b/configs/horizon/armv7-horizon.installfile index 3aad763..e801d9d 100644 --- a/configs/horizon/armv7-horizon.installfile +++ b/configs/horizon/armv7-horizon.installfile @@ -1,11 +1,2 @@ -# System Installation -pkginstall horizon horizon-qt5 horizon-boot xorg-drivers xorg-server ttf-liberation xsetroot - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - +inherit horizon.installfile inherit ../arch/armv7.installfile diff --git a/configs/horizon/firmware.installfile b/configs/horizon/firmware.installfile new file mode 100644 index 0000000..0b91d7b --- /dev/null +++ b/configs/horizon/firmware.installfile @@ -0,0 +1,4 @@ +firmware true + +signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac04808.rsa.pub +signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac0b300.rsa.pub diff --git a/configs/horizon/horizon.installfile b/configs/horizon/horizon.installfile new file mode 100644 index 0000000..07c2f61 --- /dev/null +++ b/configs/horizon/horizon.installfile @@ -0,0 +1,9 @@ +# System Installation +pkginstall horizon horizon-qt5 horizon-boot xorg-drivers xorg-server ttf-liberation xsetroot + +# Start X on boot, if possible. +svcenable udev boot +svcenable udev-trigger boot +svcenable elogind +svcenable sddm +svcenable wpa_supplicant diff --git a/configs/horizon/pmmx-horizon-fw.installfile b/configs/horizon/pmmx-horizon-fw.installfile index 580c61e..485b190 100644 --- a/configs/horizon/pmmx-horizon-fw.installfile +++ b/configs/horizon/pmmx-horizon-fw.installfile @@ -1,6 +1,2 @@ -firmware true - -signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac04808.rsa.pub -signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac0b300.rsa.pub - +inherit firmware.installfile inherit pmmx-horizon.installfile diff --git a/configs/horizon/pmmx-horizon.installfile b/configs/horizon/pmmx-horizon.installfile index 956843b..e99e009 100644 --- a/configs/horizon/pmmx-horizon.installfile +++ b/configs/horizon/pmmx-horizon.installfile @@ -1,11 +1,2 @@ -# System Installation -pkginstall horizon horizon-qt5 horizon-boot xorg-drivers xorg-server ttf-liberation xsetroot - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - +inherit horizon.installfile inherit ../arch/pmmx.installfile diff --git a/configs/horizon/ppc-horizon-fw.installfile b/configs/horizon/ppc-horizon-fw.installfile index e462b44..04147f5 100644 --- a/configs/horizon/ppc-horizon-fw.installfile +++ b/configs/horizon/ppc-horizon-fw.installfile @@ -1,6 +1,2 @@ -firmware true - -signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac04808.rsa.pub -signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac0b300.rsa.pub - +inherit firmware.installfile inherit ppc-horizon.installfile diff --git a/configs/horizon/ppc-horizon.installfile b/configs/horizon/ppc-horizon.installfile index a0f2ec2..3016182 100644 --- a/configs/horizon/ppc-horizon.installfile +++ b/configs/horizon/ppc-horizon.installfile @@ -1,11 +1,2 @@ -# System Installation -pkginstall horizon horizon-qt5 horizon-boot xorg-drivers xorg-server ttf-liberation xsetroot - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - +inherit horizon.installfile inherit ../arch/ppc.installfile diff --git a/configs/horizon/ppc64-horizon-fw.installfile b/configs/horizon/ppc64-horizon-fw.installfile index d4dea36..6eca7ca 100644 --- a/configs/horizon/ppc64-horizon-fw.installfile +++ b/configs/horizon/ppc64-horizon-fw.installfile @@ -1,6 +1,2 @@ -firmware true - -signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac04808.rsa.pub -signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac0b300.rsa.pub - +inherit firmware.installfile inherit ppc64-horizon.installfile diff --git a/configs/horizon/ppc64-horizon.installfile b/configs/horizon/ppc64-horizon.installfile index e9cd27f..e64d4d6 100644 --- a/configs/horizon/ppc64-horizon.installfile +++ b/configs/horizon/ppc64-horizon.installfile @@ -1,11 +1,2 @@ -# System Installation -pkginstall horizon horizon-qt5 horizon-boot xorg-drivers xorg-server ttf-liberation xsetroot - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - +inherit horizon.installfile inherit ../arch/ppc64.installfile diff --git a/configs/horizon/x86_64-horizon-fw.installfile b/configs/horizon/x86_64-horizon-fw.installfile index 1b1795a..8814771 100644 --- a/configs/horizon/x86_64-horizon-fw.installfile +++ b/configs/horizon/x86_64-horizon-fw.installfile @@ -1,6 +1,2 @@ -firmware true - -signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac04808.rsa.pub -signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac0b300.rsa.pub - +inherit firmware.installfile inherit x86_64-horizon.installfile diff --git a/configs/horizon/x86_64-horizon.installfile b/configs/horizon/x86_64-horizon.installfile index 523cc8f..e610ada 100644 --- a/configs/horizon/x86_64-horizon.installfile +++ b/configs/horizon/x86_64-horizon.installfile @@ -1,11 +1,2 @@ -# System Installation -pkginstall horizon horizon-qt5 horizon-boot xorg-drivers xorg-server ttf-liberation xsetroot - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - +inherit horizon.installfile inherit ../arch/x86_64.installfile -- cgit v1.2.3-70-g09d2