Quilt cleanup, merge header of old raspbian patch with body of new dgit-generated...

diff --git a/debian/patches/auto-2.1-1+rpi1-340dec90ef4ef95fc0e8915603f18fed2a2ba159-1519922714 b/debian/patches/auto-2.1-1+rpi1-340dec90ef4ef95fc0e8915603f18fed2a2ba159-1519922714
deleted file mode 100644 (file)
index efe8eef..0000000
--- a/debian/patches/auto-2.1-1+rpi1-340dec90ef4ef95fc0e8915603f18fed2a2ba159-1519922714
+++ /dev/null
@@ -1,104 +0,0 @@
-From: Raspbian forward porter <root@raspbian.org>
-Subject: Automatically generated patch (2.1-1+rpi1)
-
-Last (up to) 3 git changes, FYI:
-
-commit 340dec90ef4ef95fc0e8915603f18fed2a2ba159
-Author: Peter Michael Green <plugwash@raspbian.org>
-Date:   Thu Mar 1 16:44:02 2018 +0000
-
-    temporarily remove raspbian patch from quilt series.
-
-commit be7340fc6b35e1e169e9bf193c8019be86181b54
-Merge: d98d3e0 cc9ffe9
-Author: Peter Michael Green <plugwash@raspbian.org>
-Date:   Thu Mar 1 16:36:29 2018 +0000
-
-    Manual merge of version 2.0-2+rpi1 and 2.1-1 to produce 2.1-1+rpi1
-
-commit cc9ffe9ef47c99a2a877f16731d07c611aa844e9
-Merge: 9c1b23b 6411407
-Author: Sébastien Villemot <sebastien@debian.org>
-Date:   Sat Feb 17 20:30:10 2018 +0000
-
-    Merge ffcall (2.1-1) import into refs/heads/workingbranch
----
-
---- ffcall-2.1.orig/avcall/avcall-armhf-macro.S
-+++ ffcall-2.1/avcall/avcall-armhf-macro.S
-@@ -1,5 +1,5 @@
- #include "asm-arm.h"
--      .arch armv7-a
-+      .arch armv6
-       .eabi_attribute 28, 1
-       .eabi_attribute 20, 1
-       .eabi_attribute 21, 1
-@@ -15,7 +15,7 @@
-       .global C(avcall_call)
-       .syntax unified
-       .arm
--      .fpu vfpv3-d16
-+      .fpu vfpv2
-       .type   avcall_call, %function
- FUNBEGIN(avcall_call)
-       // args = 0, pretend = 0, frame = 0
---- ffcall-2.1.orig/callback/vacall_r/vacall-armhf-macro.S
-+++ ffcall-2.1/callback/vacall_r/vacall-armhf-macro.S
-@@ -1,5 +1,5 @@
- #include "asm-arm.h"
--      .arch armv7-a
-+      .arch armv6
-       .eabi_attribute 28, 1
-       .eabi_attribute 20, 1
-       .eabi_attribute 21, 1
-@@ -15,7 +15,7 @@
-       .global C(callback_receiver)
-       .syntax unified
-       .arm
--      .fpu vfpv3-d16
-+      .fpu vfpv2
-       .type   callback_receiver, %function
- FUNBEGIN(callback_receiver)
-       // args = 28, pretend = 0, frame = 176
---- ffcall-2.1.orig/vacall/vacall-armhf-macro.S
-+++ ffcall-2.1/vacall/vacall-armhf-macro.S
-@@ -1,6 +1,6 @@
- #include "asm-arm.h"
- #ifdef __PIC__
--      .arch armv7-a
-+      .arch armv6
-       .eabi_attribute 28, 1
-       .eabi_attribute 20, 1
-       .eabi_attribute 21, 1
-@@ -150,7 +150,7 @@ L(31):
-       .word   C(vacall_function)(GOT)
-       FUNEND(vacall_receiver)
- #else
--      .arch armv7-a
-+      .arch armv6
-       .eabi_attribute 28, 1
-       .eabi_attribute 20, 1
-       .eabi_attribute 21, 1
-@@ -166,7 +166,7 @@ L(31):
-       .global C(vacall_receiver)
-       .syntax unified
-       .arm
--      .fpu vfpv3-d16
-+      .fpu vfpv2
-       .type   vacall_receiver, %function
- FUNBEGIN(vacall_receiver)
-       // args = 20, pretend = 16, frame = 176
-@@ -176,8 +176,11 @@ FUNBEGIN(vacall_receiver)
-       push    {r4, r5, fp, lr}
-       add     fp, sp, $12
-       add     lr, fp, $4
--      movw    r4, $:lower16:C(vacall_function)
--      movt    r4, $:upper16:C(vacall_function)
-+      #raspbian mod, replace movw/movt with ldr psuedo-instruction
-+      #movw   r4, $:lower16:C(vacall_function)
-+      #movt   r4, $:upper16:C(vacall_function)
-+      ldr r4, =C(vacall_function)
-+      #end raspbian mod.
-       sub     sp, sp, $176
-       add     r5, fp, $20
-       stm     lr, {r0, r1, r2, r3}

