UBUNTU: Ubuntu-4.10.0-2.4

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

diff --git a/debian.master/changelog b/debian.master/changelog
index 028b10f9e45678ddf6466d087e675ed00da1aa12..14faa050c10bf0e18d58f0de32283679b0762c5d 100644 (file)
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,8 +1,12 @@
-linux (4.10.0-2.4) UNRELEASED; urgency=low
+linux (4.10.0-2.4) zesty; 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.
+  * Move some kernel modules to the main kernel package (part 2) (LP: #1655002)
+    - [Config] Add IBM power drivers to the inclusion list
+
+  * Miscellaneous Ubuntu changes
+    - [Config] linux-source Provides should not be a macro
+    - [Config] Correct the note URL for LATENCYTOP
+    - rebase to v4.10-rc4
 
   [ Upstream Kernel Changes ]
 

diff --git a/debian.master/reconstruct b/debian.master/reconstruct
index 5438ffcddccc6ed961920d96c152c902fc1366ee..98865fb889e9df62ab7ee654a296540a0e00a53e 100644 (file)
--- a/debian.master/reconstruct
+++ b/debian.master/reconstruct
@@ -1,122 +1,3 @@
 # Recreate any symlinks created since the orig.
-[ ! -L 'ubuntu/vbox/vboxguest/include' ] && ln -sf '../include' 'ubuntu/vbox/vboxguest/include'
-[ ! -L 'ubuntu/vbox/vboxguest/r0drv' ] && ln -sf '../r0drv' 'ubuntu/vbox/vboxguest/r0drv'
-[ ! -L 'ubuntu/vbox/vboxsf/include' ] && ln -sf '../include' 'ubuntu/vbox/vboxsf/include'
-[ ! -L 'ubuntu/vbox/vboxsf/r0drv' ] && ln -sf '../r0drv' 'ubuntu/vbox/vboxsf/r0drv'
-[ ! -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 '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 5810259bdc699667df81144aa5b4d9b64cd1dd12..b29684e492759f92f57e95c832734a3550b8649c 100644 (file)
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,12 +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=ubuntu/vbox/vboxguest/include
-extend-diff-ignore=ubuntu/vbox/vboxguest/r0drv
-extend-diff-ignore=ubuntu/vbox/vboxsf/include
-extend-diff-ignore=ubuntu/vbox/vboxsf/r0drv
-extend-diff-ignore=ubuntu/vbox/vboxvideo/include
-extend-diff-ignore=ubuntu/vbox/vboxvideo/r0drv
 ## autoreconstruct -- end
 
 # force "dpkg-source -I -i" behavior