forge/qubes-builder-alpine
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases 12 Packages Wiki Activity Actions

fix typo in patch
Some checks failed
/ build-test (pull_request) Failing after 10m18s
Details

Browse source
This commit is contained in:
Antoine Martin 2024-08-21 14:01:30 -04:00
parent 3e94341f43
commit 5f4c56c034
Signed by: forge
GPG key ID: D62A472A4AA7D541
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.forgejo/patches/linux-template-builder_use-fuse.patch
View file

@ -83,7 +83,7 @@ index 6334879..de1a2af 100755
exit ${RETCODE} exit ${RETCODE}
diff --git a/qubeize_image b/qubeize_image diff --git a/qubeize_image b/qubeize_image
index 19c37cb..7478a9d 100755 index 19c37cb..9e5179d 100755
--- a/qubeize_image --- a/qubeize_image
+++ b/qubeize_image +++ b/qubeize_image
@@ -13,6 +13,8 @@ export CLEANIMG="$1" @@ -13,6 +13,8 @@ export CLEANIMG="$1"
@ -131,7 +131,7 @@ index 19c37cb..7478a9d 100755
fi fi
udevadm settle --exit-if-exists="$IMG_DEV" udevadm settle --exit-if-exists="$IMG_DEV"
-mount "$IMG_DEV" mnt || exit 1 -mount "$IMG_DEV" mnt || exit 1
+if "$TEMPLATE_USE_FUSE" -eq 1 ]; then +if [ "$TEMPLATE_USE_FUSE" -eq 1 ]; then
+ fuse2fs "$IMG_DEV" mnt + fuse2fs "$IMG_DEV" mnt
+else +else
+ mount "$IMG_DEV" mnt || exit 1 + mount "$IMG_DEV" mnt || exit 1
@ -150,3 +150,12 @@ index 19c37cb..7478a9d 100755
echo "Qubeized image stored at: $IMG" echo "Qubeized image stored at: $IMG"
diff --git a/templates.spec b/templates.spec
index e1a82e9..210ef57 100644
--- a/templates.spec
+++ b/templates.spec
@@ -193,3 +193,4 @@ rm -rf $RPM_BUILD_ROOT
%attr (664,root,qubes) %{dest_dir}/vm-whitelisted-appmenus.list
%attr (664,root,qubes) %{dest_dir}/netvm-whitelisted-appmenus.list
%attr (664,root,qubes) %{dest_dir}/template.conf
+%define _arch x86_64