From 1dc0984821f7ab55ceb899072daf0eadb50e550d Mon Sep 17 00:00:00 2001 From: Johannes 'josch' Schauer Date: Wed, 24 Jun 2020 09:34:34 +0200 Subject: [PATCH] Revert "remove libgcc1 for libc6 >= 2.30-2" -- situation in debootstrap is fixed This reverts commit a91d7440cb778bffdc39a6be895a852f3f134524. --- coverage.sh | 9 --------- make_mirror.sh | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/coverage.sh b/coverage.sh index 47b27a4..3992b12 100755 --- a/coverage.sh +++ b/coverage.sh @@ -131,15 +131,6 @@ tar --xattrs --xattrs-include='*' -C /tmp/debian-$dist-mm -xf /tmp/debian-$dist- mkdir /tmp/debian-$dist-debootstrap tar --xattrs --xattrs-include='*' -C /tmp/debian-$dist-debootstrap -xf "cache/debian-$dist-$variant.tar" -# The buildd variant of debootstrap will install libgcc-s1 *and* libgcc1 even -# though the former provides the latter. Remove the latter manually. -if [ "$variant" = "buildd" ] \ - && chroot /tmp/debian-$dist-debootstrap dpkg -s libgcc-s1 2>&1 | grep --quiet '^Status: install ok installed$' \ - && chroot /tmp/debian-$dist-debootstrap dpkg -s libgcc1 2>&1 | grep --quiet '^Status: install ok installed$' \ - && dpkg --compare-versions "\$(chroot /tmp/debian-$dist-debootstrap dpkg -s libc6 | grep '^Version:' | cut -d ' ' -f 2)" ge 2.30-2; then - chroot /tmp/debian-$dist-debootstrap dpkg --remove libgcc1 -fi - # diff cannot compare device nodes, so we use tar to do that for us and then # delete the directory tar -C /tmp/debian-$dist-debootstrap -cf dev1.tar ./dev diff --git a/make_mirror.sh b/make_mirror.sh index 630047d..95480d4 100755 --- a/make_mirror.sh +++ b/make_mirror.sh @@ -239,7 +239,7 @@ END --or --field=Priority important --or --field=Priority standard \ --or --field=Package build-essential \) ) - pkgs="$(echo $pkgs) build-essential busybox gpg libgcc1" + pkgs="$(echo $pkgs) build-essential busybox gpg" APT_CONFIG="$rootdir/etc/apt/apt.conf" apt-get --yes install $pkgs