From: Eli Schwartz <eschwartz@archlinux.org>
To: ~sircmpwn/sr.ht-dev@lists.sr.ht
Subject: [PATCH builds.sr.ht] Revert "images/archlinux: skip compression for makepkg"
Date: Mon, 25 Oct 2021 15:08:43 -0400
Message-Id: <20211025190843.1346348-1-eschwartz@archlinux.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

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 <eschwartz@archlinux.org>
---
 images/archlinux/genimg | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/images/archlinux/genimg b/images/archlinux/genimg
index 36a12c2..b5bc11a 100755
--- a/images/archlinux/genimg
+++ b/images/archlinux/genimg
@@ -119,10 +119,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.33.1