UBUNTU: Ubuntu-4.8.0-1011.13

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.raspi2/changelog b/debian.raspi2/changelog
index 106dbfdb7be68c66d403b775fac6f49003bc50ba..9a7f582f6c8ff2e9742d6d209c830ef5fae2c5c6 100644 (file)
--- a/debian.raspi2/changelog
+++ b/debian.raspi2/changelog
@@ -1,8 +1,11 @@
-linux-raspi2 (4.8.0-1011.13) UNRELEASED; urgency=low
+linux-raspi2 (4.8.0-1011.13) yakkety; urgency=low
 
-  CHANGELOG: Do not edit directly. Autogenerated at release.
-  CHANGELOG: Use the printchanges target to see the curent changes.
-  CHANGELOG: Use the insertchanges target to create the final log.
+  [ Tim Gardner ]
+
+  * Release Tracking Bug
+    - LP: #1629751
+
+  * Rebase against Ubuntu-4.8.0-20.22 (v4.8)
 
  -- Tim Gardner <tim.gardner@canonical.com>  Sun, 02 Oct 2016 20:51:53 -0600
 

diff --git a/debian.raspi2/reconstruct b/debian.raspi2/reconstruct
index 3b2285ba867c535df9fd7324d7a8e04c2e7cd74c..d325f9d146ea0e2c11234e9958dc4123668efedb 100644 (file)
--- a/debian.raspi2/reconstruct
+++ b/debian.raspi2/reconstruct
@@ -1,7 +1,4 @@
 # Recreate any symlinks created since the orig.
-[ ! -L 'arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi' ] && ln -sf '../../../../arm/boot/dts/bcm2835-rpi.dtsi' 'arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi'
-[ ! -L 'arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi' ] && ln -sf '../../../../arm/boot/dts/bcm283x-rpi-smsc9514.dtsi' 'arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi'
-[ ! -L 'arch/arm64/boot/dts/broadcom/bcm283x.dtsi' ] && ln -sf '../../../../arm/boot/dts/bcm283x.dtsi' 'arch/arm64/boot/dts/broadcom/bcm283x.dtsi'
 [ ! -L 'spl/rpm/redhat/spl-dkms.spec.in' ] && ln -sf '../generic/spl-dkms.spec.in' 'spl/rpm/redhat/spl-dkms.spec.in'
 [ ! -L 'spl/rpm/redhat/spl.spec.in' ] && ln -sf '../generic/spl.spec.in' 'spl/rpm/redhat/spl.spec.in'
 [ ! -L 'ubuntu/vbox/vboxguest/include' ] && ln -sf '../include' 'ubuntu/vbox/vboxguest/include'
@@ -11,66 +8,117 @@
 [ ! -L 'ubuntu/vbox/vboxvideo/include' ] && ln -sf '../include' 'ubuntu/vbox/vboxvideo/include'
 [ ! -L 'ubuntu/vbox/vboxvideo/r0drv' ] && ln -sf '../r0drv' 'ubuntu/vbox/vboxvideo/r0drv'
 # Remove any files deleted from the orig.
