Skip to content

W
White Rabbit Switch - Software
Commit ae852163 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

patches/buildroot: turn all patches into git ones (no change) 

This adds the git headers, so we can easily rebuild a buildroot-for-wrs
tree to add more patches.

This is how I do it now (where "wrs-build" and "wr-switch-sw" are
at the same directory level.

   cd wrs-build

    mkdir tmp; cd tmp
   tar xf ../downloads/buildroot-2016.02.tar.bz2
   cd buildroot-2016.02/

   git init; git add .; git commit -m "buildroot-2016.02 as untarred"
   git am ../../../wr-switch-sw/patches/buildroot/00*
   mv .git ../../build/buildroot-2016.02/

   cd ../../build/buildroot-2016.02
   <work-here>
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 8a971908
Pipeline #508 passed with stage
    in 96 minutes and 31 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 82 additions and 17 deletions
    patches/buildroot/0006-fix-monit-for-libmusl.patch
    View file @ ae852163
    --- ./package/monit/0002-sysdep_LINUX-avoid-GLOB_ONLYDIR-missin-in-libmusl.patch.orig 2017-01-13 10:56:04.777413556 +0100
    +++ ./package/monit/0002-sysdep_LINUX-avoid-GLOB_ONLYDIR-missin-in-libmusl.patch 2017-01-13 10:55:21.384411938 +0100
    From 4e8487e7fcd521648ee2541cf091364fac4ab5fe Mon Sep 17 00:00:00 2001
    From: Alessandro Rubini <rubini@gnudd.com>
    Date: Tue, 6 Oct 2020 06:27:45 +0200
    Subject: [PATCH 06/22] fix monit for libmusl
    Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
    ---
    ...INUX-avoid-GLOB_ONLYDIR-missin-in-libmusl.patch | 29 ++++++++++++++++++++++
    1 file changed, 29 insertions(+)
    create mode 100644 package/monit/0002-sysdep_LINUX-avoid-GLOB_ONLYDIR-missin-in-libmusl.patch
    diff --git a/package/monit/0002-sysdep_LINUX-avoid-GLOB_ONLYDIR-missin-in-libmusl.patch b/package/monit/0002-sysdep_LINUX-avoid-GLOB_ONLYDIR-missin-in-libmusl.patch
    new file mode 100644
    index 0000000..442f7eb
    --- /dev/null
    +++ b/package/monit/0002-sysdep_LINUX-avoid-GLOB_ONLYDIR-missin-in-libmusl.patch
    @@ -0,0 +1,29 @@
    +From de586dd21587d52001635dd6be7c70b85a24800f Mon Sep 17 00:00:00 2001
    +From: Alessandro Rubini <rubini@gnudd.com>
    ......@@ -30,3 +44,6 @@
    +--
    +2.1.4
    +
    --
    2.1.4
    patches/buildroot/0007-fix-gdb-build-with-musl.patch
    View file @ ae852163
    --- ./package/gdb/7.9.1/0007-move-__SIGRTMIN.patch.orig 2017-01-13 12:28:21.690620042 +0100
    +++ ./package/gdb/7.9.1/0007-move-__SIGRTMIN.patch 2017-01-13 12:28:10.544619626 +0100
    From 216ff083f3d268847356233804cafc43441fc301 Mon Sep 17 00:00:00 2001
    From: Alessandro Rubini <rubini@gnudd.com>
    Date: Tue, 6 Oct 2020 06:28:48 +0200
    Subject: [PATCH 07/22] fix gdb build with musl
    Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
    ---
    package/gdb/7.9.1/0007-move-__SIGRTMIN.patch | 58 ++++++++++++++++++++++++++++
    1 file changed, 58 insertions(+)
    create mode 100644 package/gdb/7.9.1/0007-move-__SIGRTMIN.patch
    diff --git a/package/gdb/7.9.1/0007-move-__SIGRTMIN.patch b/package/gdb/7.9.1/0007-move-__SIGRTMIN.patch
    new file mode 100644
    index 0000000..38ba1f0
    --- /dev/null
    +++ b/package/gdb/7.9.1/0007-move-__SIGRTMIN.patch
    @@ -0,0 +1,58 @@
    +From 682b25469e66ea45b214e95962671373983c118f Mon Sep 17 00:00:00 2001
    +From: Doug Evans <dje@google.com>
    ......@@ -59,3 +73,6 @@
    +--
    +1.9.4
    +
    --
    2.1.4
    patches/buildroot/0008-fix-gdb-musl-more.patch
    View file @ ae852163
    --- ./package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch.orig 2017-01-16 09:24:23.097874596 +0100
    +++ ./package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch 2016-10-18 02:43:07.221913059 +0200
    From 2297fe5126561d3966642f5d4ae3015b6420577e Mon Sep 17 00:00:00 2001
    From: Alessandro Rubini <rubini@gnudd.com>
    Date: Tue, 6 Oct 2020 06:30:58 +0200
    Subject: [PATCH 08/22] fix gdb musl more
    Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
    ---
    ...musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch | 63 ++++++++++++++++++++++
    1 file changed, 63 insertions(+)
    create mode 100644 package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch
    diff --git a/package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch b/package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch
    new file mode 100644
    index 0000000..60c357c
    --- /dev/null
    +++ b/package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch
    @@ -0,0 +1,63 @@
    +From 963843d4d07aef6caa296dacf191f8adc9518596 Mon Sep 17 00:00:00 2001
    +From: Doug Evans <dje@google.com>
    ......@@ -64,3 +78,6 @@
    +--
    +1.9.4
    +
    --
    2.1.4
    patches/buildroot/0010-add-libkrb5.patch
    View file @ ae852163
    From f6ac6fde47cedd2b0a92412b39f9b9a014d637a7 Mon Sep 17 00:00:00 2001
    From: Adam Wujek <adam.wujek@cern.ch>
    Date: Tue, 4 Sep 2018 10:48:30 +0200
    Subject: [PATCH] add libkrb5
    From 7c6cef81955d9cefe9efb132af5f9d5f0c6ec9c1 Mon Sep 17 00:00:00 2001
    From: Alessandro Rubini <rubini@gnudd.com>
    Date: Tue, 6 Oct 2020 06:33:39 +0200
    Subject: [PATCH 10/22] add libkrb5
    Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
    Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
    ---
    package/Config.in | 1 +
    package/libkrb5/Config.in | 18 ++++++++++++++++
    package/libkrb5/libkrb5.hash | 5 +++++
    package/libkrb5/libkrb5.mk | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
    package/libkrb5/Config.in | 18 ++++++++++++++
    package/libkrb5/libkrb5.hash | 5 ++++
    package/libkrb5/libkrb5.mk | 59 ++++++++++++++++++++++++++++++++++++++++++++
    4 files changed, 83 insertions(+)
    create mode 100644 package/libkrb5/Config.in
    create mode 100644 package/libkrb5/libkrb5.hash
    ......@@ -127,5 +127,5 @@ index 0000000..d9d7160
    +
    +$(eval $(autotools-package))
    --
    1.9.1
    2.1.4
    patches/buildroot/0010-port-to-perl-5.22-and-later.patch
    View file @ ae852163
    From 75de386f758249d89c003a6ff0accbfee21c3129 Mon Sep 17 00:00:00 2001
    From: Alessandro Rubini <rubini@gnudd.com>
    Date: Tue, 6 Oct 2020 06:35:13 +0200
    Subject: [PATCH 11/22] port to perl-5.22 and later
    Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
    ---
    .../0002-port-to-perl-5.22-and-later.patch | 23 ++++++++++++++++++++++
    1 file changed, 23 insertions(+)
    create mode 100644 package/automake/0002-port-to-perl-5.22-and-later.patch
    diff --git a/package/automake/0002-port-to-perl-5.22-and-later.patch b/package/automake/0002-port-to-perl-5.22-and-later.patch
    new file mode 100644
    index 0000000..a7213d4
    index 0000000..14f01b8
    --- /dev/null
    +++ b/package/automake/0002-port-to-perl-5.22-and-later.patch
    @@ -0,0 +1,23 @@
    @@ -0,0 +1,23 @@
    +Without this change, Perl 5.22 complains "Unescaped left brace in
    +regex is deprecated" and this is planned to become a hard error in
    +Perl 5.26. See:
    ......@@ -27,3 +38,6 @@ index 0000000..a7213d4
    ++ $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
    + return $text;
    + }
    --
    2.1.4
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment