Manual merge of version 80+deb9u2+rpi1 and 80+deb9u4 to produce 80+deb9u4+rpi1

diff --cc debian/changelog
index 82da57b47995c23cb7b320e025cdf7b0ce262463,0c66c8c21d3900a22b769a579b8c4a0a0e77dc16..7b6f19390fee1f270240cdda9e64f45744bf8f8b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,14 +1,40 @@@
- linux-latest (80+deb9u2+rpi1) stretch-staging; urgency=medium
++linux-latest (80+deb9u4+rpi1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 63+rpi1 by Peter Micheal Green  <plugwash@raspbian.org> at Mon, 01 Dec 2014 01:01:17 +0000]
 +  * Regenerate control files to build for rpi flavour rather than
 +    armmp and armmp-lpae flavours
 +  * add -rpi-rpfv packages for kernel packages based on the raspberry pi
 +    foundations reccomended kernel version.
 +  * Hack the control generation script so the above packages are versioned
 +    appropriately (note: this will break versioning for other "extra packages",
 +    there are no other "extra packages" in the current version but it's 
 +    something to be aware of in future)
 +
 +  [changes brought forward from 63+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sat, 14 Feb 2015 15:22:57 +0000]
 +  * Add rpi2-rpfv packages.
 +  * Clean up more stuff in clean target.
 +
 +  [changes introduced in 80+deb9u1+rpi1 by Peter Michael Green]
 +  * Work around side effects of linux source package rename.
 +    + Change path passed to debian/bin/gencontrol.py
 +    + Change build-dependency from linux-source-4.9 to linux-4.9-source-4.9
 + 
 +  [changes introduced in 80+deb9u2+rpi1 by Peter Michael Green]
 +  * Change rpf version to 4.9.0-4
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Oct 2017 17:26:35 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 05 Apr 2018 22:47:11 +0000
++
+ linux-latest (80+deb9u4) stretch-security; urgency=high
+ 
+   * Update to 4.9.0-6
+ 
+  -- Yves-Alexis Perez <corsac@debian.org>  Thu, 22 Feb 2018 08:32:44 +0100
+ 
+ linux-latest (80+deb9u3) stretch-security; urgency=high
+ 
+   * Update to 4.9.0-5
+ 
+  -- Salvatore Bonaccorso <carnil@debian.org>  Thu, 04 Jan 2018 12:57:17 +0100
  
  linux-latest (80+deb9u2) stretch; urgency=medium
  

diff --cc debian/control
index 2940d9ee25143220b6a332a29ac8b01add45135e,d19f14cd704c7bef25b8d0d89a2de629629a1ba9..eb2a16748cb3896ab7a1aa794e60e0bb76a0969a
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -4,7 -4,7 +4,7 @@@ Priority: optiona
  Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
  Uploaders: Bastian Blank <waldi@debian.org>, Frederik Schüler <fs@debian.org>, Ben Hutchings <ben@decadent.org.uk>
  Standards-Version: 3.9.8
- Build-Depends: debhelper (>= 9), linux-4.9-support-4.9.0-4, linux-headers-4.9.0-4-all
 -Build-Depends: debhelper (>= 9), linux-support-4.9.0-6, linux-headers-4.9.0-6-all
++Build-Depends: debhelper (>= 9), linux-4.9-support-4.9.0-6, linux-headers-4.9.0-6-all
  Vcs-Browser: https://anonscm.debian.org/cgit/kernel/linux-latest.git
  Vcs-Git: https://anonscm.debian.org/git/kernel/linux-latest.git
  
@@@ -176,51 -176,55 +176,51 @@@ Description: Debugging symbols for Linu
   This package depends on the detached debugging symbols for the latest
   Linux kernel marvell configuration.
  
 -Package: linux-image-armmp
 +Package: linux-image-rpi
  Architecture: armhf
- Provides: linux-latest-modules-4.9.0-4-rpi
- Depends: linux-image-4.9.0-4-rpi, ${misc:Depends}
 -Provides: linux-latest-modules-4.9.0-6-armmp
 -Depends: linux-image-4.9.0-6-armmp, ${misc:Depends}
 -Description: Linux for ARMv7 multiplatform compatible SoCs (meta-package)
++Provides: linux-latest-modules-4.9.0-6-rpi
++Depends: linux-image-4.9.0-6-rpi, ${misc:Depends}
 +Description: Linux for RaspberryPI (meta-package)
   This package depends on the latest Linux kernel and modules for use on
 - ARMv7 multiplatform kernel.  See
 - https://wiki.debian.org/DebianKernel/ARMMP for details of supported
 - platforms.
 + Raspberry PI.
  
 -Package: linux-headers-armmp
 +Package: linux-headers-rpi
  Architecture: armhf
- Depends: linux-headers-4.9.0-4-rpi, ${misc:Depends}
 -Depends: linux-headers-4.9.0-6-armmp, ${misc:Depends}
 -Description: Header files for Linux armmp configuration (meta-package)
++Depends: linux-headers-4.9.0-6-rpi, ${misc:Depends}
 +Description: Header files for Linux rpi configuration (meta-package)
   This package depends on the architecture-specific header files for the
 - latest Linux kernel armmp configuration.
 + latest Linux kernel rpi configuration.
  
 -Package: linux-image-armmp-dbg
 +Package: linux-image-rpi-dbg
  Architecture: armhf
  Provides: linux-latest-image-dbg
- Depends: linux-image-4.9.0-4-rpi-dbg, ${misc:Depends}
 -Depends: linux-image-4.9.0-6-armmp-dbg, ${misc:Depends}
 -Description: Debugging symbols for Linux armmp configuration (meta-package)
