Manual merge of version 2.0.6-1+rpi1 and 2.0.7-1 to produce 2.0.7-1+rpi1

diff --cc debian/changelog
index c4e1eb88e985cba119461e891a7a511f4f9fc149,b6d05be88069d6be6f30d1e8097e3aae16333b3b..1d691176e515b5fa95deb7efd503c108862c842c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,33 +1,40 @@@
- klibc (2.0.6-1+rpi1) buster-staging; urgency=medium
++klibc (2.0.7-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2.0.4-2+rpi1 by Peter Michael Green <plugwash@p10link.net> at Wed, 26 Nov 2014 22:01:00 +0000]
 +  * Change compiler settings to values suitable for raspberry pi
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 07 Feb 2019 14:05:02 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 15 Oct 2019 13:14:45 +0000
++
+ klibc (2.0.7-1) unstable; urgency=medium
+ 
+   [ Ben Hutchings ]
+   * New upstream version:
+     - klcc: Enable stripping even if CONFIG_DEBUG_INFO is enabled
+     - run-init: Allow the initramfs to be persisted across root changes
+       (thanks to Matthew Garrett)
+     - ipconfig: Implement support -d ...:dns0:dns1 options (Closes: #931416)
+     - Kbuild: Work around broken "ar s" in binutils 2.32 (see #941921)
+   * debian/rules: Reorganise make flags variables
+   * debian/rules: Define ARCH for klibc, for all architectures
+   * debian/rules: Delete redundant architecture mappings
+   * debian/rules: Delete redundant export
+   * klibc-utils: Trigger update-initramfs on install/upgrade
+   * initramfs-tools: Don't install commands that already exist in /sbin
+   * initramfs-tools: Exclude kinit and zcat commands earlier
+   * initramfs-tools: Exclude gzip command
+   * Drop "resume: Backward compatibility for resume_offset", which will
+     not be needed in the next release
+   * [klibc] fstype: Drop obsolete support for "ext4dev" (Closes: #932926)
+   * debian/control: Set Maintainer to Debian Kernel Team; move maks to
+     Uploaders
+ 
+   [ James Clarke ]
+   * debian/control: Restrict m4 build dependency to just sparc
+ 
+   [ Helmut Grohne ]
+   * Honour DEB_BUILD_OPTIONS=nocheck. (Closes: #922814)
+ 
+  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 08 Oct 2019 02:14:11 +0100
  
  klibc (2.0.6-1) unstable; urgency=medium
  

diff --cc debian/rules
index 237507329e066cc0a5dafc9fbcadf50de4db6990,714d3fe63c6690975d762c85849fe2210ad0617b..2f278298a4ca4bd13c4690fa3f1b2044f8d5bb95
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -4,55 -4,34 +4,34 @@@
  #export DH_VERBOSE=1
  
  include /usr/share/dpkg/architecture.mk
- export DEB_HOST_MULTIARCH
  
+ # klibc architecture names mostly match Debian CPU names.  This is
+ # overrridden as necessary.
+ KLIBCARCH := $(patsubst %el,%,$(DEB_HOST_ARCH_CPU))
+ 
+ ifneq (,$(filter amd64 x32,$(DEB_HOST_ARCH)))
+ KLIBCARCH := x86_64
+ endif
  ifeq ($(DEB_HOST_ARCH),armel)
- DEB_MAKE_ENVVARS := ARCH=arm CONFIG_AEABI=y
+ KLIBC_MAKEFLAGS := CONFIG_AEABI=y
  endif
  ifeq ($(DEB_HOST_ARCH),armhf)
- DEB_MAKE_ENVVARS := ARCH=arm CONFIG_AEABI=y CPU_ARCH=armv6 CPU_TUNE=arm1176jzf-s CONFIG_KLIBC_THUMB=n
- endif
- ifeq ($(DEB_HOST_ARCH),ia64)
- DEB_MAKE_ENVVARS := ARCH=ia64
- endif
- ifeq ($(DEB_HOST_ARCH),i386)
- DEB_MAKE_ENVVARS := ARCH=i386
- endif
- ifeq ($(DEB_HOST_ARCH),sparc)
- DEB_MAKE_ENVVARS := ARCH=sparc
- endif
- ifeq ($(DEB_HOST_ARCH),sparc64)
- DEB_MAKE_ENVVARS := ARCH=sparc64
 -KLIBC_MAKEFLAGS := CONFIG_AEABI=y CPU_ARCH=armv7-a CPU_TUNE=cortex-a8 CONFIG_KLIBC_THUMB=y
++KLIBC_MAKEFLAGS := CONFIG_AEABI=y CPU_ARCH=armv6 CPU_TUNE=arm1176jzf-s CONFIG_KLIBC_THUMB=n
  endif
- ifeq ($(DEB_HOST_ARCH),s390)
- DEB_MAKE_ENVVARS := ARCH=s390
- endif
- ifeq ($(DEB_HOST_ARCH),s390x)
- DEB_MAKE_ENVVARS := ARCH=s390x
+ ifeq ($(DEB_HOST_ARCH),hppa)
+ KLIBCARCH := parisc
  endif
  ifneq (,$(filter powerpc%,$(DEB_HOST_ARCH)))
- DEB_MAKE_ENVVARS := ARCH=ppc
- endif
- ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH)))
- DEB_MAKE_ENVVARS := ARCH=mips
- endif
- ifneq (,$(filter mips64 mips64el,$(DEB_HOST_ARCH)))
- DEB_MAKE_ENVVARS := ARCH=mips64
+ KLIBCARCH := ppc
  endif
  ifeq ($(DEB_HOST_ARCH),sh4)
- DEB_MAKE_ENVVARS := ARCH=sh
- endif
- ifneq (,$(filter ppc64%,$(DEB_HOST_ARCH)))
- DEB_MAKE_ENVVARS := ARCH=ppc64
- endif
- ifeq ($(DEB_HOST_ARCH),riscv64)
- DEB_MAKE_ENVVARS := ARCH=riscv64
+ KLIBCARCH := sh
  endif
  
- DEB_MAKE_ENVVARS := INSTALLROOT=debian/tmp $(DEB_MAKE_ENVVARS)
+ KLIBC_MAKEFLAGS := INSTALLROOT=debian/tmp ARCH=$(KLIBCARCH) $(KLIBC_MAKEFLAGS)
  
  ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-     DEB_MAKE_ENVVARS += CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
+     KLIBC_MAKEFLAGS += CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
  endif