UBUNTU: Ubuntu-raspi2-4.10.0-1000.1

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

diff --git a/debian.raspi2/changelog b/debian.raspi2/changelog
index 90074d396e8dc181db27dc8602ee7d47c9e1df63..5d680d8cd5898118d8c52094a0a6ef4e5629afd7 100644 (file)
--- a/debian.raspi2/changelog
+++ b/debian.raspi2/changelog
@@ -1,8 +1,8 @@
-linux-raspi2 (4.10.0-1000.1) UNRELEASED; urgency=low
+linux-raspi2 (4.10.0-1000.1) 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.
+  * Rebased against Ubuntu-4.10.0-11.13
+  * Started with https://github.com/raspberrypi/linux.git rpi-4.10.y
+    commit 54ed9a995304217e81c8269ef1a842d241a48d9c
 
  -- Tim Gardner <tim.gardner@canonical.com>  Fri, 03 Mar 2017 10:57:42 -0700
 

diff --git a/debian.raspi2/reconstruct b/debian.raspi2/reconstruct
index d325f9d146ea0e2c11234e9958dc4123668efedb..153f423be95fb52f924d221142cbf587fd7a3a20 100644 (file)
--- a/debian.raspi2/reconstruct
+++ b/debian.raspi2/reconstruct
@@ -1,4 +1,5 @@
 # Recreate any symlinks created since the orig.
+[ ! -L 'arch/arm64/boot/dts/overlays' ] && ln -sf '../../../arm/boot/dts/overlays' 'arch/arm64/boot/dts/overlays'
 [ ! -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'
@@ -8,6 +9,7 @@
 [ ! -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 'drivers/acpi/gsi.c'
 rm -f 'firmware/acenic/tg1.bin.ihex'
 rm -f 'firmware/acenic/tg2.bin.ihex'
 rm -f 'firmware/adaptec/starfire_rx.bin.ihex'

diff --git a/debian/source/options b/debian/source/options
index ccc7d399660e49b7f62bd430563582d3961d8f64..f18978d11e8d9848e13deb615f51c4b7c25ec9dc 100644 (file)
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,6 +1,9 @@
 # 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/overlays$
+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$
 extend-diff-ignore=^ubuntu/vbox/vboxguest/r0drv$
 extend-diff-ignore=^ubuntu/vbox/vboxsf/include$