Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZTS: Add archlinux #16816

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ZTS: Add archlinux #16816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12a0cb9
ZTS: Install more packages on Arch Linux
Kaz205 Nov 26, 2024
f92ffba
ZTS: Specify sysconfdir
Kaz205 Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/scripts/qemu-3-deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function archlinux() {
sudo pacman -Sy --noconfirm base-devel bc cpio cryptsetup dhclient dkms \
fakeroot fio gdb inetutils jq less linux linux-headers lsscsi nfs-utils \
parted pax perf python-packaging python-setuptools qemu-guest-agent ksh \
samba sysstat rng-tools rsync wget xxhash
samba sysstat rng-tools rsync wget words xxhash xfsprogs
echo "##[endgroup]"
}

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/scripts/qemu-4-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ function linux() {
--prefix=/usr \
--enable-pyzfs \
--enable-debug \
--enable-debuginfo
--enable-debuginfo \
--sysconfdir=/etc
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed on Arch but not elsewhere?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the configs get installed to /usr/etc/zfs instead of /etc/zfs.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good and should be applied I think.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Untested, but I would suggest:

diff --git a/.github/workflows/scripts/qemu-4-build.sh b/.github/workflows/scripts/qemu-4-build.sh
index 955f605f5..a4335fb63 100755
--- a/.github/workflows/scripts/qemu-4-build.sh
+++ b/.github/workflows/scripts/qemu-4-build.sh
@@ -47,6 +47,7 @@ function freebsd() {
 }
 
 function linux() {
+  EXTRA_CONFIG="${1:-}"
   echo "##[group]Autogen.sh"
   run ./autogen.sh
   echo "##[endgroup]"
@@ -56,7 +57,7 @@ function linux() {
     --prefix=/usr \
     --enable-pyzfs \
     --enable-debug \
-    --enable-debuginfo
+    --enable-debuginfo $EXTRA_CONFIG
   echo "##[endgroup]"
 
   echo "##[group]Build"
@@ -139,6 +140,9 @@ case "$1" in
   debian*|ubuntu*)
     deb_build_and_install
     ;;
+  arch*)
+    linux "--sysconfdir=/etc --enable-linux-experimental"
+    ;;
   *)
     linux
     ;;

echo "##[endgroup]"

echo "##[group]Build"
Expand Down
Loading