From 47dd6e46e5bb03f6968d5f34e12434d0007c702e Mon Sep 17 00:00:00 2001 From: David P Date: Wed, 30 Jun 2021 16:22:12 -0400 Subject: sync with archiso v54 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 --- .../system/multi-user.target.wants/qemu-guest-agent.service | 1 + configs/releng/airootfs/etc/systemd/system/pacman-init.service | 2 +- configs/releng/bootstrap_packages.both | 2 ++ configs/releng/packages.both | 8 +++++++- configs/releng/profiledef.sh | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) create mode 120000 configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service create mode 100644 configs/releng/bootstrap_packages.both (limited to 'configs/releng') 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 " 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" -- cgit v1.2.2