diff --git a/debian/patches/raspbian.patch b/debian/patches/raspbian.patch
index 18ccaafcd9ca5edd2a360f757ac622327674a466..2be9df86102bbb73693221ad81bf85a7b4b0a240 100644 (file)
--- a/debian/patches/raspbian.patch
+++ b/debian/patches/raspbian.patch
@@ -3,21 +3,8 @@ Description: ffcall changes for raspbian.
    * Mark binaries as armv6 not armv7
 Author: Peter Michael Green <plugwash@raspbian.org>
 
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2017-12-07
-
---- ffcall-2.0.orig/avcall/avcall-armhf-macro.S
-+++ ffcall-2.0/avcall/avcall-armhf-macro.S
+--- ffcall-2.1.orig/avcall/avcall-armhf-macro.S
++++ ffcall-2.1/avcall/avcall-armhf-macro.S
 @@ -1,5 +1,5 @@
  #include "asm-arm.h"
 -      .arch armv7-a
@@ -34,8 +21,8 @@ Last-Update: 2017-12-07
        .type   avcall_call, %function
  FUNBEGIN(avcall_call)
        // args = 0, pretend = 0, frame = 0
---- ffcall-2.0.orig/callback/vacall_r/vacall-armhf-macro.S
-+++ ffcall-2.0/callback/vacall_r/vacall-armhf-macro.S
+--- ffcall-2.1.orig/callback/vacall_r/vacall-armhf-macro.S
++++ ffcall-2.1/callback/vacall_r/vacall-armhf-macro.S
 @@ -1,5 +1,5 @@
  #include "asm-arm.h"
 -      .arch armv7-a
@@ -52,16 +39,26 @@ Last-Update: 2017-12-07
        .type   callback_receiver, %function
  FUNBEGIN(callback_receiver)
        // args = 28, pretend = 0, frame = 176
---- ffcall-2.0.orig/vacall/vacall-armhf-macro.S
-+++ ffcall-2.0/vacall/vacall-armhf-macro.S
-@@ -1,5 +1,5 @@
+--- ffcall-2.1.orig/vacall/vacall-armhf-macro.S
++++ ffcall-2.1/vacall/vacall-armhf-macro.S
+@@ -1,6 +1,6 @@
  #include "asm-arm.h"
+ #ifdef __PIC__
 -      .arch armv7-a
 +      .arch armv6
        .eabi_attribute 28, 1
        .eabi_attribute 20, 1
        .eabi_attribute 21, 1
-@@ -15,7 +15,7 @@
+@@ -150,7 +150,7 @@ L(31):
+       .word   C(vacall_function)(GOT)
+       FUNEND(vacall_receiver)
+ #else
+-      .arch armv7-a
++      .arch armv6
+       .eabi_attribute 28, 1
+       .eabi_attribute 20, 1
+       .eabi_attribute 21, 1
+@@ -166,7 +166,7 @@ L(31):
        .global C(vacall_receiver)
        .syntax unified
        .arm
@@ -70,7 +67,7 @@ Last-Update: 2017-12-07
        .type   vacall_receiver, %function
  FUNBEGIN(vacall_receiver)
        // args = 20, pretend = 16, frame = 176
-@@ -25,8 +25,11 @@ FUNBEGIN(vacall_receiver)
+@@ -176,8 +176,11 @@ FUNBEGIN(vacall_receiver)
        push    {r4, r5, fp, lr}
        add     fp, sp, $12
        add     lr, fp, $4

diff --git a/debian/patches/series b/debian/patches/series
index 7bcaaa8617dfb0af47ca4090e0156c1649ec3805..ad6cb95e392a6e689bd5a93531edbadf9f83c593 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 mips-fpxx.patch
-auto-2.1-1+rpi1-340dec90ef4ef95fc0e8915603f18fed2a2ba159-1519922714
+raspbian.patch