Make usbip gcc 7 fix work with gcc 6 too.

Remove features/all/rt/0207-block-Turn-off-warning-which-is-bogus-on-RT.patch from debian/patches/series-rt as it conflicts
with rpi patches.

diff --git a/debian/changelog b/debian/changelog
index 724bbac6073c6c1f05a414478ed07949ddb6739f..e73a64884d7457cdc370767a11d27285bca1ebd1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-linux-4.9 (4.9.51-1+rpi1) buster-staging; urgency=medium
+linux-4.9 (4.9.51-1+rpi1) stretch-staging; urgency=medium
 
   [Changes from 3.18.5-1~exp1+rpi1 or earlier]
   [Vagrant Cascadian <vagrant@debian.org>]
@@ -136,15 +136,18 @@ linux-4.9 (4.9.51-1+rpi1) buster-staging; urgency=medium
   * Remove debian/installer/armhf/modules/armhf-rpi*/ext?-modules
 
   [changes brought forward from 4.9.30-2+deb9u2+rpi1+stretch by Peter Michael Green <plugwash@raspbian.org> at Wed, 27 Sep 2017 02:45:53 +0000]
-  * Rebuild under stretch.
   * Re-enable libc-dev package.
 
   [changes brought forward from 4.9.30-2+deb9u2+rpi1+stretch+buster by Peter Michael Green <plugwash@raspbian.org> at Thu, 05 Oct 2017 02:53:12 +0000]
-  * Rebuild under buster
   * Fix linux-compiler package generation.
   * Fix usbip "format-overflow" failure.
 
- -- Raspbian forward porter <root@raspbian.org>  Sun, 08 Oct 2017 00:26:45 +0000
+  [changes introduced in 4.9.51-1+rpi1 by Peter Michael Green]
+  * Make usbip gcc 7 fix work with gcc 6 too.
+  * Remove features/all/rt/0207-block-Turn-off-warning-which-is-bogus-on-RT.patch from debian/patches/series-rt as it conflicts
+    with rpi patches.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 08 Oct 2017 00:26:45 +0000
 
 linux (4.9.51-1) stretch; urgency=medium
 

diff --git a/debian/control.md5sum b/debian/control.md5sum
index e7c0db4e6bf4b82f3ed45074f1ca74ccb4c5df93..4ca55e6ab7906364ec6161460bc68df593554291 100644 (file)
--- a/debian/control.md5sum
+++ b/debian/control.md5sum
@@ -1,5 +1,5 @@
 d283c069b160f0834a069a23b9fc79a4  debian/bin/gencontrol.py
-72fa53734cfdfc6468675da36a2a2683  debian/changelog
+fbf9d67457040c24a95dca321a33281c  debian/changelog
 e492c730e8bc71cc52aa5315391e587e  debian/templates/control.main.in
 8ff553ff7232b003c35bdd074913bc8a  debian/templates/control.image-unsigned.in
 a0307842c8c97bd549f3dba7b53a709f  debian/templates/image.preinst.in

diff --git a/debian/patches/rpmanualusbip-format-overflow.patch b/debian/patches/rpmanualusbip-format-overflow.patch
index 4e86139f883d116ff78ceb97887241ff4c755fa6..c74810f07868919ccfd232cbe18a2fbed9461ce1 100644 (file)
--- a/debian/patches/rpmanualusbip-format-overflow.patch
+++ b/debian/patches/rpmanualusbip-format-overflow.patch
@@ -2,10 +2,10 @@ Description:  Fix usbip "format-overflow" failure.
 Author: Peter Michael Green <plugwash@raspbian.org>
 
 
-Index: linux-4.9-4.9.30/tools/usb/usbip/libsrc/usbip_common.c
+Index: linux-4.9-4.9.51/tools/usb/usbip/libsrc/usbip_common.c
 ===================================================================
