diff options
author | David P <megver83@parabola.nu> | 2021-06-30 16:22:12 -0400 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2021-07-05 16:57:40 -0400 |
commit | 47dd6e46e5bb03f6968d5f34e12434d0007c702e (patch) | |
tree | 2a60c531abd6af414796cbc899a54290862269b0 /configs | |
parent | 79b988553b2707aed9fba21dd53033a7a011af6f (diff) |
sync with archiso v54v54
Imported changes:
28ab118 (tag: v54) Add changelog for v54
9827cb1 ci: Use environment variables to override build settings
cde7296 ci: Consolidate build-host script
8e44a8b ci: consolidate build script
d0d4fa5 configs/releng/airootfs/etc/systemd/system/pacman-init.service: don't hardcode the keyrings
3678bba configs/releng/packages.x86_64: explicitly add wanted packages instead of relying on pulling them in as dependencies
bd2b861 configs/*: add VM guest packages and enable their services
f86cb0f ci: Expand parallel matrix with build modes
5630a23 ci: build based on buildmodes
6b11d7b mkarchiso: Also create package list for netboot
ace88aa Update project documentation related to netboot
4d1e898 docs: Add netboot to buildmodes documentation
d54bf63 mkarchiso: Add buildmode to export netboot artifacts
1fed84c Extend project overview with info on bootstrap images
1630d76 docs: Add documentation for buildmodes and bootstrap build mode
2cac539 mkarchiso: Implement buildmodes that allow building bootstrap images
535bc3c baseline: Add bootstrap packages file
b7fd696 baseline: Add buildmodes to profiledef.sh
6afa695 releng: Add buildmodes to profiledef.sh
9c84b7c releng: Add packages file for bootstrap image
2a07aa2 Increase timeout for initial prompt in build VM
4b14350 Use QEMU 6.x options
c58b44f Use QEMU 6.x options
Parabola changes:
* add dual architecture support for bootstrap buildmode by creating two separated tarballs
* sync openrc profiles with releng updates
* disable haveged initscript since we removed it from the packages list
* add speakup_soft kernel module in openrc profiles to make espeakup work
TODO:
* add braille support for GUI lxde-openrc (w/orca?)
NOTE: We don't have/use CI (Arch uses GitLab), so we don't import those changes
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'configs')
21 files changed, 40 insertions, 10 deletions
diff --git a/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service new file mode 120000 index 0000000..8e3ff80 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/qemu-guest-agent.service
\ No newline at end of file diff --git a/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service new file mode 120000 index 0000000..cb2d560 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/vboxservice.service
\ No newline at end of file diff --git a/configs/baseline/bootstrap_packages.x86_64 b/configs/baseline/bootstrap_packages.x86_64 new file mode 100644 index 0000000..64966d0 --- /dev/null +++ b/configs/baseline/bootstrap_packages.x86_64 @@ -0,0 +1,2 @@ +arch-install-scripts +base diff --git a/configs/baseline/packages.x86_64 b/configs/baseline/packages.x86_64 index 560143f..e9ab88d 100644 --- a/configs/baseline/packages.x86_64 +++ b/configs/baseline/packages.x86_64 @@ -6,4 +6,5 @@ linux-libre mkinitcpio mkinitcpio-parabolaiso openssh +qemu-guest-agent syslinux diff --git a/configs/baseline/profiledef.sh b/configs/baseline/profiledef.sh index b715404..f5b3ae5 100644 --- a/configs/baseline/profiledef.sh +++ b/configs/baseline/profiledef.sh @@ -7,6 +7,7 @@ iso_publisher="Parabola GNU/Linux-libre <https://parabola.nu>" iso_application="Parabola GNU/Linux-libre baseline" iso_version="$(date +%Y.%m.%d)" install_dir="parabola" +buildmodes=('iso') bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito') arch="x86_64" pacman_conf="pacman.conf" diff --git a/configs/lxde-openrc/airootfs/etc/local.d/pacman-init.start b/configs/lxde-openrc/airootfs/etc/local.d/pacman-init.start index 41c6166..60fdd4d 100755 --- a/configs/lxde-openrc/airootfs/etc/local.d/pacman-init.start +++ b/configs/lxde-openrc/airootfs/etc/local.d/pacman-init.start @@ -5,5 +5,5 @@ # Initializes Pacman keyring if ! find /etc/pacman.d/gnupg -mindepth 1 2>/dev/null | read -r; then pacman-key --init - pacman-key --populate archlinux archlinux32 parabola + pacman-key --populate fi diff --git a/configs/lxde-openrc/airootfs/etc/mkinitcpio.conf b/configs/lxde-openrc/airootfs/etc/mkinitcpio.conf index 02795f8..efbff15 100644 --- a/configs/lxde-openrc/airootfs/etc/mkinitcpio.conf +++ b/configs/lxde-openrc/airootfs/etc/mkinitcpio.conf @@ -7,7 +7,7 @@ # run. Advanced users may wish to specify all system modules # in this array. For instance: # MODULES=(piix ide_disk reiserfs) -MODULES=(loop) +MODULES=(loop speakup_soft) # BINARIES # This setting includes any additional binaries a given user may diff --git a/configs/lxde-openrc/airootfs/etc/runlevels/default/haveged b/configs/lxde-openrc/airootfs/etc/runlevels/default/haveged deleted file mode 120000 index 0ec5343..0000000 --- a/configs/lxde-openrc/airootfs/etc/runlevels/default/haveged +++ /dev/null @@ -1 +0,0 @@ -/etc/init.d/haveged
\ No newline at end of file diff --git a/configs/lxde-openrc/packages.both b/configs/lxde-openrc/packages.both index 3e697ab..3b6ecfd 100644 --- a/configs/lxde-openrc/packages.both +++ b/configs/lxde-openrc/packages.both @@ -2,14 +2,15 @@ # SPDX-License-Identifier: GPL-3.0-or-later #Base alsa-utils-openrc -archinstall arch-install-scripts +archinstall base bind-tools brltty-openrc btrfs-progs cloud-init crda +cryptsetup darkhttpd ddrescue dhclient @@ -18,6 +19,7 @@ diffutils dmraid dnsmasq dosfstools +e2fsprogs efibootmgr espeakup-openrc elogind @@ -33,9 +35,11 @@ gptfdisk grml-zsh-config hdparm-openrc irssi +iw iwd jfsutils kitty-terminfo +less lftp libfido2 libusb-compat @@ -75,11 +79,13 @@ partimage pcsclite ppp pptpclient +qemu-guest-agent reflector reiserfsprogs rp-pppoe rsync-openrc rxvt-unicode-terminfo +screen sdparm sg3_utils smartmontools diff --git a/configs/lxde-openrc/profiledef.sh b/configs/lxde-openrc/profiledef.sh index 31a505c..632a00c 100644 --- a/configs/lxde-openrc/profiledef.sh +++ b/configs/lxde-openrc/profiledef.sh @@ -11,6 +11,7 @@ iso_publisher="Parabola GNU/Linux-libre <https://parabola.nu>" iso_application="Parabola GNU/Linux-libre Live/Rescue CD" iso_version="$(date +%Y.%m.%d)" install_dir="parabola" +buildmodes=('iso') bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.refind.esp' 'uefi-x64.refind.eltorito') arch="dual" pacman_conf="pacman.conf" diff --git a/configs/releng-openrc/airootfs/etc/local.d/pacman-init.start b/configs/releng-openrc/airootfs/etc/local.d/pacman-init.start index 41c6166..60fdd4d 100755 --- a/configs/releng-openrc/airootfs/etc/local.d/pacman-init.start +++ b/configs/releng-openrc/airootfs/etc/local.d/pacman-init.start @@ -5,5 +5,5 @@ # Initializes Pacman keyring if ! find /etc/pacman.d/gnupg -mindepth 1 2>/dev/null | read -r; then pacman-key --init - pacman-key --populate archlinux archlinux32 parabola + pacman-key --populate fi diff --git a/configs/releng-openrc/airootfs/etc/mkinitcpio.conf b/configs/releng-openrc/airootfs/etc/mkinitcpio.conf index 02795f8..efbff15 100644 --- a/configs/releng-openrc/airootfs/etc/mkinitcpio.conf +++ b/configs/releng-openrc/airootfs/etc/mkinitcpio.conf @@ -7,7 +7,7 @@ # run. Advanced users may wish to specify all system modules # in this array. For instance: # MODULES=(piix ide_disk reiserfs) -MODULES=(loop) +MODULES=(loop speakup_soft) # BINARIES # This setting includes any additional binaries a given user may diff --git a/configs/releng-openrc/airootfs/etc/runlevels/default/haveged b/configs/releng-openrc/airootfs/etc/runlevels/default/haveged deleted file mode 120000 index 0ec5343..0000000 --- a/configs/releng-openrc/airootfs/etc/runlevels/default/haveged +++ /dev/null @@ -1 +0,0 @@ -/etc/init.d/haveged
\ No newline at end of file diff --git a/configs/releng-openrc/bootstrap_packages.both b/configs/releng-openrc/bootstrap_packages.both new file mode 100644 index 0000000..64966d0 --- /dev/null +++ b/configs/releng-openrc/bootstrap_packages.both @@ -0,0 +1,2 @@ +arch-install-scripts +base diff --git a/configs/releng-openrc/packages.both b/configs/releng-openrc/packages.both index 4742487..392e1ef 100644 --- a/configs/releng-openrc/packages.both +++ b/configs/releng-openrc/packages.both @@ -1,14 +1,15 @@ # # SPDX-License-Identifier: GPL-3.0-or-later alsa-utils-openrc -archinstall arch-install-scripts +archinstall base bind-tools brltty-openrc btrfs-progs cloud-init crda +cryptsetup darkhttpd ddrescue dhclient @@ -17,6 +18,7 @@ diffutils dmraid dnsmasq dosfstools +e2fsprogs efibootmgr espeakup-openrc elogind @@ -32,9 +34,11 @@ gptfdisk grml-zsh-config hdparm-openrc irssi +iw iwd jfsutils kitty-terminfo +less lftp libfido2 libusb-compat @@ -74,11 +78,13 @@ partimage pcsclite ppp pptpclient +qemu-guest-agent reflector reiserfsprogs rp-pppoe rsync-openrc rxvt-unicode-terminfo +screen sdparm sg3_utils smartmontools diff --git a/configs/releng-openrc/profiledef.sh b/configs/releng-openrc/profiledef.sh index 1d01d56..fe657de 100644 --- a/configs/releng-openrc/profiledef.sh +++ b/configs/releng-openrc/profiledef.sh @@ -7,6 +7,7 @@ iso_publisher="Parabola GNU/Linux-libre <https://parabola.nu>" iso_application="Parabola GNU/Linux-libre Live/Rescue CD" iso_version="$(date +%Y.%m.%d)" install_dir="parabola" +buildmodes=('iso') bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.refind.esp' 'uefi-x64.refind.eltorito') arch="dual" pacman_conf="pacman.conf" diff --git a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service new file mode 120000 index 0000000..8e3ff80 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/qemu-guest-agent.service
\ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/pacman-init.service b/configs/releng/airootfs/etc/systemd/system/pacman-init.service index 28d4398..f446a80 100644 --- a/configs/releng/airootfs/etc/systemd/system/pacman-init.service +++ b/configs/releng/airootfs/etc/systemd/system/pacman-init.service @@ -10,7 +10,7 @@ After=etc-pacman.d-gnupg.mount Type=oneshot RemainAfterExit=yes ExecStart=/usr/bin/pacman-key --init -ExecStart=/usr/bin/pacman-key --populate parabola archlinux archlinux32 +ExecStart=/usr/bin/pacman-key --populate [Install] WantedBy=multi-user.target diff --git a/configs/releng/bootstrap_packages.both b/configs/releng/bootstrap_packages.both new file mode 100644 index 0000000..64966d0 --- /dev/null +++ b/configs/releng/bootstrap_packages.both @@ -0,0 +1,2 @@ +arch-install-scripts +base diff --git a/configs/releng/packages.both b/configs/releng/packages.both index d1c59ca..48c48e6 100644 --- a/configs/releng/packages.both +++ b/configs/releng/packages.both @@ -1,14 +1,15 @@ # # SPDX-License-Identifier: GPL-3.0-or-later alsa-utils -archinstall arch-install-scripts +archinstall base bind-tools brltty btrfs-progs cloud-init crda +cryptsetup darkhttpd ddrescue dhclient @@ -17,6 +18,7 @@ diffutils dmraid dnsmasq dosfstools +e2fsprogs efibootmgr espeakup ethtool @@ -31,9 +33,11 @@ gptfdisk grml-zsh-config hdparm irssi +iw iwd jfsutils kitty-terminfo +less lftp libfido2 libusb-compat @@ -71,11 +75,13 @@ partimage pcsclite ppp pptpclient +qemu-guest-agent reflector reiserfsprogs rp-pppoe rsync rxvt-unicode-terminfo +screen sdparm sg3_utils smartmontools diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh index 5ad616e..8ca837f 100644 --- a/configs/releng/profiledef.sh +++ b/configs/releng/profiledef.sh @@ -7,6 +7,7 @@ iso_publisher="Parabola GNU/Linux-libre <https://parabola.nu>" iso_application="Parabola GNU/Linux-libre Live/Rescue CD" iso_version="$(date +%Y.%m.%d)" install_dir="parabola" +buildmodes=('iso') bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito') arch="dual" pacman_conf="pacman.conf" |