From ffd47f737e7ab2123f15df9effd2601fbb832554 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 7 Aug 2023 17:12:42 +0100 Subject: [PATCH] Use the in-tree mirrorlist Currently we use the system mirrorlist for the pacman invocation. The system config may or may not be identical to the in-tree one - as one of my dev machines was kind enough to remind me. The tooling should be self-contained and leak as few builder specific as possible. Signed-off-by: Emil Velikov --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 86b5714..38c8e37 100644 --- a/Makefile +++ b/Makefile @@ -10,9 +10,11 @@ define rootfs install -Dm644 /usr/share/devtools/pacman.conf.d/extra.conf $(BUILDDIR)/etc/pacman.conf cat pacman-conf.d-noextract.conf >> $(BUILDDIR)/etc/pacman.conf + sed 's/Include = /&rootfs/g' < $(BUILDDIR)/etc/pacman.conf > pacman.conf + fakechroot -- fakeroot -- pacman -Sy -r $(BUILDDIR) \ --noconfirm --dbpath $(BUILDDIR)/var/lib/pacman \ - --config $(BUILDDIR)/etc/pacman.conf \ + --config pacman.conf \ --noscriptlet \ --hookdir $(BUILDDIR)/alpm-hooks/usr/share/libalpm/hooks/ $(2)