From a03babbaec0a986c6801576d0dbf3a567309f69c Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 7 Dec 2023 19:30:25 -0500 Subject: [PATCH 1/2] Build for Alpine v3.19 --- .gitlab-ci.yml | 8 ++++---- builder.conf | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3776a47..f544914 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,10 +33,10 @@ variables: tags: - qubes-template -verify-alpine318: +verify-alpine319: extends: .verify variables: - CI_ALPINE_TARGET_RELEASE: alpine318 + CI_ALPINE_TARGET_RELEASE: alpine319 .build: stage: build @@ -75,10 +75,10 @@ verify-alpine318: tags: - qubes-template -build-alpine318: +build-alpine319: extends: .build variables: - CI_ALPINE_TARGET_RELEASE: alpine318 + CI_ALPINE_TARGET_RELEASE: alpine319 release: stage: release diff --git a/builder.conf b/builder.conf index e6f821c..0d5a3a0 100644 --- a/builder.conf +++ b/builder.conf @@ -23,7 +23,7 @@ GIT_PREFIX := QubesOS/qubes- # DISTS_VM - Choose the templates to build. Multiple templates can be defined # to build. Uncomment tempalte dist to build. -DISTS_VM := alpine318 +DISTS_VM := alpine319 COMPONENTS += builder-alpine BUILDER_PLUGINS += builder-alpine -- 2.45.2 From 71d97c1e9853384c14f1c7d2de7ea0b486c162f5 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 7 Dec 2023 20:16:14 -0500 Subject: [PATCH 2/2] scripts/04_install_qubes.sh: setup lo device --- scripts/04_install_qubes.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/04_install_qubes.sh b/scripts/04_install_qubes.sh index 1e69f66..bbeffbe 100755 --- a/scripts/04_install_qubes.sh +++ b/scripts/04_install_qubes.sh @@ -79,6 +79,13 @@ echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt220" >> "$INSTALLDIR"/etc/initt # create /lib/modules for qubes-kernel module mount "${TEMPLATE_CONTENT_DIR}/alpine-chroot" "$INSTALLDIR" mkdir /lib/modules +# lo device +cat > "${INSTALLDIR}/etc/network/interfaces" <