Merge branch 'devtools-1.0.0' into 'master'

Adjust the path to "pacman-extra.conf" for devtools>=1.0.0

See merge request archlinux/archlinux-docker!74
This commit is contained in:
hashworks 2023-05-26 20:09:51 +00:00
commit c2f9a8ac85

View File

@ -7,7 +7,7 @@ define rootfs
find /usr/share/libalpm/hooks -exec ln -sf /dev/null $(BUILDDIR)/alpm-hooks{} \;
mkdir -vp $(BUILDDIR)/var/lib/pacman/ $(OUTPUTDIR)
install -Dm644 /usr/share/devtools/pacman-extra.conf $(BUILDDIR)/etc/pacman.conf
install -Dm644 /usr/share/devtools/pacman.conf.d/extra.conf $(BUILDDIR)/etc/pacman.conf
cat pacman-conf.d-noextract.conf >> $(BUILDDIR)/etc/pacman.conf
fakechroot -- fakeroot -- pacman -Sy -r $(BUILDDIR) \