-rm -f 'arch/powerpc/kernel/hmi.c'
-rm -f 'debian.master/abi/4.8.0-0.0/abiname'
-rm -f 'debian.master/abi/4.8.0-0.0/amd64/generic'
-rm -f 'debian.master/abi/4.8.0-0.0/amd64/generic.compiler'
-rm -f 'debian.master/abi/4.8.0-0.0/amd64/generic.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/amd64/ignore'
-rm -f 'debian.master/abi/4.8.0-0.0/amd64/ignore.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/amd64/lowlatency'
-rm -f 'debian.master/abi/4.8.0-0.0/amd64/lowlatency.compiler'
-rm -f 'debian.master/abi/4.8.0-0.0/amd64/lowlatency.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/arm64/generic'
-rm -f 'debian.master/abi/4.8.0-0.0/arm64/generic.compiler'
-rm -f 'debian.master/abi/4.8.0-0.0/arm64/generic.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/arm64/ignore'
-rm -f 'debian.master/abi/4.8.0-0.0/arm64/ignore.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/armhf/generic'
-rm -f 'debian.master/abi/4.8.0-0.0/armhf/generic-lpae'
-rm -f 'debian.master/abi/4.8.0-0.0/armhf/generic-lpae.compiler'
-rm -f 'debian.master/abi/4.8.0-0.0/armhf/generic-lpae.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/armhf/generic.compiler'
-rm -f 'debian.master/abi/4.8.0-0.0/armhf/generic.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/armhf/ignore'
-rm -f 'debian.master/abi/4.8.0-0.0/armhf/ignore.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/fwinfo'
-rm -f 'debian.master/abi/4.8.0-0.0/i386/generic'
-rm -f 'debian.master/abi/4.8.0-0.0/i386/generic.compiler'
-rm -f 'debian.master/abi/4.8.0-0.0/i386/generic.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/i386/ignore'
-rm -f 'debian.master/abi/4.8.0-0.0/i386/ignore.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/i386/lowlatency'
-rm -f 'debian.master/abi/4.8.0-0.0/i386/lowlatency.compiler'
-rm -f 'debian.master/abi/4.8.0-0.0/i386/lowlatency.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/powerpc/generic'
-rm -f 'debian.master/abi/4.8.0-0.0/powerpc/generic.compiler'
-rm -f 'debian.master/abi/4.8.0-0.0/powerpc/generic.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/powerpc/ignore'
-rm -f 'debian.master/abi/4.8.0-0.0/powerpc/ignore.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/powerpc/powerpc-e500mc'
-rm -f 'debian.master/abi/4.8.0-0.0/powerpc/powerpc-e500mc.compiler'
-rm -f 'debian.master/abi/4.8.0-0.0/powerpc/powerpc-e500mc.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/powerpc/powerpc-smp'
-rm -f 'debian.master/abi/4.8.0-0.0/powerpc/powerpc-smp.compiler'
-rm -f 'debian.master/abi/4.8.0-0.0/powerpc/powerpc-smp.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/powerpc/powerpc64-emb'
-rm -f 'debian.master/abi/4.8.0-0.0/powerpc/powerpc64-emb.compiler'
-rm -f 'debian.master/abi/4.8.0-0.0/powerpc/powerpc64-emb.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/ppc64el/generic'
-rm -f 'debian.master/abi/4.8.0-0.0/ppc64el/generic.compiler'
-rm -f 'debian.master/abi/4.8.0-0.0/ppc64el/generic.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/ppc64el/ignore'
-rm -f 'debian.master/abi/4.8.0-0.0/ppc64el/ignore.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/s390x/generic'
-rm -f 'debian.master/abi/4.8.0-0.0/s390x/generic.compiler'
-rm -f 'debian.master/abi/4.8.0-0.0/s390x/generic.modules'
-rm -f 'debian.master/abi/4.8.0-0.0/s390x/ignore'
-rm -f 'debian.master/abi/4.8.0-0.0/s390x/ignore.modules'
-rm -f 'debian.master/d-i/modules/squashfs-modules'
-rm -f 'drivers/misc/bh1780gli.c'
-rm -f 'firmware/bnx2x/bnx2x-e1-7.12.30.0.fw.ihex'
-rm -f 'firmware/bnx2x/bnx2x-e1h-7.12.30.0.fw.ihex'
-rm -f 'firmware/bnx2x/bnx2x-e2-7.12.30.0.fw.ihex'
-rm -f 'lib/usercopy.c'
+rm -f 'firmware/acenic/tg1.bin.ihex'
+rm -f 'firmware/acenic/tg2.bin.ihex'
+rm -f 'firmware/adaptec/starfire_rx.bin.ihex'
+rm -f 'firmware/adaptec/starfire_tx.bin.ihex'
+rm -f 'firmware/advansys/3550.bin.ihex'
+rm -f 'firmware/advansys/38C0800.bin.ihex'
+rm -f 'firmware/advansys/38C1600.bin.ihex'
+rm -f 'firmware/advansys/mcode.bin.ihex'
+rm -f 'firmware/atmsar11.HEX'
+rm -f 'firmware/av7110/Boot.S'
+rm -f 'firmware/av7110/bootcode.bin.ihex'
+rm -f 'firmware/bnx2/bnx2-mips-06-6.2.1.fw.ihex'
+rm -f 'firmware/bnx2/bnx2-mips-09-6.2.1a.fw.ihex'
+rm -f 'firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex'
+rm -f 'firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex'
+rm -f 'firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex'
+rm -f 'firmware/cis/3CCFEM556.cis.ihex'
+rm -f 'firmware/cis/3CXEM556.cis.ihex'
+rm -f 'firmware/cis/COMpad2.cis.ihex'
+rm -f 'firmware/cis/COMpad4.cis.ihex'
+rm -f 'firmware/cis/DP83903.cis.ihex'
+rm -f 'firmware/cis/LA-PCM.cis.ihex'
+rm -f 'firmware/cis/MT5634ZLX.cis.ihex'
+rm -f 'firmware/cis/NE2K.cis.ihex'
+rm -f 'firmware/cis/PCMLM28.cis.ihex'
+rm -f 'firmware/cis/PE-200.cis.ihex'
+rm -f 'firmware/cis/PE520.cis.ihex'
+rm -f 'firmware/cis/RS-COM-2P.cis.ihex'
+rm -f 'firmware/cis/SW_555_SER.cis.ihex'
+rm -f 'firmware/cis/SW_7xx_SER.cis.ihex'
+rm -f 'firmware/cis/SW_8xx_SER.cis.ihex'
+rm -f 'firmware/cis/tamarack.cis.ihex'
+rm -f 'firmware/cpia2/stv0672_vp4.bin.ihex'
+rm -f 'firmware/cxgb3/ael2005_opt_edc.bin.ihex'
+rm -f 'firmware/cxgb3/ael2005_twx_edc.bin.ihex'
+rm -f 'firmware/cxgb3/ael2020_twx_edc.bin.ihex'
+rm -f 'firmware/cxgb3/t3b_psram-1.1.0.bin.ihex'
+rm -f 'firmware/cxgb3/t3c_psram-1.1.0.bin.ihex'
+rm -f 'firmware/dsp56k/bootstrap.asm'
+rm -f 'firmware/dsp56k/bootstrap.bin.ihex'
+rm -f 'firmware/edgeport/boot.H16'
+rm -f 'firmware/edgeport/boot2.H16'
+rm -f 'firmware/edgeport/down.H16'
+rm -f 'firmware/edgeport/down2.H16'
+rm -f 'firmware/edgeport/down3.bin.ihex'
+rm -f 'firmware/ess/maestro3_assp_kernel.fw.ihex'
+rm -f 'firmware/ess/maestro3_assp_minisrc.fw.ihex'
+rm -f 'firmware/kaweth/new_code.bin.ihex'
+rm -f 'firmware/kaweth/new_code_fix.bin.ihex'
+rm -f 'firmware/kaweth/trigger_code.bin.ihex'
+rm -f 'firmware/kaweth/trigger_code_fix.bin.ihex'
+rm -f 'firmware/keyspan/mpr.HEX'
+rm -f 'firmware/keyspan/usa18x.HEX'
+rm -f 'firmware/keyspan/usa19.HEX'
+rm -f 'firmware/keyspan/usa19qi.HEX'
+rm -f 'firmware/keyspan/usa19qw.HEX'
+rm -f 'firmware/keyspan/usa19w.HEX'
+rm -f 'firmware/keyspan/usa28.HEX'
+rm -f 'firmware/keyspan/usa28x.HEX'
+rm -f 'firmware/keyspan/usa28xa.HEX'
+rm -f 'firmware/keyspan/usa28xb.HEX'
+rm -f 'firmware/keyspan/usa49w.HEX'
+rm -f 'firmware/keyspan/usa49wlc.HEX'
+rm -f 'firmware/keyspan_pda/keyspan_pda.HEX'
+rm -f 'firmware/keyspan_pda/keyspan_pda.S'
+rm -f 'firmware/keyspan_pda/xircom_pgs.HEX'
+rm -f 'firmware/keyspan_pda/xircom_pgs.S'
+rm -f 'firmware/matrox/g200_warp.H16'
+rm -f 'firmware/matrox/g400_warp.H16'
+rm -f 'firmware/mts_cdma.fw.ihex'
+rm -f 'firmware/mts_edge.fw.ihex'
+rm -f 'firmware/mts_gsm.fw.ihex'
+rm -f 'firmware/myricom/lanai.bin.ihex'
+rm -f 'firmware/ositech/Xilinx7OD.bin.ihex'
+rm -f 'firmware/r128/r128_cce.bin.ihex'
+rm -f 'firmware/radeon/R100_cp.bin.ihex'
+rm -f 'firmware/radeon/R200_cp.bin.ihex'
+rm -f 'firmware/radeon/R300_cp.bin.ihex'
+rm -f 'firmware/radeon/R420_cp.bin.ihex'
+rm -f 'firmware/radeon/R520_cp.bin.ihex'
+rm -f 'firmware/radeon/R600_me.bin.ihex'
+rm -f 'firmware/radeon/R600_pfp.bin.ihex'
+rm -f 'firmware/radeon/RS600_cp.bin.ihex'
+rm -f 'firmware/radeon/RS690_cp.bin.ihex'
+rm -f 'firmware/radeon/RS780_me.bin.ihex'
+rm -f 'firmware/radeon/RS780_pfp.bin.ihex'
+rm -f 'firmware/radeon/RV610_me.bin.ihex'
+rm -f 'firmware/radeon/RV610_pfp.bin.ihex'
+rm -f 'firmware/radeon/RV620_me.bin.ihex'
+rm -f 'firmware/radeon/RV620_pfp.bin.ihex'
+rm -f 'firmware/radeon/RV630_me.bin.ihex'
+rm -f 'firmware/radeon/RV630_pfp.bin.ihex'
+rm -f 'firmware/radeon/RV635_me.bin.ihex'
+rm -f 'firmware/radeon/RV635_pfp.bin.ihex'
+rm -f 'firmware/radeon/RV670_me.bin.ihex'
+rm -f 'firmware/radeon/RV670_pfp.bin.ihex'
+rm -f 'firmware/radeon/RV710_me.bin.ihex'
+rm -f 'firmware/radeon/RV710_pfp.bin.ihex'
+rm -f 'firmware/radeon/RV730_me.bin.ihex'
+rm -f 'firmware/radeon/RV730_pfp.bin.ihex'
+rm -f 'firmware/radeon/RV770_me.bin.ihex'
+rm -f 'firmware/radeon/RV770_pfp.bin.ihex'
+rm -f 'firmware/sun/cassini.bin.ihex'
+rm -f 'firmware/tehuti/bdx.bin.ihex'
+rm -f 'firmware/ti_3410.fw.ihex'
+rm -f 'firmware/ti_5052.fw.ihex'
+rm -f 'firmware/ttusb-budget/dspbootcode.bin.ihex'
+rm -f 'firmware/vicam/firmware.H16'
+rm -f 'firmware/yam/1200.bin.ihex'
+rm -f 'firmware/yam/9600.bin.ihex'
+rm -f 'firmware/yamaha/ds1_ctrl.fw.ihex'
+rm -f 'firmware/yamaha/ds1_dsp.fw.ihex'
+rm -f 'firmware/yamaha/ds1e_ctrl.fw.ihex'
 exit 0

diff --git a/debian/source/options b/debian/source/options
index 44303e676e263c2089b7904efb3d125ca4cf4327..880ca8e2228c4b1dcba215aa3e4124ae622d7b0e 100644 (file)
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,9 +1,6 @@
 # Ignore vbox symlinks, we will regenerate these at clean (LP:1426113)
 ## autoreconstruct -- begin
 # Ignore any symlinks created since the orig which are rebuilt by reconstruct.
-extend-diff-ignore=arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi
-extend-diff-ignore=arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
-extend-diff-ignore=arch/arm64/boot/dts/broadcom/bcm283x.dtsi
 extend-diff-ignore=spl/rpm/redhat/spl-dkms.spec.in
 extend-diff-ignore=spl/rpm/redhat/spl.spec.in
 extend-diff-ignore=ubuntu/vbox/vboxguest/include