++Depends: linux-image-4.9.0-6-rpi-dbg, ${misc:Depends}
 +Description: Debugging symbols for Linux rpi configuration (meta-package)
   This package depends on the detached debugging symbols for the latest
 - Linux kernel armmp configuration.
 + Linux kernel rpi configuration.
  
 -Package: linux-image-armmp-lpae
 +Package: linux-image-rpi2
  Architecture: armhf
- Provides: linux-latest-modules-4.9.0-4-rpi2
- Depends: linux-image-4.9.0-4-rpi2, ${misc:Depends}
 -Provides: linux-latest-modules-4.9.0-6-armmp-lpae
 -Depends: linux-image-4.9.0-6-armmp-lpae, ${misc:Depends}
 -Description: Linux for ARMv7 multiplatform compatible SoCs supporting LPAE (meta-package)
++Provides: linux-latest-modules-4.9.0-6-rpi2
++Depends: linux-image-4.9.0-6-rpi2, ${misc:Depends}
 +Description: Linux for RaspberryPI2 (meta-package)
   This package depends on the latest Linux kernel and modules for use on
 - ARMv7 multiplatform kernel supporting LPAE. See
 - https://wiki.debian.org/DebianKernel/ARMMP for details of supported
 - platforms..
 + Raspberry PI 2.
  
 -Package: linux-headers-armmp-lpae
 +Package: linux-headers-rpi2
  Architecture: armhf
- Depends: linux-headers-4.9.0-4-rpi2, ${misc:Depends}
 -Depends: linux-headers-4.9.0-6-armmp-lpae, ${misc:Depends}
 -Description: Header files for Linux armmp-lpae configuration (meta-package)
++Depends: linux-headers-4.9.0-6-rpi2, ${misc:Depends}
 +Description: Header files for Linux rpi2 configuration (meta-package)
   This package depends on the architecture-specific header files for the
 - latest Linux kernel armmp-lpae configuration.
 + latest Linux kernel rpi2 configuration.
  
 -Package: linux-image-armmp-lpae-dbg
 +Package: linux-image-rpi2-dbg
  Architecture: armhf
  Provides: linux-latest-image-dbg
- Depends: linux-image-4.9.0-4-rpi2-dbg, ${misc:Depends}
 -Depends: linux-image-4.9.0-6-armmp-lpae-dbg, ${misc:Depends}
 -Description: Debugging symbols for Linux armmp-lpae configuration (meta-package)
++Depends: linux-image-4.9.0-6-rpi2-dbg, ${misc:Depends}
 +Description: Debugging symbols for Linux rpi2 configuration (meta-package)
   This package depends on the detached debugging symbols for the latest
 - Linux kernel armmp-lpae configuration.
 + Linux kernel rpi2 configuration.
  
  Package: linux-image-parisc
  Architecture: hppa

diff --cc debian/control.md5sum
index d8899fbf8b03fad2fba752033174b2e1edb2d256,de9dad20841576ae8d0620419a41e4de8c37b062..f6ef4accdeb5285954e50b39f419834f3b11a082
--- 1/debian/control.md5sum
--- 2/debian/control.md5sum
+++ b/debian/control.md5sum
@@@ -1,5 -1,5 +1,5 @@@
 -b342a78392cfedcf8ec17a063e48a33c  debian/bin/gencontrol.py
 -e3cfcfa7f410df4093eda5ef7dabb651  debian/changelog
 +fef3b5b9f931eb0c3f199bcf45dc9b19  debian/bin/gencontrol.py
- f20a9ffb00908e86a6c56e08df091146  debian/changelog
++055f1e78f78b116ee056a34765e83b33  debian/changelog
  e0d0ba88825ee8272918ca115601e1e3  debian/templates/control.image-dbg.latest.in
  8cf2ba1553c0ad410aeaf0c90a47a328  debian/templates/control.source.latest.in
  2bec21a63cd49ba2ee927d000d64c42d  debian/templates/control.headers.latest.in

diff --cc debian/linux-image-rpi.bug-presubj
index b249491731de5873867743386ab3cd57d4d94fbe,0000000000000000000000000000000000000000..bad9c1669a2f0824f5168fc5de10f4b5890625f0
mode 100644,000000..100644
--- 1/debian/linux-image-rpi.bug-presubj
--- /dev/null
+++ b/debian/linux-image-rpi.bug-presubj
@@@ -1,5 -1,0 +1,5 @@@
- the package name linux-image-4.9.0-4-rpi instead.
 +You are about to report a bug in a Linux kernel meta package.
 +This is probably not what you intended to do.
 +
 +If you want to report a bug in the Linux kernel or modules, you should use
++the package name linux-image-4.9.0-6-rpi instead.

diff --cc debian/linux-image-rpi2.bug-presubj
index 5b9ff9ce405b991ca214915f54a72179846bb442,0000000000000000000000000000000000000000..5f06b445ab71a43985938b35a3e8ad5f9fd1dcf7
mode 100644,000000..100644
--- 1/debian/linux-image-rpi2.bug-presubj
--- /dev/null
+++ b/debian/linux-image-rpi2.bug-presubj
@@@ -1,5 -1,0 +1,5 @@@
- the package name linux-image-4.9.0-4-rpi2 instead.
 +You are about to report a bug in a Linux kernel meta package.
 +This is probably not what you intended to do.
 +
 +If you want to report a bug in the Linux kernel or modules, you should use
++the package name linux-image-4.9.0-6-rpi2 instead.

