From 9175cd35622e42c66f962acc0088a3a103186be8 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 25 Oct 2021 15:08:43 -0400 Subject: [PATCH] Revert "images/archlinux: skip compression for makepkg" This reverts commit 73b24a385c95ef2df0d18bff1545980e9fc6f35c. This affects packages which are built and uploaded in a builds.sr.ht job, not just packages which are built as a side effect of installing AUR packages in the job setup. In commit e6d7370899cfc125ff7db7c61a31c52fa9049b0a the compression for installing AUR packages in the job setup, was already disabled, using the same method as this commit performed but scoped only to `yay -Syu`. To quote the commit message: "This patch has no effect on any makepkg run by the user in its build script after the install() step ends." which I think is a reasonable approach to take. Signed-off-by: Eli Schwartz --- images/archlinux/genimg | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/images/archlinux/genimg b/images/archlinux/genimg index f033518..a1387c9 100755 --- a/images/archlinux/genimg +++ b/images/archlinux/genimg @@ -117,10 +117,7 @@ initrd initramfs-linux.img append root=/dev/vda2 rw quiet EOF -cat >> "$root"/etc/makepkg.conf <<- EOF -makeopts=(--skippgpcheck) -PKGEXT='.pkg.tar' -EOF +echo "makeopts=(--skippgpcheck)" >> $root/etc/makepkg.conf run_normal curl -O https://aur.archlinux.org/cgit/aur.git/snapshot/yay.tar.gz run_normal tar xf yay.tar.gz -- 2.38.5