---- linux-4.9-4.9.30.orig/tools/usb/usbip/libsrc/usbip_common.c
-+++ linux-4.9-4.9.30/tools/usb/usbip/libsrc/usbip_common.c
+--- linux-4.9-4.9.51.orig/tools/usb/usbip/libsrc/usbip_common.c
++++ linux-4.9-4.9.51/tools/usb/usbip/libsrc/usbip_common.c
 @@ -214,10 +214,11 @@ int read_usb_device(struct udev_device *
  int read_usb_interface(struct usbip_usb_device *udev, int i,
                       struct usbip_usb_interface *uinf)
@@ -20,23 +20,24 @@ Index: linux-4.9-4.9.30/tools/usb/usbip/libsrc/usbip_common.c
  
        sif = udev_device_new_from_subsystem_sysname(udev_context, "usb", busid);
        if (!sif) {
-Index: linux-4.9-4.9.30/tools/usb/usbip/libsrc/usbip_host_common.c
+Index: linux-4.9-4.9.51/tools/usb/usbip/libsrc/usbip_host_common.c
 ===================================================================
---- linux-4.9-4.9.30.orig/tools/usb/usbip/libsrc/usbip_host_common.c
-+++ linux-4.9-4.9.30/tools/usb/usbip/libsrc/usbip_host_common.c
-@@ -21,6 +21,8 @@
+--- linux-4.9-4.9.51.orig/tools/usb/usbip/libsrc/usbip_host_common.c
++++ linux-4.9-4.9.51/tools/usb/usbip/libsrc/usbip_host_common.c
+@@ -21,6 +21,9 @@
   * along with this program. If not, see <http://www.gnu.org/licenses/>.
   */
  
++#pragma GCC diagnostic warning "-Wpragmas"
 +#pragma GCC diagnostic warning "-Wformat-truncation"
 +
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <fcntl.h>
-Index: linux-4.9-4.9.30/tools/usb/usbip/src/usbip.c
+Index: linux-4.9-4.9.51/tools/usb/usbip/src/usbip.c
 ===================================================================
---- linux-4.9-4.9.30.orig/tools/usb/usbip/src/usbip.c
-+++ linux-4.9-4.9.30/tools/usb/usbip/src/usbip.c
+--- linux-4.9-4.9.51.orig/tools/usb/usbip/src/usbip.c
++++ linux-4.9-4.9.51/tools/usb/usbip/src/usbip.c
 @@ -176,6 +176,9 @@ int main(int argc, char *argv[])
                        break;
                case '?':

diff --git a/debian/patches/series-rt b/debian/patches/series-rt
index 759a7142410315de479afc26e086f2860c540dcc..ecb75367cbf09a32829db75c2faf9f92bdec5c69 100644 (file)
--- a/debian/patches/series-rt
+++ b/debian/patches/series-rt
@@ -204,7 +204,6 @@ features/all/rt/0203-hrtimer-Move-schedule_work-call-to-helper-thread.patch
 features/all/rt/0204-locking-percpu-rwsem-Remove-preempt_disable-variants.patch
 features/all/rt/0205-fs-namespace-preemption-fix.patch
 features/all/rt/0206-mm-Protect-activate_mm-by-preempt_-disable-enable-_r.patch
-features/all/rt/0207-block-Turn-off-warning-which-is-bogus-on-RT.patch
 features/all/rt/0208-fs-ntfs-disable-interrupt-only-on-RT.patch
 features/all/rt/0209-fs-jbd2-pull-your-plug-when-waiting-for-space.patch
 features/all/rt/0210-x86-Convert-mce-timer-to-hrtimer.patch

diff --git a/tools/usb/usbip/libsrc/usbip_host_common.c b/tools/usb/usbip/libsrc/usbip_host_common.c
index 47aba5ad179f02b63141c851c406632c253b02f5..887c5b391265e82f1c7edf2d9a988cc7eada6791 100644 (file)
--- a/tools/usb/usbip/libsrc/usbip_host_common.c
+++ b/tools/usb/usbip/libsrc/usbip_host_common.c
@@ -21,6 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma GCC diagnostic warning "-Wpragmas"
 #pragma GCC diagnostic warning "-Wformat-truncation"
 
 #include <sys/types.h>