diff --cc debian/rules.gen
index c255f0acf249c8a520d678a12c22b8789c3a5690,340e1a18d7888dea887f2ddf9620586ed321b663..146dd062c032e1e0b39779b43d0e23f344c7c090
--- 1/debian/rules.gen
--- 2/debian/rules.gen
+++ b/debian/rules.gen
@@@ -6,21 -6,23 +6,21 @@@ binary-arch_alpha_none_alpha-generic: b
  binary-arch_alpha_none_alpha-generic_real::
        ln -sf linux-image.NEWS debian/linux-image-alpha-generic.NEWS
        ln -sf linux-image.NEWS debian/linux-image-alpha-generic-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='alpha' DEBUG='True' FEATURESET='none' FLAVOUR='alpha-generic' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-alpha-generic'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='alpha' DEBUG='True' FEATURESET='none' FLAVOUR='alpha-generic' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-alpha-generic'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='alpha' DEBUG='True' FEATURESET='none' FLAVOUR='alpha-generic' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-alpha-generic'
  binary-arch_alpha_none_alpha-smp: binary-arch_alpha_none_alpha-smp_real
  binary-arch_alpha_none_alpha-smp_real::
        ln -sf linux-image.NEWS debian/linux-image-alpha-smp.NEWS
        ln -sf linux-image.NEWS debian/linux-image-alpha-smp-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='alpha' DEBUG='True' FEATURESET='none' FLAVOUR='alpha-smp' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-alpha-smp'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='alpha' DEBUG='True' FEATURESET='none' FLAVOUR='alpha-smp' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-alpha-smp'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='alpha' DEBUG='True' FEATURESET='none' FLAVOUR='alpha-smp' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-alpha-smp'
  binary-arch_alpha_none_real:
  binary-arch_alpha_real:
 -binary-arch_amd64: binary-arch_amd64_extra binary-arch_amd64_none binary-arch_amd64_real binary-arch_amd64_rt
 -binary-arch_amd64_extra::
 -      $(MAKE) -f debian/rules.real install-dummy ARCH='amd64' DH_OPTIONS='-pxen-linux-system-amd64' GENCONTROL_ARGS='-v4.9+80+deb9u4'
 +binary-arch_amd64: binary-arch_amd64_none binary-arch_amd64_real binary-arch_amd64_rt
  binary-arch_amd64_none: binary-arch_amd64_none_amd64 binary-arch_amd64_none_real
  binary-arch_amd64_none_amd64: binary-arch_amd64_none_amd64_real
  binary-arch_amd64_none_amd64_real::
        ln -sf linux-image.NEWS debian/linux-image-amd64.NEWS
        ln -sf linux-image.NEWS debian/linux-image-amd64-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='amd64' DEBUG='True' FEATURESET='none' FLAVOUR='amd64' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-amd64'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='amd64' DEBUG='True' FEATURESET='none' FLAVOUR='amd64' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-amd64'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='amd64' DEBUG='True' FEATURESET='none' FLAVOUR='amd64' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-amd64'
  binary-arch_amd64_none_real:
  binary-arch_amd64_real:
  binary-arch_amd64_rt: binary-arch_amd64_rt_amd64 binary-arch_amd64_rt_real
@@@ -28,7 -30,7 +28,7 @@@ binary-arch_amd64_rt_amd64: binary-arch
  binary-arch_amd64_rt_amd64_real::
        ln -sf linux-image.NEWS debian/linux-image-rt-amd64.NEWS
        ln -sf linux-image.NEWS debian/linux-image-rt-amd64-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='amd64' DEBUG='True' FEATURESET='rt' FLAVOUR='amd64' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-rt-amd64'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='amd64' DEBUG='True' FEATURESET='rt' FLAVOUR='amd64' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-rt-amd64'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='amd64' DEBUG='True' FEATURESET='rt' FLAVOUR='amd64' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-rt-amd64'
  binary-arch_amd64_rt_real:
  binary-arch_arm64: binary-arch_arm64_none binary-arch_arm64_real
  binary-arch_arm64_none: binary-arch_arm64_none_arm64 binary-arch_arm64_none_real
