From 10512a9913086369c0d3ecf731738051b83282bc Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sun, 28 Aug 2022 23:36:53 -0400 Subject: revert emergency chroot packages --- src/chroot-tools/chcleanup.in | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/chroot-tools/chcleanup.in b/src/chroot-tools/chcleanup.in index 784afb0..79c9664 100644 --- a/src/chroot-tools/chcleanup.in +++ b/src/chroot-tools/chcleanup.in @@ -73,19 +73,6 @@ WHITELIST_PKGS=() # DEBUG: normally empty - allowed outdated packages, possibly PHANTOM_PKGS=() # DEBUG: normally empty - fake dependencies, possibly insane PHANTOM_PKGS=( ${PHANTOM_PKGS[*]/#/--assume-installed=} ) -# FIXME: ARM chroots require 'fakeroot-tcp' (BR #2775) -fakeroot_pkg=fakeroot$( [[ "$(uname -m)" == 'armv7l' ]] && echo '-tcp' ) -CHROOTPKG=( ${CHROOTPKG[*]/fakeroot/${fakeroot_pkg}/} ) - -# FIXME: host<->chroot glibc mismatch -WHITELIST_PKGS+=( glibc-linux4 ) # BR #3038 -# $ wget https://repo.archlinuxcn.org/x86_64/glibc-linux4-2.33-4-x86_64.pkg.tar.zst.sig -# $ wget https://repo.archlinuxcn.org/x86_64/glibc-linux4-2.33-4-x86_64.pkg.tar.zst -# $ pacman-key --verify glibc-linux4-2.33-4-x86_64.pkg.tar.zst.sig -# $ sudo librechroot -n autobuilder install-file glibc-linux4-2.33-4-x86_64.pkg.tar.zst -# $ sudo cp glibc-linux4-2.33-4-x86_64.pkg.tar.zst* /var/lib/archbuild/autobuilder/bill-auger/ -# $ sudo librechroot -n autobuilder enter - # If we're running makepkg if [[ -f ./PKGBUILD ]]; then if [[ ! -f ./.SRCINFO || ./PKGBUILD -nt ./.SRCINFO ]]; then -- cgit v1.2.2