diff -Nru linux-latest-80+deb9u4/debian/bin/gencontrol.py linux-latest-80+deb9u4+rpi1/debian/bin/gencontrol.py
--- linux-latest-80+deb9u4/debian/bin/gencontrol.py	2018-02-20 09:25:36.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/bin/gencontrol.py	2017-10-12 20:51:39.000000000 +0000
@@ -26,6 +26,7 @@
 
         changelog_version = Changelog()[0].version
         self.package_version = '%s+%s' % (self.version.linux_version, changelog_version.complete)
+        self.rpf_version = '%s+%s' % ('4.9', changelog_version.complete)
 
     def do_main_setup(self, vars, makeflags, extra):
         makeflags['GENCONTROL_ARGS'] = '-v%s' % self.package_version
@@ -36,7 +37,7 @@
 
     def do_main_packages(self, packages, vars, makeflags, extra):
         packages['source']['Build-Depends'].extend(
-            ['linux-support-%s' % self.abiname,
+            ['linux-4.9-support-%s' % self.abiname,
              # We don't need this installed, but it ensures that after an
              # ABI bump linux is auto-built before linux-latest on each
              # architecture.
@@ -152,7 +153,7 @@
                 if 'X-Version-Overwrite-Epoch' in i:
                     version = '-v1:%s' % self.package_version
                 else:
-                    version = '-v%s' % self.package_version
+                    version = '-v%s' % self.rpf_version
                 cmds += self.get_link_commands(i, ['config', 'postinst', 'templates'])
                 cmds.append("$(MAKE) -f debian/rules.real install-dummy %s DH_OPTIONS='-p%s' GENCONTROL_ARGS='%s'" % (arch_var, i['Package'], version))
             makefile.add(target, [target + '_extra'])
diff -Nru linux-latest-80+deb9u4/debian/changelog linux-latest-80+deb9u4+rpi1/debian/changelog
--- linux-latest-80+deb9u4/debian/changelog	2018-02-22 07:32:44.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/changelog	2018-04-05 22:47:11.000000000 +0000
@@ -1,3 +1,29 @@
+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+deb9u4+rpi1 by Peter Michael Green]
+  * Change rpf version to 4.9.0-6
+
+ -- 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
diff -Nru linux-latest-80+deb9u4/debian/control linux-latest-80+deb9u4+rpi1/debian/control
--- linux-latest-80+deb9u4/debian/control	2018-02-22 07:32:44.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/control	2018-04-05 22:47:11.000000000 +0000
@@ -4,7 +4,7 @@
 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-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,55 +176,51 @@
  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-6-armmp
-Depends: linux-image-4.9.0-6-armmp, ${misc:Depends}
-Description: Linux for ARMv7 multiplatform compatible SoCs (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.
+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
+ Raspberry PI.
 
-Package: linux-headers-armmp
+Package: linux-headers-rpi
 Architecture: armhf
-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-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-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)
- 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..
+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
+ Raspberry PI 2.
 
-Package: linux-headers-armmp-lpae
+Package: linux-headers-rpi2
 Architecture: armhf
-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-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
@@ -717,51 +713,35 @@
 Description: Linux for older PCs (dummy package)
  This is a dummy transitional package.  It can be safely removed.
 
-Package: linux-headers-586
-Architecture: i386
-Section: oldlibs
-Priority: extra
-Depends: linux-headers-686, ${misc:Depends}
-Description: Header files for Linux 586 configuration (dummy package)
- This is a dummy transitional package.  It can be safely removed.
-
-Package: linux-image-kirkwood
-Architecture: armel
-Section: oldlibs
-Priority: extra
-Depends: linux-image-marvell, ${misc:Depends}
-Description: Linux for Marvell Kirkwood (dummy package)
- This is a dummy transitional package.  It can be safely removed.
-
-Package: linux-headers-kirkwood
-Architecture: armel
-Section: oldlibs
-Priority: extra
-Depends: linux-headers-marvell, ${misc:Depends}
-Description: Header files for Linux kirkwood configuration (dummy package)
- This is a dummy transitional package.  It can be safely removed.
+Package: linux-image-rpi-rpfv
+Architecture: armhf
+Depends: linux-image-4.9.0-6-rpi
+Description: 
+ This metapackage will pull in the raspbian kernel for the raspberry pi 1
+ based on the version currently reccomended by the raspberry pi foundation
+ (currently 4.9).
 
-Package: linux-image-orion5x
-Architecture: armel
-Section: oldlibs
-Priority: extra
-Depends: linux-image-marvell, ${misc:Depends}
-Description: Linux for Marvell Orion (dummy package)
- This is a dummy transitional package.  It can be safely removed.
+Package: linux-headers-rpi-rpfv
+Architecture: armhf
+Depends: linux-headers-4.9.0-6-rpi
+Description: 
+ This metapackage will pull in the headers for the raspbian kernel for the
+ raspberry pi 1 based on the version currently reccomended by the raspberry
+ pi foundation (currently 4.9).
 
-Package: linux-headers-orion5x
-Architecture: armel
-Section: oldlibs
-Priority: extra
-Depends: linux-headers-marvell, ${misc:Depends}
-Description: Header files for Linux orion5x configuration (dummy package)
- This is a dummy transitional package.  It can be safely removed.
+Package: linux-image-rpi2-rpfv
+Architecture: armhf
+Depends: linux-image-4.9.0-6-rpi2
+Description: 
+ This metapackage will pull in the raspbian kernel for the raspberry pi 2
+ based on the version currently reccomended by the raspberry pi foundation
+ (currently 4.9).
 
-Package: xen-linux-system-amd64
-Architecture: amd64
-Section: oldlibs
-Priority: extra
-Depends: xen-system-amd64, linux-image-amd64, ${misc:Depends}
-Description: Xen system with Linux for 64-bit PCs (dummy package)
- This is a dummy transitional package.  It can be safely removed.
+Package: linux-headers-rpi2-rpfv
+Architecture: armhf
+Depends: linux-headers-4.9.0-6-rpi2
+Description: 
+ This metapackage will pull in the headers for the raspbian kernel for the
+ raspberry pi 2 based on the version currently reccomended by the raspberry
+ pi foundation (currently 4.9).
 
diff -Nru linux-latest-80+deb9u4/debian/control.md5sum linux-latest-80+deb9u4+rpi1/debian/control.md5sum
--- linux-latest-80+deb9u4/debian/control.md5sum	2018-02-22 07:32:44.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/control.md5sum	2018-04-05 22:47:11.000000000 +0000
@@ -1,5 +1,5 @@
-b342a78392cfedcf8ec17a063e48a33c  debian/bin/gencontrol.py
-e3cfcfa7f410df4093eda5ef7dabb651  debian/changelog
+fef3b5b9f931eb0c3f199bcf45dc9b19  debian/bin/gencontrol.py
+b5fa3e88a8ab749ee5a0c61dc8d27a82  debian/changelog
 e0d0ba88825ee8272918ca115601e1e3  debian/templates/control.image-dbg.latest.in
 8cf2ba1553c0ad410aeaf0c90a47a328  debian/templates/control.source.latest.in
 2bec21a63cd49ba2ee927d000d64c42d  debian/templates/control.headers.latest.in
@@ -7,4 +7,4 @@
 214b6b89c361dd489803d9f344ad9b69  debian/templates/control.doc.latest.in
 37677932424d2f903e275cc197cfbe1a  debian/templates/control.source.in
 e7facb6902b89f724343b30d5a11e792  debian/templates/control.tools.latest.in
-f31fa37b00eece893cb94b316c8b15f2  debian/templates/control.extra.in
+68c7a40feb512c9da3575ef0382b016a  debian/templates/control.extra.in
diff -Nru linux-latest-80+deb9u4/debian/linux-headers-2.6-omap.substvars linux-latest-80+deb9u4+rpi1/debian/linux-headers-2.6-omap.substvars
--- linux-latest-80+deb9u4/debian/linux-headers-2.6-omap.substvars	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-headers-2.6-omap.substvars	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1 @@
+misc:Depends=
diff -Nru linux-latest-80+deb9u4/debian/linux-headers-armmp/DEBIAN/control linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp/DEBIAN/control
--- linux-latest-80+deb9u4/debian/linux-headers-armmp/DEBIAN/control	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp/DEBIAN/control	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1,12 @@
+Package: linux-headers-armmp
+Source: linux-latest (56+rpi1)
+Version: 3.13+56
+Architecture: armhf
+Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
+Installed-Size: 29
+Depends: linux-headers-3.13-1-armmp
+Section: kernel
+Priority: optional
+Description: Header files for Linux armmp configuration (meta-package)
+ This package depends on the architecture-specific header files for the
+ latest Linux kernel armmp configuration.
diff -Nru linux-latest-80+deb9u4/debian/linux-headers-armmp/DEBIAN/md5sums linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp/DEBIAN/md5sums
--- linux-latest-80+deb9u4/debian/linux-headers-armmp/DEBIAN/md5sums	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp/DEBIAN/md5sums	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1,2 @@
+1b49e10b2f3d4324865431986be6b0b2  usr/share/doc/linux-headers-armmp/changelog.gz
+5e5300a90625dbe51d8f6d2d1179a92c  usr/share/doc/linux-headers-armmp/copyright
diff -Nru linux-latest-80+deb9u4/debian/linux-headers-armmp/usr/share/doc/linux-headers-armmp/copyright linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp/usr/share/doc/linux-headers-armmp/copyright
--- linux-latest-80+deb9u4/debian/linux-headers-armmp/usr/share/doc/linux-headers-armmp/copyright	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp/usr/share/doc/linux-headers-armmp/copyright	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1,22 @@
+Copyright:
+
+    Copyright (C) 2006-2009 Bastian Blank <waldi@debian.org>
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
diff -Nru linux-latest-80+deb9u4/debian/linux-headers-armmp-lpae/DEBIAN/control linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp-lpae/DEBIAN/control
--- linux-latest-80+deb9u4/debian/linux-headers-armmp-lpae/DEBIAN/control	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp-lpae/DEBIAN/control	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1,12 @@
+Package: linux-headers-armmp-lpae
+Source: linux-latest (56+rpi1)
+Version: 3.13+56
+Architecture: armhf
+Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
+Installed-Size: 29
+Depends: linux-headers-3.13-1-armmp-lpae
+Section: kernel
+Priority: optional
+Description: Header files for Linux armmp-lpae configuration (meta-package)
+ This package depends on the architecture-specific header files for the
+ latest Linux kernel armmp-lpae configuration.
diff -Nru linux-latest-80+deb9u4/debian/linux-headers-armmp-lpae/DEBIAN/md5sums linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp-lpae/DEBIAN/md5sums
--- linux-latest-80+deb9u4/debian/linux-headers-armmp-lpae/DEBIAN/md5sums	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp-lpae/DEBIAN/md5sums	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1,2 @@
+1b49e10b2f3d4324865431986be6b0b2  usr/share/doc/linux-headers-armmp-lpae/changelog.gz
+5e5300a90625dbe51d8f6d2d1179a92c  usr/share/doc/linux-headers-armmp-lpae/copyright
diff -Nru linux-latest-80+deb9u4/debian/linux-headers-armmp-lpae/usr/share/doc/linux-headers-armmp-lpae/copyright linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp-lpae/usr/share/doc/linux-headers-armmp-lpae/copyright
--- linux-latest-80+deb9u4/debian/linux-headers-armmp-lpae/usr/share/doc/linux-headers-armmp-lpae/copyright	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp-lpae/usr/share/doc/linux-headers-armmp-lpae/copyright	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1,22 @@
+Copyright:
+
+    Copyright (C) 2006-2009 Bastian Blank <waldi@debian.org>
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
diff -Nru linux-latest-80+deb9u4/debian/linux-headers-armmp-lpae.substvars linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp-lpae.substvars
--- linux-latest-80+deb9u4/debian/linux-headers-armmp-lpae.substvars	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp-lpae.substvars	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1 @@
+misc:Depends=
diff -Nru linux-latest-80+deb9u4/debian/linux-headers-armmp.substvars linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp.substvars
--- linux-latest-80+deb9u4/debian/linux-headers-armmp.substvars	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-headers-armmp.substvars	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1 @@
+misc:Depends=
diff -Nru linux-latest-80+deb9u4/debian/linux-image-2.6-mx5.substvars linux-latest-80+deb9u4+rpi1/debian/linux-image-2.6-mx5.substvars
--- linux-latest-80+deb9u4/debian/linux-image-2.6-mx5.substvars	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-2.6-mx5.substvars	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1 @@
+misc:Depends=
diff -Nru linux-latest-80+deb9u4/debian/linux-image-2.6-omap.substvars linux-latest-80+deb9u4+rpi1/debian/linux-image-2.6-omap.substvars
--- linux-latest-80+deb9u4/debian/linux-image-2.6-omap.substvars	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-2.6-omap.substvars	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1 @@
+misc:Depends=
diff -Nru linux-latest-80+deb9u4/debian/linux-image-armmp/DEBIAN/control linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp/DEBIAN/control
--- linux-latest-80+deb9u4/debian/linux-image-armmp/DEBIAN/control	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp/DEBIAN/control	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1,14 @@
+Package: linux-image-armmp
+Source: linux-latest (56+rpi1)
+Version: 3.13+56
+Architecture: armhf
+Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
+Installed-Size: 38
+Depends: linux-image-3.13-1-armmp
+Provides: linux-latest-modules-3.13-1-armmp
+Section: kernel
+Priority: optional
+Description: Linux for ARMv7 multiplatform compatible SoCs (meta-package)
+ This package depends on the latest Linux kernel and modules for use on
+ ARMv7 multiplatform kernel for Marvell Armada 370/xp, Freescale
+ iMX5x/iMX6.
diff -Nru linux-latest-80+deb9u4/debian/linux-image-armmp/DEBIAN/md5sums linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp/DEBIAN/md5sums
--- linux-latest-80+deb9u4/debian/linux-image-armmp/DEBIAN/md5sums	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp/DEBIAN/md5sums	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1,4 @@
+6454cfbed7037a69250fb3caebb873e1  usr/share/bug/linux-image-armmp/presubj
+6d53927fd4437352599f954e2dca7741  usr/share/doc/linux-image-armmp/NEWS.Debian.gz
+1b49e10b2f3d4324865431986be6b0b2  usr/share/doc/linux-image-armmp/changelog.gz
+5e5300a90625dbe51d8f6d2d1179a92c  usr/share/doc/linux-image-armmp/copyright
diff -Nru linux-latest-80+deb9u4/debian/linux-image-armmp/usr/share/bug/linux-image-armmp/presubj linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp/usr/share/bug/linux-image-armmp/presubj
--- linux-latest-80+deb9u4/debian/linux-image-armmp/usr/share/bug/linux-image-armmp/presubj	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp/usr/share/bug/linux-image-armmp/presubj	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1,5 @@
+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-3.13-1-armmp instead.
diff -Nru linux-latest-80+deb9u4/debian/linux-image-armmp/usr/share/doc/linux-image-armmp/copyright linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp/usr/share/doc/linux-image-armmp/copyright
--- linux-latest-80+deb9u4/debian/linux-image-armmp/usr/share/doc/linux-image-armmp/copyright	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp/usr/share/doc/linux-image-armmp/copyright	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1,22 @@
+Copyright:
+
+    Copyright (C) 2006-2009 Bastian Blank <waldi@debian.org>
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
diff -Nru linux-latest-80+deb9u4/debian/linux-image-armmp-lpae/DEBIAN/control linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp-lpae/DEBIAN/control
--- linux-latest-80+deb9u4/debian/linux-image-armmp-lpae/DEBIAN/control	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp-lpae/DEBIAN/control	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1,13 @@
+Package: linux-image-armmp-lpae
+Source: linux-latest (56+rpi1)
+Version: 3.13+56
+Architecture: armhf
+Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
+Installed-Size: 38
+Depends: linux-image-3.13-1-armmp-lpae
+Provides: linux-latest-modules-3.13-1-armmp-lpae
+Section: kernel
+Priority: optional
+Description: Linux for ARMv7 multiplatform compatible SoCs supporting LPAE (meta-package)
+ This package depends on the latest Linux kernel and modules for use on
+ ARMv7 multiplatform kernel supporting LPAE.
diff -Nru linux-latest-80+deb9u4/debian/linux-image-armmp-lpae/DEBIAN/md5sums linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp-lpae/DEBIAN/md5sums
--- linux-latest-80+deb9u4/debian/linux-image-armmp-lpae/DEBIAN/md5sums	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp-lpae/DEBIAN/md5sums	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1,4 @@
+903c99e2c43cb3e83f8a63a4b784acf5  usr/share/bug/linux-image-armmp-lpae/presubj
+6d53927fd4437352599f954e2dca7741  usr/share/doc/linux-image-armmp-lpae/NEWS.Debian.gz
+1b49e10b2f3d4324865431986be6b0b2  usr/share/doc/linux-image-armmp-lpae/changelog.gz
+5e5300a90625dbe51d8f6d2d1179a92c  usr/share/doc/linux-image-armmp-lpae/copyright
diff -Nru linux-latest-80+deb9u4/debian/linux-image-armmp-lpae/usr/share/bug/linux-image-armmp-lpae/presubj linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp-lpae/usr/share/bug/linux-image-armmp-lpae/presubj
--- linux-latest-80+deb9u4/debian/linux-image-armmp-lpae/usr/share/bug/linux-image-armmp-lpae/presubj	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp-lpae/usr/share/bug/linux-image-armmp-lpae/presubj	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1,5 @@
+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-3.13-1-armmp-lpae instead.
diff -Nru linux-latest-80+deb9u4/debian/linux-image-armmp-lpae/usr/share/doc/linux-image-armmp-lpae/copyright linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp-lpae/usr/share/doc/linux-image-armmp-lpae/copyright
--- linux-latest-80+deb9u4/debian/linux-image-armmp-lpae/usr/share/doc/linux-image-armmp-lpae/copyright	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp-lpae/usr/share/doc/linux-image-armmp-lpae/copyright	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1,22 @@
+Copyright:
+
+    Copyright (C) 2006-2009 Bastian Blank <waldi@debian.org>
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
diff -Nru linux-latest-80+deb9u4/debian/linux-image-armmp-lpae.substvars linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp-lpae.substvars
--- linux-latest-80+deb9u4/debian/linux-image-armmp-lpae.substvars	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp-lpae.substvars	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1 @@
+misc:Depends=
diff -Nru linux-latest-80+deb9u4/debian/linux-image-armmp.substvars linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp.substvars
--- linux-latest-80+deb9u4/debian/linux-image-armmp.substvars	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-armmp.substvars	2017-10-12 20:51:39.000000000 +0000
@@ -0,0 +1 @@
+misc:Depends=
diff -Nru linux-latest-80+deb9u4/debian/linux-image-rpi2.bug-presubj linux-latest-80+deb9u4+rpi1/debian/linux-image-rpi2.bug-presubj
--- linux-latest-80+deb9u4/debian/linux-image-rpi2.bug-presubj	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-rpi2.bug-presubj	2018-04-05 22:47:11.000000000 +0000
@@ -0,0 +1,5 @@
+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 -Nru linux-latest-80+deb9u4/debian/linux-image-rpi2-dbg.lintian-overrides linux-latest-80+deb9u4+rpi1/debian/linux-image-rpi2-dbg.lintian-overrides
--- linux-latest-80+deb9u4/debian/linux-image-rpi2-dbg.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-rpi2-dbg.lintian-overrides	2018-04-05 22:47:11.000000000 +0000
@@ -0,0 +1,2 @@
+linux-image-rpi2-dbg: wrong-section-according-to-package-name linux-image-rpi2-dbg => debug
+linux-image-rpi2-dbg: debug-package-should-be-priority-extra linux-image-rpi2-dbg
diff -Nru linux-latest-80+deb9u4/debian/linux-image-rpi.bug-presubj linux-latest-80+deb9u4+rpi1/debian/linux-image-rpi.bug-presubj
--- linux-latest-80+deb9u4/debian/linux-image-rpi.bug-presubj	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-rpi.bug-presubj	2018-04-05 22:47:11.000000000 +0000
@@ -0,0 +1,5 @@
+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 -Nru linux-latest-80+deb9u4/debian/linux-image-rpi-dbg.lintian-overrides linux-latest-80+deb9u4+rpi1/debian/linux-image-rpi-dbg.lintian-overrides
--- linux-latest-80+deb9u4/debian/linux-image-rpi-dbg.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/linux-image-rpi-dbg.lintian-overrides	2018-04-05 22:47:11.000000000 +0000
@@ -0,0 +1,2 @@
+linux-image-rpi-dbg: wrong-section-according-to-package-name linux-image-rpi-dbg => debug
+linux-image-rpi-dbg: debug-package-should-be-priority-extra linux-image-rpi-dbg
diff -Nru linux-latest-80+deb9u4/debian/rules linux-latest-80+deb9u4+rpi1/debian/rules
--- linux-latest-80+deb9u4/debian/rules	2018-01-04 20:22:51.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/rules	2017-10-12 20:51:39.000000000 +0000
@@ -22,6 +22,8 @@
 	rm -rf $(BUILD_DIR)
 	dh_clean
 	find debian -maxdepth 1 -type l -delete
+	rm -rf debian/files
+	rm -rf debian/linux-*rpi*-rpfv
 
 binary-indep: debian/control $(BUILD_DIR)
 	dh_testdir
@@ -46,7 +48,7 @@
 endif
 
 debian/control-real: $(GENCONTROL) $(CONTROL_FILES)
-	$(GENCONTROL) /usr/src/linux-support-$(KERNELVERSION)
+	$(GENCONTROL) /usr/src/linux-4.9-support-$(KERNELVERSION)
 	md5sum $^ > debian/control.md5sum
 	@echo
 	@echo This target is made to fail intentionally, to make sure
diff -Nru linux-latest-80+deb9u4/debian/rules.gen linux-latest-80+deb9u4+rpi1/debian/rules.gen
--- linux-latest-80+deb9u4/debian/rules.gen	2018-02-22 07:32:44.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/rules.gen	2018-04-05 22:47:11.000000000 +0000
@@ -6,23 +6,21 @@
 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-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-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-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
@@ -30,7 +28,7 @@
 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-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
@@ -38,36 +36,36 @@
 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-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-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+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:
+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-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
@@ -76,28 +74,27 @@
 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-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-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+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-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-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
@@ -105,7 +102,7 @@
 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-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
@@ -113,7 +110,7 @@
 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-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
@@ -123,12 +120,12 @@
 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-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-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
@@ -137,17 +134,17 @@
 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-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-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-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
@@ -155,17 +152,17 @@
 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-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-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-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
@@ -174,22 +171,22 @@
 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-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-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-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-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
@@ -203,16 +200,16 @@
 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-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-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-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
@@ -221,7 +218,7 @@
 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-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
@@ -230,7 +227,7 @@
 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-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
@@ -239,7 +236,7 @@
 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-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
@@ -251,7 +248,7 @@
 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-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:
@@ -262,12 +259,12 @@
 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-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-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
@@ -278,11 +275,11 @@
 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-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-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
@@ -291,9 +288,9 @@
 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+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+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
@@ -330,12 +327,12 @@
 build-arch_armel_none_real:
 build-arch_armel_real:
 build-arch_armhf: build-arch_armhf_none build-arch_armhf_real
-build-arch_armhf_none: build-arch_armhf_none_armmp build-arch_armhf_none_armmp-lpae build-arch_armhf_none_real
-build-arch_armhf_none_armmp: build-arch_armhf_none_armmp_real
-build-arch_armhf_none_armmp-lpae: build-arch_armhf_none_armmp-lpae_real
-build-arch_armhf_none_armmp-lpae_real:
-build-arch_armhf_none_armmp_real:
+build-arch_armhf_none: build-arch_armhf_none_real build-arch_armhf_none_rpi build-arch_armhf_none_rpi2
 build-arch_armhf_none_real:
+build-arch_armhf_none_rpi: build-arch_armhf_none_rpi_real
+build-arch_armhf_none_rpi2: build-arch_armhf_none_rpi2_real
+build-arch_armhf_none_rpi2_real:
+build-arch_armhf_none_rpi_real:
 build-arch_armhf_real:
 build-arch_hppa: build-arch_hppa_none build-arch_hppa_real
 build-arch_hppa_none: build-arch_hppa_none_parisc build-arch_hppa_none_parisc64-smp build-arch_hppa_none_real
@@ -469,7 +466,7 @@
 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+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
@@ -506,12 +503,12 @@
 setup_armel_none_real:
 setup_armel_real:
 setup_armhf: setup_armhf_none setup_armhf_real
-setup_armhf_none: setup_armhf_none_armmp setup_armhf_none_armmp-lpae setup_armhf_none_real
-setup_armhf_none_armmp: setup_armhf_none_armmp_real
-setup_armhf_none_armmp-lpae: setup_armhf_none_armmp-lpae_real
-setup_armhf_none_armmp-lpae_real:
-setup_armhf_none_armmp_real:
+setup_armhf_none: setup_armhf_none_real setup_armhf_none_rpi setup_armhf_none_rpi2
 setup_armhf_none_real:
+setup_armhf_none_rpi: setup_armhf_none_rpi_real
+setup_armhf_none_rpi2: setup_armhf_none_rpi2_real
+setup_armhf_none_rpi2_real:
+setup_armhf_none_rpi_real:
 setup_armhf_real:
 setup_hppa: setup_hppa_none setup_hppa_real
 setup_hppa_none: setup_hppa_none_parisc setup_hppa_none_parisc64-smp setup_hppa_none_real
diff -Nru linux-latest-80+deb9u4/debian/source.lintian-overrides linux-latest-80+deb9u4+rpi1/debian/source.lintian-overrides
--- linux-latest-80+deb9u4/debian/source.lintian-overrides	2018-02-22 07:32:44.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/source.lintian-overrides	2018-04-05 22:47:11.000000000 +0000
@@ -4,8 +4,8 @@
 linux-latest source: dbg-package-missing-depends linux-image-rt-amd64-dbg
 linux-latest source: dbg-package-missing-depends linux-image-arm64-dbg
 linux-latest source: dbg-package-missing-depends linux-image-marvell-dbg
-linux-latest source: dbg-package-missing-depends linux-image-armmp-dbg
-linux-latest source: dbg-package-missing-depends linux-image-armmp-lpae-dbg
+linux-latest source: dbg-package-missing-depends linux-image-rpi-dbg
+linux-latest source: dbg-package-missing-depends linux-image-rpi2-dbg
 linux-latest source: dbg-package-missing-depends linux-image-parisc-dbg
 linux-latest source: dbg-package-missing-depends linux-image-parisc64-smp-dbg
 linux-latest source: dbg-package-missing-depends linux-image-686-dbg
diff -Nru linux-latest-80+deb9u4/debian/templates/control.extra.in linux-latest-80+deb9u4+rpi1/debian/templates/control.extra.in
--- linux-latest-80+deb9u4/debian/templates/control.extra.in	2018-02-20 09:25:36.000000000 +0000
+++ linux-latest-80+deb9u4+rpi1/debian/templates/control.extra.in	2018-04-05 22:47:11.000000000 +0000
@@ -14,50 +14,34 @@
 Description: Linux for older PCs (dummy package)
  This is a dummy transitional package.  It can be safely removed.
 
-Package: linux-headers-586
-Section: oldlibs
-Priority: extra
-Architecture: i386
-Depends: linux-headers-686, ${misc:Depends}
-Description: Header files for Linux 586 configuration (dummy package)
- This is a dummy transitional package.  It can be safely removed.
-
-Package: linux-image-kirkwood
-Section: oldlibs
-Priority: extra
-Architecture: armel
-Depends: linux-image-marvell, ${misc:Depends}
-Description: Linux for Marvell Kirkwood (dummy package)
- This is a dummy transitional package.  It can be safely removed.
-
-Package: linux-headers-kirkwood
-Section: oldlibs
-Priority: extra
-Architecture: armel
-Depends: linux-headers-marvell, ${misc:Depends}
-Description: Header files for Linux kirkwood configuration (dummy package)
- This is a dummy transitional package.  It can be safely removed.
-
-Package: linux-image-orion5x
-Section: oldlibs
-Priority: extra
-Architecture: armel
-Depends: linux-image-marvell, ${misc:Depends}
-Description: Linux for Marvell Orion (dummy package)
- This is a dummy transitional package.  It can be safely removed.
-
-Package: linux-headers-orion5x
-Section: oldlibs
-Priority: extra
-Architecture: armel
-Depends: linux-headers-marvell, ${misc:Depends}
-Description: Header files for Linux orion5x configuration (dummy package)
- This is a dummy transitional package.  It can be safely removed.
-
-Package: xen-linux-system-amd64
-Section: oldlibs
-Priority: extra
-Architecture: amd64
-Depends: xen-system-amd64, linux-image-amd64, ${misc:Depends}
-Description: Xen system with Linux for 64-bit PCs (dummy package)
- This is a dummy transitional package.  It can be safely removed.
+Package: linux-image-rpi-rpfv
+Architecture: armhf
+Depends: linux-image-4.9.0-6-rpi
+Description:
+ This metapackage will pull in the raspbian kernel for the raspberry pi 1
+ based on the version currently reccomended by the raspberry pi foundation
+ (currently 4.9).
+
+Package: linux-headers-rpi-rpfv
+Architecture: armhf
+Depends: linux-headers-4.9.0-6-rpi
+Description:
+ This metapackage will pull in the headers for the raspbian kernel for the
+ raspberry pi 1 based on the version currently reccomended by the raspberry
+ pi foundation (currently 4.9).
+
+Package: linux-image-rpi2-rpfv
+Architecture: armhf
+Depends: linux-image-4.9.0-6-rpi2
+Description:
+ This metapackage will pull in the raspbian kernel for the raspberry pi 2
+ based on the version currently reccomended by the raspberry pi foundation
+ (currently 4.9).
+
+Package: linux-headers-rpi2-rpfv
+Architecture: armhf
+Depends: linux-headers-4.9.0-6-rpi2
+Description:
+ This metapackage will pull in the headers for the raspbian kernel for the
+ raspberry pi 2 based on the version currently reccomended by the raspberry
+ pi foundation (currently 4.9).