@@@ -36,36 -38,36 +36,36 @@@ binary-arch_arm64_none_arm64: binary-ar
  binary-arch_arm64_none_arm64_real::
        ln -sf linux-image.NEWS debian/linux-image-arm64.NEWS
        ln -sf linux-image.NEWS debian/linux-image-arm64-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='arm64' DEBUG='True' FEATURESET='none' FLAVOUR='arm64' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-arm64'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='arm64' DEBUG='True' FEATURESET='none' FLAVOUR='arm64' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-arm64'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='arm64' DEBUG='True' FEATURESET='none' FLAVOUR='arm64' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-arm64'
  binary-arch_arm64_none_real:
  binary-arch_arm64_real:
 -binary-arch_armel: binary-arch_armel_extra binary-arch_armel_none binary-arch_armel_real
 -binary-arch_armel_extra::
 -      $(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-image-kirkwood' GENCONTROL_ARGS='-v4.9+80+deb9u4'
 -      $(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-headers-kirkwood' GENCONTROL_ARGS='-v4.9+80+deb9u4'
 -      $(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-image-orion5x' GENCONTROL_ARGS='-v4.9+80+deb9u4'
 -      $(MAKE) -f debian/rules.real install-dummy ARCH='armel' DH_OPTIONS='-plinux-headers-orion5x' GENCONTROL_ARGS='-v4.9+80+deb9u4'
 +binary-arch_armel: binary-arch_armel_none binary-arch_armel_real
  binary-arch_armel_none: binary-arch_armel_none_marvell binary-arch_armel_none_real
  binary-arch_armel_none_marvell: binary-arch_armel_none_marvell_real
  binary-arch_armel_none_marvell_real::
        ln -sf linux-image.NEWS debian/linux-image-marvell.NEWS
        ln -sf linux-image.NEWS debian/linux-image-marvell-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='armel' DEBUG='True' FEATURESET='none' FLAVOUR='marvell' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-marvell'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='armel' DEBUG='True' FEATURESET='none' FLAVOUR='marvell' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-marvell'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='armel' DEBUG='True' FEATURESET='none' FLAVOUR='marvell' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-marvell'
  binary-arch_armel_none_real:
  binary-arch_armel_real:
 -binary-arch_armhf: binary-arch_armhf_none binary-arch_armhf_real
 -binary-arch_armhf_none: binary-arch_armhf_none_armmp binary-arch_armhf_none_armmp-lpae binary-arch_armhf_none_real
 -binary-arch_armhf_none_armmp: binary-arch_armhf_none_armmp_real
 -binary-arch_armhf_none_armmp-lpae: binary-arch_armhf_none_armmp-lpae_real
 -binary-arch_armhf_none_armmp-lpae_real::
 -      ln -sf linux-image.NEWS debian/linux-image-armmp-lpae.NEWS
 -      ln -sf linux-image.NEWS debian/linux-image-armmp-lpae-dbg.NEWS
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='armhf' DEBUG='True' FEATURESET='none' FLAVOUR='armmp-lpae' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-armmp-lpae'
 -binary-arch_armhf_none_armmp_real::
 -      ln -sf linux-image.NEWS debian/linux-image-armmp.NEWS
 -      ln -sf linux-image.NEWS debian/linux-image-armmp-dbg.NEWS
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='armhf' DEBUG='True' FEATURESET='none' FLAVOUR='armmp' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-armmp'
 +binary-arch_armhf: binary-arch_armhf_extra binary-arch_armhf_none binary-arch_armhf_real
 +binary-arch_armhf_extra::
-       $(MAKE) -f debian/rules.real install-dummy ARCH='armhf' DH_OPTIONS='-plinux-image-rpi-rpfv' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1'
-       $(MAKE) -f debian/rules.real install-dummy ARCH='armhf' DH_OPTIONS='-plinux-headers-rpi-rpfv' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1'
-       $(MAKE) -f debian/rules.real install-dummy ARCH='armhf' DH_OPTIONS='-plinux-image-rpi2-rpfv' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1'
-       $(MAKE) -f debian/rules.real install-dummy ARCH='armhf' DH_OPTIONS='-plinux-headers-rpi2-rpfv' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1'
++      $(MAKE) -f debian/rules.real install-dummy ARCH='armhf' DH_OPTIONS='-plinux-image-rpi-rpfv' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1'
++      $(MAKE) -f debian/rules.real install-dummy ARCH='armhf' DH_OPTIONS='-plinux-headers-rpi-rpfv' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1'
++      $(MAKE) -f debian/rules.real install-dummy ARCH='armhf' DH_OPTIONS='-plinux-image-rpi2-rpfv' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1'
++      $(MAKE) -f debian/rules.real install-dummy ARCH='armhf' DH_OPTIONS='-plinux-headers-rpi2-rpfv' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1'
 +binary-arch_armhf_none: binary-arch_armhf_none_real binary-arch_armhf_none_rpi binary-arch_armhf_none_rpi2
  binary-arch_armhf_none_real:
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='armhf' DEBUG='True' FEATURESET='none' FLAVOUR='rpi2' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-rpi2'
 +binary-arch_armhf_none_rpi: binary-arch_armhf_none_rpi_real
 +binary-arch_armhf_none_rpi2: binary-arch_armhf_none_rpi2_real
 +binary-arch_armhf_none_rpi2_real::
 +      ln -sf linux-image.NEWS debian/linux-image-rpi2.NEWS
 +      ln -sf linux-image.NEWS debian/linux-image-rpi2-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='armhf' DEBUG='True' FEATURESET='none' FLAVOUR='rpi' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-rpi'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='armhf' DEBUG='True' FEATURESET='none' FLAVOUR='rpi2' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-rpi2'
 +binary-arch_armhf_none_rpi_real::
 +      ln -sf linux-image.NEWS debian/linux-image-rpi.NEWS
 +      ln -sf linux-image.NEWS debian/linux-image-rpi-dbg.NEWS
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='armhf' DEBUG='True' FEATURESET='none' FLAVOUR='rpi' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-rpi'
  binary-arch_armhf_real:
  binary-arch_hppa: binary-arch_hppa_none binary-arch_hppa_real
  binary-arch_hppa_none: binary-arch_hppa_none_parisc binary-arch_hppa_none_parisc64-smp binary-arch_hppa_none_real
@@@ -74,27 -76,28 +74,27 @@@ binary-arch_hppa_none_parisc64-smp: bin
  binary-arch_hppa_none_parisc64-smp_real::
        ln -sf linux-image.NEWS debian/linux-image-parisc64-smp.NEWS
        ln -sf linux-image.NEWS debian/linux-image-parisc64-smp-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='hppa' DEBUG='True' FEATURESET='none' FLAVOUR='parisc64-smp' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-parisc64-smp'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='hppa' DEBUG='True' FEATURESET='none' FLAVOUR='parisc64-smp' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-parisc64-smp'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='hppa' DEBUG='True' FEATURESET='none' FLAVOUR='parisc64-smp' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-parisc64-smp'
  binary-arch_hppa_none_parisc_real::
        ln -sf linux-image.NEWS debian/linux-image-parisc.NEWS
        ln -sf linux-image.NEWS debian/linux-image-parisc-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='hppa' DEBUG='True' FEATURESET='none' FLAVOUR='parisc' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-parisc'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='hppa' DEBUG='True' FEATURESET='none' FLAVOUR='parisc' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-parisc'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='hppa' DEBUG='True' FEATURESET='none' FLAVOUR='parisc' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-parisc'
  binary-arch_hppa_none_real:
  binary-arch_hppa_real:
  binary-arch_i386: binary-arch_i386_extra binary-arch_i386_none binary-arch_i386_real binary-arch_i386_rt
  binary-arch_i386_extra::
-       $(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-586' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1'
 -      $(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-586' GENCONTROL_ARGS='-v4.9+80+deb9u4'
 -      $(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-headers-586' GENCONTROL_ARGS='-v4.9+80+deb9u4'
++      $(MAKE) -f debian/rules.real install-dummy ARCH='i386' DH_OPTIONS='-plinux-image-586' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1'
  binary-arch_i386_none: binary-arch_i386_none_686 binary-arch_i386_none_686-pae binary-arch_i386_none_real
  binary-arch_i386_none_686: binary-arch_i386_none_686_real
  binary-arch_i386_none_686-pae: binary-arch_i386_none_686-pae_real
  binary-arch_i386_none_686-pae_real::
        ln -sf linux-image.NEWS debian/linux-image-686-pae.NEWS
        ln -sf linux-image.NEWS debian/linux-image-686-pae-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='i386' DEBUG='True' FEATURESET='none' FLAVOUR='686-pae' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-686-pae'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='i386' DEBUG='True' FEATURESET='none' FLAVOUR='686-pae' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-686-pae'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='i386' DEBUG='True' FEATURESET='none' FLAVOUR='686-pae' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-686-pae'
  binary-arch_i386_none_686_real::
        ln -sf linux-image.NEWS debian/linux-image-686.NEWS
        ln -sf linux-image.NEWS debian/linux-image-686-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='i386' DEBUG='True' FEATURESET='none' FLAVOUR='686' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-686'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='i386' DEBUG='True' FEATURESET='none' FLAVOUR='686' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-686'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='i386' DEBUG='True' FEATURESET='none' FLAVOUR='686' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-686'
  binary-arch_i386_none_real:
  binary-arch_i386_real:
  binary-arch_i386_rt: binary-arch_i386_rt_686-pae binary-arch_i386_rt_real
@@@ -102,7 -105,7 +102,7 @@@ binary-arch_i386_rt_686-pae: binary-arc
  binary-arch_i386_rt_686-pae_real::
        ln -sf linux-image.NEWS debian/linux-image-rt-686-pae.NEWS
        ln -sf linux-image.NEWS debian/linux-image-rt-686-pae-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='i386' DEBUG='True' FEATURESET='rt' FLAVOUR='686-pae' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-rt-686-pae'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='i386' DEBUG='True' FEATURESET='rt' FLAVOUR='686-pae' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-rt-686-pae'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='i386' DEBUG='True' FEATURESET='rt' FLAVOUR='686-pae' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-rt-686-pae'
  binary-arch_i386_rt_real:
  binary-arch_m68k: binary-arch_m68k_none binary-arch_m68k_real
  binary-arch_m68k_none: binary-arch_m68k_none_m68k binary-arch_m68k_none_real
@@@ -110,7 -113,7 +110,7 @@@ binary-arch_m68k_none_m68k: binary-arch
  binary-arch_m68k_none_m68k_real::
        ln -sf linux-image.NEWS debian/linux-image-m68k.NEWS
        ln -sf linux-image.NEWS debian/linux-image-m68k-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='m68k' DEBUG='True' FEATURESET='none' FLAVOUR='m68k' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-m68k'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='m68k' DEBUG='True' FEATURESET='none' FLAVOUR='m68k' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-m68k'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='m68k' DEBUG='True' FEATURESET='none' FLAVOUR='m68k' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-m68k'
  binary-arch_m68k_none_real:
  binary-arch_m68k_real:
  binary-arch_mips: binary-arch_mips_none binary-arch_mips_real
@@@ -120,12 -123,12 +120,12 @@@ binary-arch_mips64_none_5kc-malta: bina
  binary-arch_mips64_none_5kc-malta_real::
        ln -sf linux-image.NEWS debian/linux-image-5kc-malta.NEWS
        ln -sf linux-image.NEWS debian/linux-image-5kc-malta-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='mips64' DEBUG='True' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-5kc-malta'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips64' DEBUG='True' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-5kc-malta'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips64' DEBUG='True' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-5kc-malta'
  binary-arch_mips64_none_octeon: binary-arch_mips64_none_octeon_real
  binary-arch_mips64_none_octeon_real::
        ln -sf linux-image.NEWS debian/linux-image-octeon.NEWS
        ln -sf linux-image.NEWS debian/linux-image-octeon-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='mips64' DEBUG='True' FEATURESET='none' FLAVOUR='octeon' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-octeon'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips64' DEBUG='True' FEATURESET='none' FLAVOUR='octeon' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-octeon'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips64' DEBUG='True' FEATURESET='none' FLAVOUR='octeon' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-octeon'
  binary-arch_mips64_none_real:
  binary-arch_mips64_real:
  binary-arch_mips64el: binary-arch_mips64el_none binary-arch_mips64el_real
@@@ -134,17 -137,17 +134,17 @@@ binary-arch_mips64el_none_5kc-malta: bi
  binary-arch_mips64el_none_5kc-malta_real::
        ln -sf linux-image.NEWS debian/linux-image-5kc-malta.NEWS
        ln -sf linux-image.NEWS debian/linux-image-5kc-malta-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='mips64el' DEBUG='True' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-5kc-malta'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips64el' DEBUG='True' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-5kc-malta'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips64el' DEBUG='True' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-5kc-malta'
  binary-arch_mips64el_none_loongson-3: binary-arch_mips64el_none_loongson-3_real
  binary-arch_mips64el_none_loongson-3_real::
        ln -sf linux-image.NEWS debian/linux-image-loongson-3.NEWS
        ln -sf linux-image.NEWS debian/linux-image-loongson-3-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='mips64el' DEBUG='True' FEATURESET='none' FLAVOUR='loongson-3' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-loongson-3'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips64el' DEBUG='True' FEATURESET='none' FLAVOUR='loongson-3' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-loongson-3'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips64el' DEBUG='True' FEATURESET='none' FLAVOUR='loongson-3' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-loongson-3'
  binary-arch_mips64el_none_octeon: binary-arch_mips64el_none_octeon_real
  binary-arch_mips64el_none_octeon_real::
        ln -sf linux-image.NEWS debian/linux-image-octeon.NEWS
        ln -sf linux-image.NEWS debian/linux-image-octeon-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='mips64el' DEBUG='True' FEATURESET='none' FLAVOUR='octeon' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-octeon'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips64el' DEBUG='True' FEATURESET='none' FLAVOUR='octeon' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-octeon'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips64el' DEBUG='True' FEATURESET='none' FLAVOUR='octeon' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-octeon'
  binary-arch_mips64el_none_real:
  binary-arch_mips64el_real:
  binary-arch_mips_none: binary-arch_mips_none_4kc-malta binary-arch_mips_none_5kc-malta binary-arch_mips_none_octeon binary-arch_mips_none_real
@@@ -152,17 -155,17 +152,17 @@@ binary-arch_mips_none_4kc-malta: binary
  binary-arch_mips_none_4kc-malta_real::
        ln -sf linux-image.NEWS debian/linux-image-4kc-malta.NEWS
        ln -sf linux-image.NEWS debian/linux-image-4kc-malta-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='mips' DEBUG='True' FEATURESET='none' FLAVOUR='4kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-4kc-malta'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips' DEBUG='True' FEATURESET='none' FLAVOUR='4kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-4kc-malta'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips' DEBUG='True' FEATURESET='none' FLAVOUR='4kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-4kc-malta'
  binary-arch_mips_none_5kc-malta: binary-arch_mips_none_5kc-malta_real
  binary-arch_mips_none_5kc-malta_real::
        ln -sf linux-image.NEWS debian/linux-image-5kc-malta.NEWS
        ln -sf linux-image.NEWS debian/linux-image-5kc-malta-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='mips' DEBUG='True' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-5kc-malta'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips' DEBUG='True' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-5kc-malta'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips' DEBUG='True' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-5kc-malta'
  binary-arch_mips_none_octeon: binary-arch_mips_none_octeon_real
  binary-arch_mips_none_octeon_real::
        ln -sf linux-image.NEWS debian/linux-image-octeon.NEWS
        ln -sf linux-image.NEWS debian/linux-image-octeon-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='mips' DEBUG='True' FEATURESET='none' FLAVOUR='octeon' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-octeon'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips' DEBUG='True' FEATURESET='none' FLAVOUR='octeon' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-octeon'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mips' DEBUG='True' FEATURESET='none' FLAVOUR='octeon' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-octeon'
  binary-arch_mips_none_real:
  binary-arch_mips_real:
  binary-arch_mipsel: binary-arch_mipsel_none binary-arch_mipsel_real
@@@ -171,22 -174,22 +171,22 @@@ binary-arch_mipsel_none_4kc-malta: bina
  binary-arch_mipsel_none_4kc-malta_real::
        ln -sf linux-image.NEWS debian/linux-image-4kc-malta.NEWS
        ln -sf linux-image.NEWS debian/linux-image-4kc-malta-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='mipsel' DEBUG='True' FEATURESET='none' FLAVOUR='4kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-4kc-malta'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mipsel' DEBUG='True' FEATURESET='none' FLAVOUR='4kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-4kc-malta'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mipsel' DEBUG='True' FEATURESET='none' FLAVOUR='4kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-4kc-malta'
  binary-arch_mipsel_none_5kc-malta: binary-arch_mipsel_none_5kc-malta_real
  binary-arch_mipsel_none_5kc-malta_real::
        ln -sf linux-image.NEWS debian/linux-image-5kc-malta.NEWS
        ln -sf linux-image.NEWS debian/linux-image-5kc-malta-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='mipsel' DEBUG='True' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-5kc-malta'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mipsel' DEBUG='True' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-5kc-malta'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mipsel' DEBUG='True' FEATURESET='none' FLAVOUR='5kc-malta' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-5kc-malta'
  binary-arch_mipsel_none_loongson-3: binary-arch_mipsel_none_loongson-3_real
  binary-arch_mipsel_none_loongson-3_real::
        ln -sf linux-image.NEWS debian/linux-image-loongson-3.NEWS
        ln -sf linux-image.NEWS debian/linux-image-loongson-3-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='mipsel' DEBUG='True' FEATURESET='none' FLAVOUR='loongson-3' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-loongson-3'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mipsel' DEBUG='True' FEATURESET='none' FLAVOUR='loongson-3' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-loongson-3'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mipsel' DEBUG='True' FEATURESET='none' FLAVOUR='loongson-3' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-loongson-3'
  binary-arch_mipsel_none_octeon: binary-arch_mipsel_none_octeon_real
  binary-arch_mipsel_none_octeon_real::
        ln -sf linux-image.NEWS debian/linux-image-octeon.NEWS
        ln -sf linux-image.NEWS debian/linux-image-octeon-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='mipsel' DEBUG='True' FEATURESET='none' FLAVOUR='octeon' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-octeon'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mipsel' DEBUG='True' FEATURESET='none' FLAVOUR='octeon' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-octeon'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='mipsel' DEBUG='True' FEATURESET='none' FLAVOUR='octeon' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-octeon'
  binary-arch_mipsel_none_real:
  binary-arch_mipsel_real:
  binary-arch_mipsn32: binary-arch_mipsn32_real
@@@ -200,16 -203,16 +200,16 @@@ binary-arch_powerpc_none_powerpc-smp: b
  binary-arch_powerpc_none_powerpc-smp_real::
        ln -sf linux-image.NEWS debian/linux-image-powerpc-smp.NEWS
        ln -sf linux-image.NEWS debian/linux-image-powerpc-smp-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='powerpc' DEBUG='True' FEATURESET='none' FLAVOUR='powerpc-smp' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-powerpc-smp'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='powerpc' DEBUG='True' FEATURESET='none' FLAVOUR='powerpc-smp' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-powerpc-smp'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='powerpc' DEBUG='True' FEATURESET='none' FLAVOUR='powerpc-smp' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-powerpc-smp'
  binary-arch_powerpc_none_powerpc64: binary-arch_powerpc_none_powerpc64_real
  binary-arch_powerpc_none_powerpc64_real::
        ln -sf linux-image.NEWS debian/linux-image-powerpc64.NEWS
        ln -sf linux-image.NEWS debian/linux-image-powerpc64-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='powerpc' DEBUG='True' FEATURESET='none' FLAVOUR='powerpc64' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-powerpc64'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='powerpc' DEBUG='True' FEATURESET='none' FLAVOUR='powerpc64' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-powerpc64'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='powerpc' DEBUG='True' FEATURESET='none' FLAVOUR='powerpc64' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-powerpc64'
  binary-arch_powerpc_none_powerpc_real::
        ln -sf linux-image.NEWS debian/linux-image-powerpc.NEWS
        ln -sf linux-image.NEWS debian/linux-image-powerpc-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='powerpc' DEBUG='True' FEATURESET='none' FLAVOUR='powerpc' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-powerpc'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='powerpc' DEBUG='True' FEATURESET='none' FLAVOUR='powerpc' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-powerpc'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='powerpc' DEBUG='True' FEATURESET='none' FLAVOUR='powerpc' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-powerpc'
  binary-arch_powerpc_none_real:
  binary-arch_powerpc_real:
  binary-arch_powerpcspe: binary-arch_powerpcspe_none binary-arch_powerpcspe_real
@@@ -218,7 -221,7 +218,7 @@@ binary-arch_powerpcspe_none_powerpcspe
  binary-arch_powerpcspe_none_powerpcspe_real::
        ln -sf linux-image.NEWS debian/linux-image-powerpcspe.NEWS
        ln -sf linux-image.NEWS debian/linux-image-powerpcspe-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='powerpcspe' DEBUG='True' FEATURESET='none' FLAVOUR='powerpcspe' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-powerpcspe'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='powerpcspe' DEBUG='True' FEATURESET='none' FLAVOUR='powerpcspe' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-powerpcspe'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='powerpcspe' DEBUG='True' FEATURESET='none' FLAVOUR='powerpcspe' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-powerpcspe'
  binary-arch_powerpcspe_none_real:
  binary-arch_powerpcspe_real:
  binary-arch_ppc64: binary-arch_ppc64_none binary-arch_ppc64_real
@@@ -227,7 -230,7 +227,7 @@@ binary-arch_ppc64_none_powerpc64: binar
  binary-arch_ppc64_none_powerpc64_real::
        ln -sf linux-image.NEWS debian/linux-image-powerpc64.NEWS
        ln -sf linux-image.NEWS debian/linux-image-powerpc64-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='ppc64' DEBUG='True' FEATURESET='none' FLAVOUR='powerpc64' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-powerpc64'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='ppc64' DEBUG='True' FEATURESET='none' FLAVOUR='powerpc64' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-powerpc64'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='ppc64' DEBUG='True' FEATURESET='none' FLAVOUR='powerpc64' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-powerpc64'
  binary-arch_ppc64_none_real:
  binary-arch_ppc64_real:
  binary-arch_ppc64el: binary-arch_ppc64el_none binary-arch_ppc64el_real
@@@ -236,7 -239,7 +236,7 @@@ binary-arch_ppc64el_none_powerpc64le: b
  binary-arch_ppc64el_none_powerpc64le_real::
        ln -sf linux-image.NEWS debian/linux-image-powerpc64le.NEWS
        ln -sf linux-image.NEWS debian/linux-image-powerpc64le-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='ppc64el' DEBUG='True' FEATURESET='none' FLAVOUR='powerpc64le' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-powerpc64le'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='ppc64el' DEBUG='True' FEATURESET='none' FLAVOUR='powerpc64le' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-powerpc64le'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='ppc64el' DEBUG='True' FEATURESET='none' FLAVOUR='powerpc64le' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-powerpc64le'
  binary-arch_ppc64el_none_real:
  binary-arch_ppc64el_real:
  binary-arch_s390: binary-arch_s390_real
@@@ -248,7 -251,7 +248,7 @@@ binary-arch_s390x_none_s390x: binary-ar
  binary-arch_s390x_none_s390x_real::
        ln -sf linux-image.NEWS debian/linux-image-s390x.NEWS
        ln -sf linux-image.NEWS debian/linux-image-s390x-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='s390x' DEBUG='True' FEATURESET='none' FLAVOUR='s390x' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-s390x'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='s390x' DEBUG='True' FEATURESET='none' FLAVOUR='s390x' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-s390x'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='s390x' DEBUG='True' FEATURESET='none' FLAVOUR='s390x' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-s390x'
  binary-arch_s390x_real:
  binary-arch_sh3: binary-arch_sh3_real
  binary-arch_sh3_real:
@@@ -259,12 -262,12 +259,12 @@@ binary-arch_sh4_none_sh7751r: binary-ar
  binary-arch_sh4_none_sh7751r_real::
        ln -sf linux-image.NEWS debian/linux-image-sh7751r.NEWS
        ln -sf linux-image.NEWS debian/linux-image-sh7751r-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='sh4' DEBUG='True' FEATURESET='none' FLAVOUR='sh7751r' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-sh7751r'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='sh4' DEBUG='True' FEATURESET='none' FLAVOUR='sh7751r' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-sh7751r'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='sh4' DEBUG='True' FEATURESET='none' FLAVOUR='sh7751r' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-sh7751r'
  binary-arch_sh4_none_sh7785lcr: binary-arch_sh4_none_sh7785lcr_real
  binary-arch_sh4_none_sh7785lcr_real::
        ln -sf linux-image.NEWS debian/linux-image-sh7785lcr.NEWS
        ln -sf linux-image.NEWS debian/linux-image-sh7785lcr-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='sh4' DEBUG='True' FEATURESET='none' FLAVOUR='sh7785lcr' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-sh7785lcr'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='sh4' DEBUG='True' FEATURESET='none' FLAVOUR='sh7785lcr' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-sh7785lcr'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='sh4' DEBUG='True' FEATURESET='none' FLAVOUR='sh7785lcr' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-sh7785lcr'
  binary-arch_sh4_real:
  binary-arch_sparc: binary-arch_sparc_real
  binary-arch_sparc64: binary-arch_sparc64_none binary-arch_sparc64_real
@@@ -275,11 -278,11 +275,11 @@@ binary-arch_sparc64_none_sparc64-smp: b
  binary-arch_sparc64_none_sparc64-smp_real::
        ln -sf linux-image.NEWS debian/linux-image-sparc64-smp.NEWS
        ln -sf linux-image.NEWS debian/linux-image-sparc64-smp-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='sparc64' DEBUG='True' FEATURESET='none' FLAVOUR='sparc64-smp' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-sparc64-smp'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='sparc64' DEBUG='True' FEATURESET='none' FLAVOUR='sparc64-smp' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-sparc64-smp'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='sparc64' DEBUG='True' FEATURESET='none' FLAVOUR='sparc64-smp' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-sparc64-smp'
  binary-arch_sparc64_none_sparc64_real::
        ln -sf linux-image.NEWS debian/linux-image-sparc64.NEWS
        ln -sf linux-image.NEWS debian/linux-image-sparc64-dbg.NEWS
-       $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-4' ARCH='sparc64' DEBUG='True' FEATURESET='none' FLAVOUR='sparc64' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1' LOCALVERSION='-sparc64'
 -      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='sparc64' DEBUG='True' FEATURESET='none' FLAVOUR='sparc64' GENCONTROL_ARGS='-v4.9+80+deb9u4' LOCALVERSION='-sparc64'
++      $(MAKE) -f debian/rules.real install-flavour ABINAME='4.9.0-6' ARCH='sparc64' DEBUG='True' FEATURESET='none' FLAVOUR='sparc64' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1' LOCALVERSION='-sparc64'
  binary-arch_sparc64_real:
  binary-arch_sparc_real:
  binary-arch_tilegx: binary-arch_tilegx_real
@@@ -288,9 -291,9 +288,9 @@@ binary-arch_x32: binary-arch_x32_rea
  binary-arch_x32_real:
  binary-indep:: binary-indep_extra binary-indep_none binary-indep_rt
  binary-indep::
-       $(MAKE) -f debian/rules.real binary-indep GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1'
 -      $(MAKE) -f debian/rules.real binary-indep GENCONTROL_ARGS='-v4.9+80+deb9u4'
++      $(MAKE) -f debian/rules.real binary-indep GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1'
  binary-indep_extra::
-       $(MAKE) -f debian/rules.real install-dummy  DH_OPTIONS='-plinux-tools' GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1'
 -      $(MAKE) -f debian/rules.real install-dummy  DH_OPTIONS='-plinux-tools' GENCONTROL_ARGS='-v4.9+80+deb9u4'
++      $(MAKE) -f debian/rules.real install-dummy  DH_OPTIONS='-plinux-tools' GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1'
  binary-indep_none: binary-indep_none_real
  binary-indep_none_real:
  binary-indep_rt: binary-indep_rt_real
@@@ -466,7 -469,7 +466,7 @@@ build-arch_x32: build-arch_x32_rea
  build-arch_x32_real:
  build-indep:: build-indep_none build-indep_rt
  build-indep::
-       $(MAKE) -f debian/rules.real build-indep GENCONTROL_ARGS='-v4.9+80+deb9u2+rpi1'
 -      $(MAKE) -f debian/rules.real build-indep GENCONTROL_ARGS='-v4.9+80+deb9u4'
++      $(MAKE) -f debian/rules.real build-indep GENCONTROL_ARGS='-v4.9+80+deb9u4+rpi1'
  build-indep_none: build-indep_none_real
  build-indep_none_real:
  build-indep_rt: build-indep_rt_real