Update buildnewlinuxpackage scripts to version used to produce this package.

diff --git a/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage1 b/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage1
index dfc2d7030679f258153f38e45d8bbd39e9f54723..743ca591db9b201d94a066fb74908cff88444ed9 100755 (executable)
--- a/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage1
+++ b/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage1
@@ -28,6 +28,11 @@ if grep ^debian/patches/series$ ../conflicts ; then
     git add debian/patches/series
 fi
 
+if grep ^debian/patches/series-rt$ ../conflicts ; then
+    $scriptdir/fixupseries debian/patches/series-rt
+    git add debian/patches/series-rt
+fi
+
 if grep ^debian/config/defines$ ../conflicts ; then
     ($scriptdir/fixupcontrol debian/config/defines .. && git add debian/config/defines) || true
 fi

diff --git a/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage2 b/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage2
index 3b77a44a58fe20692e26ef0c94bb9ada4cf89679..1a98d24e61cbea266218801e1c9f1b1f7db2166d 100755 (executable)
--- a/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage2
+++ b/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage2
@@ -19,12 +19,12 @@ git config --local user.email root@raspbian.org
 git config merge.conflictstyle diff3
 
 #remove some debian patches that conflict with rpi stuff
-patch -p1 -R < debian/patches/bugfix/all/mm-larger-stack-guard-gap-between-vmas.patch
-grep -v bugfix/all/mm-larger-stack-guard-gap-between-vmas.patch debian/patches/series | sponge debian/patches/series
-patch -p1 -R < debian/patches/bugfix/x86/pinctrl-cherryview-add-a-quirk-to-make-acer-chromebo.patch
-grep -v bugfix/x86/pinctrl-cherryview-add-a-quirk-to-make-acer-chromebo.patch debian/patches/series | sponge debian/patches/series
+#patch -p1 -R < debian/patches/bugfix/all/mm-larger-stack-guard-gap-between-vmas.patch
+#grep -v bugfix/all/mm-larger-stack-guard-gap-between-vmas.patch debian/patches/series | sponge debian/patches/series
+#patch -p1 -R < debian/patches/bugfix/x86/pinctrl-cherryview-add-a-quirk-to-make-acer-chromebo.patch
+#grep -v bugfix/x86/pinctrl-cherryview-add-a-quirk-to-make-acer-chromebo.patch debian/patches/series | sponge debian/patches/series
 
-git commit -a -m 'remove some debian patches that conflict with rpi stuff'
+#git commit -a -m 'remove some debian patches that conflict with rpi stuff'
 
 #pseudomerge in upstream history
 #annoyingly newer versions of git require --allow-unrelated-histories while older versions do not recognise it

diff --git a/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage3 b/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage3
index 4d18716793baba3bab4de27e470de548b3b7aa41..7fe2114eb3a55bac3acc90d8a5984be9cbc21c54 100755 (executable)
--- a/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage3
+++ b/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage3
@@ -43,6 +43,18 @@ unset QUILT_PATCHES
 cd ..
 rm -rf usextract
 
-git commit -a -m 'defuzz patches'
+if ! git diff --quiet; then
+       git commit -a -m 'defuzz patches'
+fi
+
+#apply manual downstream patches, otherwise dgit will remove them.
+MANUALDOWNSTREAMPATCHES=`git diff buildnewlinuxpackage-deb buildnewlinuxpackage-pkgmerge debian/patches/series | grep -E '^\+' | grep -Ev '^\+#'  | grep -Ev '^\+rpi/' | grep -Ev '^\+\+' | sed s/^.//`
+for FILE in $MANUALDOWNSTREAMPATCHES ; do
+       patch -p1 < debian/patches/$FILE
+done
+
+if ! git diff --quiet; then
+       git commit -a -m 'apply manual raspbian patches'
+fi
 
 dgit --quilt=auto quilt-fixup