diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2022-04-22 22:55:19 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2022-04-22 23:02:02 -0400 |
| commit | aa6da95c797fc1e208b5d6e79f7c7645132a3989 (patch) | |
| tree | b217fde239a1082eade3b515fe4a4a6f54b1a335 /libre/pacman | |
| parent | 87b0c9d42b2b716ae52bf40d308525ac81ed454e (diff) | |
| download | abslibre-aa6da95c797fc1e208b5d6e79f7c7645132a3989.tar.gz abslibre-aa6da95c797fc1e208b5d6e79f7c7645132a3989.tar.bz2 abslibre-aa6da95c797fc1e208b5d6e79f7c7645132a3989.zip | |
[pacman]: allow pacstrap to create cross-arch chroots
Diffstat (limited to 'libre/pacman')
| -rw-r--r-- | libre/pacman/PKGBUILD | 6 | ||||
| -rw-r--r-- | libre/pacman/pacman.conf.i686 | 2 | ||||
| -rw-r--r-- | libre/pacman/pacman.conf.x86_64 | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 7ff878a5d..e14770572 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -146,6 +146,12 @@ package() { for carch in "${arch[@]}"; do install -m644 "$srcdir/pacman.conf.$carch" "$pkgdir/usr/share/pacman/defaults/" install -m644 "$srcdir/makepkg.conf.$carch" "$pkgdir/usr/share/pacman/defaults/" + + # fix defaults 'Architecture' to one arch (allows pacstrap to create cross-arch chroots) + local pacman_conf="$pkgdir/usr/share/pacman/defaults/pacman.conf.$carch" + local err_msg="could not apply 'Architecture' patch to ${pacman_conf}" + sed -i 's|^Architecture = .*|Architecture = auto|' "${pacman_conf}" + grep -E '^Architecture = auto$' "${pacman_conf}" || ! echo "${err_msg}" done # Parabola's pacman began shipping a weekly job for this back in diff --git a/libre/pacman/pacman.conf.i686 b/libre/pacman/pacman.conf.i686 index 46c0dc077..bf9a8f6da 100644 --- a/libre/pacman/pacman.conf.i686 +++ b/libre/pacman/pacman.conf.i686 @@ -19,7 +19,7 @@ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -L -C - -f -o %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled -Architecture = i686 +Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64 index 9ac6985ff..035d88bf6 100644 --- a/libre/pacman/pacman.conf.x86_64 +++ b/libre/pacman/pacman.conf.x86_64 @@ -19,7 +19,7 @@ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -L -C - -f -o %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled -Architecture = x86_64 +Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = |