<div dir="auto"><div>Hi Team,,</div><div dir="auto"><br></div><div dir="auto">1. What is the realtion between build root and busy box. ? Not clear to me</div><div dir="auto"><br></div><div dir="auto">2.As we compile whole linux some build output comes in case of busy box also if am not wrong.</div><div dir="auto"><br></div><div dir="auto">So will it be a firmware image , if yes then will it can contain multiple binaries.</div><div dir="auto"><br></div><div dir="auto">3. If point 2 is yes , if one of user binary crash what will be the way to find crash point in that binaries.</div><div dir="auto"><br></div><div dir="auto"><br></div><div dir="auto"><br></div><div dir="auto"><br></div><div dir="auto">Thanks</div><div dir="auto">Kunal</div><div dir="auto"><br></div><div dir="auto"><div class="gmail_extra" dir="auto"><br><div class="gmail_quote">On 8 May 2020 15:24, <<a href="mailto:buildroot-request@busybox.net" target="_blank">buildroot-request@busybox.net</a><wbr>> wrote:<br type="attribution"><blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Send buildroot mailing list submissions to<br>
<a href="mailto:buildroot@busybox.net" target="_blank">buildroot@busybox.net</a><br>
<br>
To subscribe or unsubscribe via the World Wide Web, visit<br>
<a href="http://lists.busybox.net/mailman/listinfo/buildroot" rel="noreferrer" target="_blank">http://lists.busybox.net/mailm<wbr>an/listinfo/buildroot</a><br>
or, via email, send a message with subject or body 'help' to<br>
<a href="mailto:buildroot-request@busybox.net" target="_blank">buildroot-request@busybox.net</a><br>
<br>
You can reach the person managing the list at<br>
<a href="mailto:buildroot-owner@busybox.net" target="_blank">buildroot-owner@busybox.net</a><br>
<br>
When replying, please edit your Subject line so it is more specific<br>
than "Re: Contents of buildroot digest..."<br>
<br>
<br>
Today's Topics:<br>
<br>
1. [git commit] package/apparmor: replace deprecated egrep with<br>
grep -E (Yann E. MORIN)<br>
2. Re: [PATCH] package/uacme: bump version to 1.2.3 (Peter Korsgaard)<br>
3. Re: [PATCH 2/5] package/apparmor: fix compatibility with<br>
busybox grep (Yann E. MORIN)<br>
4. Re: [PATCH 1/5] package/apparmor: replace deprecated egrep<br>
with grep -E (Yann E. MORIN)<br>
5. [git commit] package/domoticz: set WITH_LIBUSB (Yann E. MORIN)<br>
6. Re: [PATCH v2 1/1] package/freescale-imx/imx-gpu-<wbr>g2d: fix the<br>
file name (Peter Korsgaard)<br>
7. [git commit branch/2020.02.x] package/midori: needs gcc >= 7<br>
(Peter Korsgaard)<br>
8. [git commit branch/2020.02.x] {linux, linux-headers}: bump<br>
4.{4, 9, 14, 19}.x / 5.{4, 5, 6}.x series (Peter Korsgaard)<br>
9. [git commit branch/2020.02.x] package/python: bump version to<br>
2.7.18 (Peter Korsgaard)<br>
10. [git commit branch/2020.02.x] package/python-jedi: add<br>
missing license (Peter Korsgaard)<br>
11. [git commit branch/2020.02.x]<br>
package/freescale-imx/imx-gpu-<wbr>g2d: fix the file name for ARM<br>
(Peter Korsgaard)<br>
12. [git commit branch/2020.02.x] package/openjdk: Remove sparc<br>
support (Peter Korsgaard)<br>
13. [git commit branch/2020.02.x] package/openjdk: copy all<br>
directories and files when installing (Peter Korsgaard)<br>
14. [git commit branch/2020.02.x] package/libglib2: restore use<br>
of system printf (Peter Korsgaard)<br>
15. [git commit branch/2020.02.x] package/openjdk: fix<br>
installation with merged usr directories (Peter Korsgaard)<br>
16. Re: .br2-external files (Yann E. MORIN)<br>
17. Re: [PATCH] package/binutils: fix XTENSA_NDIFF handling for<br>
PR ld/25861 (Max Filippov)<br>
18. [PATCH] release: don't include temp files (Yann E. MORIN)<br>
19. Re: [PATCH 1/1] package/domoticz: set WITH_LIBUSB (Yann E. MORIN)<br>
20. [PATCH] package/gcc: remove powerpc conditional patch<br>
(Romain Naour)<br>
21. [PATCH 1/1] package/c-icap: fix musl build (Fabrice Fontaine)<br>
22. [Bug 12841] util-linux/sfdisk 2.35.1 fails on sector-size<br>
header (<a href="mailto:bugzilla@busybox.net" target="_blank">bugzilla@busybox.net</a>)<br>
23. Re: [PATCH] release: don't include temp files (Peter Korsgaard)<br>
24. [git commit] release: don't include temp files (Peter Korsgaard)<br>
25. Re: [PATCH] package/binutils: fix xtensa PR ld/25861<br>
(Peter Korsgaard)<br>
26. Re: [PATCH] package/binutils: fix XTENSA_NDIFF handling for<br>
PR ld/25861 (Peter Korsgaard)<br>
27. Re: [PATCH 1/1] package/evtest: switch to Gitlab (Peter Korsgaard)<br>
28. [PATCH 1/1] configs/globalscale_espressobi<wbr>n: new defconfig<br>
(Joachim Nilsson)<br>
29. Re: [PATCH] package/apache: fixing apxs path mangling<br>
(Peter Korsgaard)<br>
30. Re: [git commit] package/wireguard-linux-compat<wbr>: depend on<br>
headers < 5.6 (Peter Korsgaard)<br>
31. Re: [git commit] package/wireguard-linux-compat<wbr>: tweak<br>
kernel-headers < 5.6 logic (Peter Korsgaard)<br>
32. Re: [PATCH 1/1] fs/cpio: make initramfs init script survive<br>
'console=' kernel argument (Peter Korsgaard)<br>
33. [git commit branch/2020.02.x] package/wireguard-linux-compat<wbr>:<br>
tweak kernel-headers < 5.6 logic (Peter Korsgaard)<br>
34. [git commit branch/2020.02.x] package/apache: fixing apxs<br>
path mangling (Peter Korsgaard)<br>
35. [git commit branch/2020.02.x] package/wireguard-linux-compat<wbr>:<br>
depend on headers < 5.6 (Peter Korsgaard)<br>
36. [git commit branch/2020.02.x] package/binutils: fix<br>
XTENSA_NDIFF handling for PR ld/25861 (Peter Korsgaard)<br>
37. [git commit branch/2020.02.x] package/evtest: switch to<br>
Gitlab (Peter Korsgaard)<br>
38. [git commit branch/2020.02.x] fs/cpio: make initramfs init<br>
script survive 'console=' kernel argument (Peter Korsgaard)<br>
39. [git commit branch/2020.02.x] package/binutils: fix xtensa PR<br>
ld/25861 (Peter Korsgaard)<br>
<br>
<br>
------------------------------<wbr>------------------------------<wbr>----------<br>
<br>
Message: 1<br>
Date: Fri, 8 May 2020 09:58:22 +0200<br>
From: Yann E. MORIN <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit] package/apparmor: replace deprecated<br>
egrep with grep -E<br>
Message-ID: <<a href="mailto:20200508075218.CC7D690FD0@busybox.osuosl.org" target="_blank">20200508075218.CC7D690FD0@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=6569d76aeaf4726359166b429bf42e54ec9ce71e" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=6569d76aeaf47<wbr>26359166b429bf42e54ec9ce71e</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/master" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>master</a><br>
<br>
Upstream commit: 5f46dedd6e8109d845af118b36039a<wbr>5d7dd05af9<br>
<br>
Signed-off-by: Adam Duskett <<a href="mailto:Aduskett@gmail.com" target="_blank">Aduskett@gmail.com</a>><br>
Signed-off-by: Yann E. MORIN <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
---<br>
...0002-replace-deprecated-eg<wbr>rep-with-grep-e.patch | 28 ++++++++++++++++++++++<br>
1 file changed, 28 insertions(+)<br>
<br>
diff --git a/package/apparmor/0002-replac<wbr>e-deprecated-egrep-with-grep-<wbr>e.patch b/package/apparmor/0002-replac<wbr>e-deprecated-egrep-with-grep-<wbr>e.patch<br>
new file mode 100644<br>
index 0000000000..4caefe447b<br>
--- /dev/null<br>
+++ b/package/apparmor/0002-replac<wbr>e-deprecated-egrep-with-grep-<wbr>e.patch<br>
@@ -0,0 +1,28 @@<br>
+From 5f46dedd6e8109d845af118b36039a<wbr>5d7dd05af9 Mon Sep 17 00:00:00 2001<br>
+From: Christian Boltz <<a href="mailto:apparmor@cboltz.de" target="_blank">apparmor@cboltz.de</a>><br>
+Date: Mon, 18 Mar 2019 19:17:16 +0100<br>
+Subject: [PATCH] replace deprecated egrep with grep -e<br>
+<br>
+(cherry picked from commit 5f46dedd6e8109d845af118b36039a<wbr>5d7dd05af9)<br>
+Signed-off-by: Christian Boltz <<a href="mailto:apparmor@cboltz.de" target="_blank">apparmor@cboltz.de</a>><br>
+Signed-off-by: Adam Duskett <<a href="mailto:Aduskett@gmail.com" target="_blank">Aduskett@gmail.com</a>><br>
+---<br>
+ parser/rc.apparmor.functions | 2 +-<br>
+ 1 file changed, 1 insertion(+), 1 deletion(-)<br>
+<br>
+diff --git a/parser/rc.apparmor.functions b/parser/rc.apparmor.functions<br>
+index 22e8367..f3108f8 100644<br>
+--- a/parser/rc.apparmor.functions<br>
++++ b/parser/rc.apparmor.functions<br>
+@@ -129,7 +129,7 @@ skip_profile() {<br>
+ "${profile%.pacnew}" != "${profile}" ] ; then<br>
+ return 2<br>
+ fi<br>
+- if echo "${profile}" | egrep -q '^.+\.new-[0-9\.]+_[0-9]+$'; then<br>
++ if echo "${profile}" | grep -E -q '^.+\.new-[0-9\.]+_[0-9]+$'; then<br>
+ return 2<br>
+ fi<br>
+ <br>
+-- <br>
+2.26.2<br>
+<br>
<br>
<br>
------------------------------<br>
<br>
Message: 2<br>
Date: Fri, 08 May 2020 10:11:00 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: Nicola Di Lieto <<a href="mailto:nicola.dilieto@gmail.com" target="_blank">nicola.dilieto@gmail.com</a>><br>
Cc: <a href="mailto:buildroot@busybox.net" target="_blank">buildroot@busybox.net</a><br>
Subject: Re: [Buildroot] [PATCH] package/uacme: bump version to 1.2.3<br>
Message-ID: <<a href="mailto:87mu6isv6z.fsf@dell.be.48ers.dk" target="_blank">87mu6isv6z.fsf@dell.be.48ers.<wbr>dk</a>><br>
Content-Type: text/plain<br>
<br>
>>>>> "Nicola" == Nicola Di Lieto <<a href="mailto:nicola.dilieto@gmail.com" target="_blank">nicola.dilieto@gmail.com</a>> writes:<br>
<br>
> This version fixes <a href="https://github.com/ndilieto/uacme/issues/22" rel="noreferrer" target="_blank">https://github.com/ndilieto/ua<wbr>cme/issues/22</a><br>
> Signed-off-by: Nicola Di Lieto <<a href="mailto:nicola.dilieto@gmail.com" target="_blank">nicola.dilieto@gmail.com</a>><br>
<br>
Does that also affect the 1.0.21 version we have in 2020.02.x? If so,<br>
what is the impact? Do we need to update to 1.2.3 or cherry pick a<br>
patch?<br>
<br>
-- <br>
Bye, Peter Korsgaard<br>
<br>
<br>
------------------------------<br>
<br>
Message: 3<br>
Date: Fri, 8 May 2020 10:11:37 +0200<br>
From: "Yann E. MORIN" <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
To: Angelo Compagnucci <<a href="mailto:angelo@amarulasolutions.com" target="_blank">angelo@amarulasolutions.com</a>><br>
Cc: Adam Duskett <<a href="mailto:aduskett@gmail.com" target="_blank">aduskett@gmail.com</a>>, Buildroot Mailing List<br>
<<a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a>>, Angelo Compagnucci<br>
<<a href="mailto:angelo.compagnucci@gmail.com" target="_blank">angelo.compagnucci@gmail.com</a>><wbr>, Maxime Hadjinlian<br>
<<a href="mailto:maxime.hadjinlian@gmail.com" target="_blank">maxime.hadjinlian@gmail.com</a>><br>
Subject: Re: [Buildroot] [PATCH 2/5] package/apparmor: fix<br>
compatibility with busybox grep<br>
Message-ID: <20200508081137.GJ12536@scaer><br>
Content-Type: text/plain; charset=utf-8<br>
<br>
Adam, Angelo, All,<br>
<br>
On 2020-05-08 08:32 +0200, Angelo Compagnucci spake thusly:<br>
> On Fri, May 8, 2020 at 4:00 AM <<a href="mailto:aduskett@gmail.com" target="_blank">aduskett@gmail.com</a>> wrote:<br>
> ><br>
> > From: Adam Duskett <<a href="mailto:Aduskett@gmail.com" target="_blank">Aduskett@gmail.com</a>><br>
> ><br>
> > The following regex string in rc.apparmor.functions<br>
> > "^/.*[ \t]+flags[ \t]*=[ \t]*\([ \t]*complain[ \t]*\)[ \t]+{" is broken due to<br>
> > the unescaped { at the end of the regex pattern.<br>
> > GNU grep ignors the error. However, the Busybox grep does not and throws the<br>
> > error "unescaped character {"<br>
> <br>
> Indeed, my original series had:<br>
> select BR2_PACKAGE_GREP<br>
> to overcome this issue but it went somewhat missing.<br>
<br>
I dropped it in my rework of the series, because there was no<br>
explanations why it was needed.<br>
<br>
In the end, I did apply Adam's patch, because:<br>
- it is simple enough and correct,<br>
- we will notice it no longer applies when we bump the version, and so<br>
can drop it.<br>
<br>
If we 'd have gone for selecting the full grep, we would not have<br>
noticed that it would no longer needed when we update, later.<br>
<br>
Thanks.<br>
<br>
Regards,<br>
Yann E. MORIN.<br>
<br>
> > Escape the "{" character to fix this issue.<br>
> ><br>
> > Note: Upstream has rewritten large sections of the rc.apparmor.functions file<br>
> > and the function this patch fixes will no longer be necessary after the next<br>
> > version is released. However, it is not possible to easily backport the<br>
> > upstream patches as the rewrite comes with new features that would not be<br>
> > possible with a simple patch such as this one.<br>
> ><br>
> > Signed-off-by: Adam Duskett <<a href="mailto:Aduskett@gmail.com" target="_blank">Aduskett@gmail.com</a>><br>
> > ---<br>
> > ...apparmor.functions-to-work-<wbr>with-busy.patch | 37 +++++++++++++++++++<br>
> > 1 file changed, 37 insertions(+)<br>
> > create mode 100644 package/apparmor/0003-fix-rege<wbr>x-in-rc.apparmor.functions-to-<wbr>work-with-busy.patch<br>
> ><br>
> > diff --git a/package/apparmor/0003-fix-re<wbr>gex-in-rc.apparmor.functions-<wbr>to-work-with-busy.patch b/package/apparmor/0003-fix-re<wbr>gex-in-rc.apparmor.functions-<wbr>to-work-with-busy.patch<br>
> > new file mode 100644<br>
> > index 0000000000..54afcd43a8<br>
> > --- /dev/null<br>
> > +++ b/package/apparmor/0003-fix-re<wbr>gex-in-rc.apparmor.functions-<wbr>to-work-with-busy.patch<br>
> > @@ -0,0 +1,37 @@<br>
> > +From 12764faa0a01bcc4e0ffc92ce30898<wbr>5dbad0d954 Mon Sep 17 00:00:00 2001<br>
> > +From: Adam Duskett <<a href="mailto:Aduskett@gmail.com" target="_blank">Aduskett@gmail.com</a>><br>
> > +Date: Thu, 7 May 2020 18:25:29 -0700<br>
> > +Subject: [PATCH] fix regex in rc.apparmor.functions to work with busybox<br>
> > +<br>
> > +The following regex string in rc.apparmor.functions<br>
> > +"^/.*[ \t]+flags[ \t]*=[ \t]*\([ \t]*complain[ \t]*\)[ \t]+{" is broken due to<br>
> > +the unescaped {. GNU grep ignores the error. However, the Busybox grep does<br>
> > +not and throws the error "unescaped character {"<br>
> > +<br>
> > +Escape the "{" character to fix this issue.<br>
> > +<br>
> > +Note: Upstream has rewritten large sections of the rc.apparmor.functions file<br>
> > +and the function this patch fixes will no longer be necessary after the next<br>
> > +version is released.<br>
> > +<br>
> > +Signed-off-by: Adam Duskett <<a href="mailto:Aduskett@gmail.com" target="_blank">Aduskett@gmail.com</a>><br>
> > +---<br>
> > + parser/rc.apparmor.functions | 2 +-<br>
> > + 1 file changed, 1 insertion(+), 1 deletion(-)<br>
> > +<br>
> > +diff --git a/parser/rc.apparmor.functions b/parser/rc.apparmor.functions<br>
> > +index f3108f8..db0697c 100644<br>
> > +--- a/parser/rc.apparmor.functions<br>
> > ++++ b/parser/rc.apparmor.functions<br>
> > +@@ -140,7 +140,7 @@ force_complain() {<br>
> > + local profile=$1<br>
> > +<br>
> > + # if profile not in complain mode<br>
> > +- if ! egrep -q "^/.*[ \t]+flags[ \t]*=[ \t]*\([ \t]*complain[ \t]*\)[ \t]+{" $profile ; then<br>
> > ++ if ! grep -E -q "^/.*[ \t]+flags[ \t]*=[ \t]*\([ \t]*complain[ \t]*\)[ \t]+\{" $profile ; then<br>
> > + local link="${PROFILE_DIR}/force-com<wbr>plain/`basename ${profile}`"<br>
> > + if [ -e "$link" ] ; then<br>
> > + aa_log_warning_msg "found $link, forcing complain mode"<br>
> > +--<br>
> > +2.26.2<br>
> > +<br>
> > --<br>
> > 2.26.2<br>
> ><br>
> > ______________________________<wbr>_________________<br>
> > buildroot mailing list<br>
> > <a href="mailto:buildroot@busybox.net" target="_blank">buildroot@busybox.net</a><br>
> > <a href="http://lists.busybox.net/mailman/listinfo/buildroot" rel="noreferrer" target="_blank">http://lists.busybox.net/mailm<wbr>an/listinfo/buildroot</a><br>
<br>
-- <br>
.-----------------.-----------<wbr>---------.------------------.-<wbr>-------------------.<br>
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |<br>
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |<br>
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |<br>
| <a href="http://ymorin.is-a-geek.org/" rel="noreferrer" target="_blank">http://ymorin.is-a-geek.org/</a> | _/*\_ | / \ HTML MAIL | v conspiracy. |<br>
'-----------------------------<wbr>-^-------^------------------^-<wbr>-------------------'<br>
<br>
<br>
------------------------------<br>
<br>
Message: 4<br>
Date: Fri, 8 May 2020 10:14:49 +0200<br>
From: "Yann E. MORIN" <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
To: <a href="mailto:aduskett@gmail.com" target="_blank">aduskett@gmail.com</a><br>
Cc: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a>, Maxime Hadjinlian<br>
<<a href="mailto:maxime.hadjinlian@gmail.com" target="_blank">maxime.hadjinlian@gmail.com</a>>, Angelo Compagnucci<br>
<<a href="mailto:angelo.compagnucci@gmail.com" target="_blank">angelo.compagnucci@gmail.com</a>><br>
Subject: Re: [Buildroot] [PATCH 1/5] package/apparmor: replace<br>
deprecated egrep with grep -E<br>
Message-ID: <20200508081449.GK12536@scaer><br>
Content-Type: text/plain; charset=utf-8<br>
<br>
Adam, All,<br>
<br>
On 2020-05-07 18:59 -0700, <a href="mailto:aduskett@gmail.com" target="_blank">aduskett@gmail.com</a> spake thusly:<br>
> From: Adam Duskett <<a href="mailto:Aduskett@gmail.com" target="_blank">Aduskett@gmail.com</a>><br>
> <br>
> Upstream commit: 5f46dedd6e8109d845af118b36039a<wbr>5d7dd05af9<br>
> <br>
> Signed-off-by: Adam Duskett <<a href="mailto:Aduskett@gmail.com" target="_blank">Aduskett@gmail.com</a>><br>
<br>
Patches 1-4 applied to master, thanks. See a few replies to patch 2 and 4.<br>
<br>
I've not (yet) applied patch 5, because it is sitting somewhere between<br>
being a feature-patch and being a fix. If is a feature-patch because it<br>
allows building systemnd with apparmor support, while it is a fix<br>
because it guarantees build ordering now... So saying I'm torn onthat<br>
one is a bit strong, but still I am not sure either...<br>
<br>
Regards,<br>
Yann E. MORIN.<br>
<br>
> ---<br>
> ...replace-deprecated-egrep-wi<wbr>th-grep-e.patch | 28 +++++++++++++++++++<br>
> 1 file changed, 28 insertions(+)<br>
> create mode 100644 package/apparmor/0002-replace-<wbr>deprecated-egrep-with-grep-e.p<wbr>atch<br>
> <br>
> diff --git a/package/apparmor/0002-replac<wbr>e-deprecated-egrep-with-grep-<wbr>e.patch b/package/apparmor/0002-replac<wbr>e-deprecated-egrep-with-grep-<wbr>e.patch<br>
> new file mode 100644<br>
> index 0000000000..4caefe447b<br>
> --- /dev/null<br>
> +++ b/package/apparmor/0002-replac<wbr>e-deprecated-egrep-with-grep-<wbr>e.patch<br>
> @@ -0,0 +1,28 @@<br>
> +From 5f46dedd6e8109d845af118b36039a<wbr>5d7dd05af9 Mon Sep 17 00:00:00 2001<br>
> +From: Christian Boltz <<a href="mailto:apparmor@cboltz.de" target="_blank">apparmor@cboltz.de</a>><br>
> +Date: Mon, 18 Mar 2019 19:17:16 +0100<br>
> +Subject: [PATCH] replace deprecated egrep with grep -e<br>
> +<br>
> +(cherry picked from commit 5f46dedd6e8109d845af118b36039a<wbr>5d7dd05af9)<br>
> +Signed-off-by: Christian Boltz <<a href="mailto:apparmor@cboltz.de" target="_blank">apparmor@cboltz.de</a>><br>
> +Signed-off-by: Adam Duskett <<a href="mailto:Aduskett@gmail.com" target="_blank">Aduskett@gmail.com</a>><br>
> +---<br>
> + parser/rc.apparmor.functions | 2 +-<br>
> + 1 file changed, 1 insertion(+), 1 deletion(-)<br>
> +<br>
> +diff --git a/parser/rc.apparmor.functions b/parser/rc.apparmor.functions<br>
> +index 22e8367..f3108f8 100644<br>
> +--- a/parser/rc.apparmor.functions<br>
> ++++ b/parser/rc.apparmor.functions<br>
> +@@ -129,7 +129,7 @@ skip_profile() {<br>
> + "${profile%.pacnew}" != "${profile}" ] ; then<br>
> + return 2<br>
> + fi<br>
> +- if echo "${profile}" | egrep -q '^.+\.new-[0-9\.]+_[0-9]+$'; then<br>
> ++ if echo "${profile}" | grep -E -q '^.+\.new-[0-9\.]+_[0-9]+$'; then<br>
> + return 2<br>
> + fi<br>
> + <br>
> +-- <br>
> +2.26.2<br>
> +<br>
> -- <br>
> 2.26.2<br>
> <br>
<br>
-- <br>
.-----------------.-----------<wbr>---------.------------------.-<wbr>-------------------.<br>
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |<br>
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |<br>
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |<br>
| <a href="http://ymorin.is-a-geek.org/" rel="noreferrer" target="_blank">http://ymorin.is-a-geek.org/</a> | _/*\_ | / \ HTML MAIL | v conspiracy. |<br>
'-----------------------------<wbr>-^-------^------------------^-<wbr>-------------------'<br>
<br>
<br>
------------------------------<br>
<br>
Message: 5<br>
Date: Fri, 8 May 2020 10:15:40 +0200<br>
From: Yann E. MORIN <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit] package/domoticz: set WITH_LIBUSB<br>
Message-ID: <<a href="mailto:20200508080012.A140B90FD4@busybox.osuosl.org" target="_blank">20200508080012.A140B90FD4@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=a896be19de9e6e7845b24af497fead6f522ef67d" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=a896be19de9e6<wbr>e7845b24af497fead6f522ef67d</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/master" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>master</a><br>
<br>
Use WITH_LIBUSB which is available since version 4.9700 and<br>
<a href="https://github.com/domoticz/domoticz/commit/f53817577a834ed0c3fc16458c374aea490be49e" rel="noreferrer" target="_blank">https://github.com/domoticz/do<wbr>moticz/commit/f53817577a834ed0<wbr>c3fc16458c374aea490be49e</a><br>
<br>
Signed-off-by: Fabrice Fontaine <<a href="mailto:fontaine.fabrice@gmail.com" target="_blank">fontaine.fabrice@gmail.com</a>><br>
Signed-off-by: Yann E. MORIN <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
---<br>
package/domoticz/<a href="http://domoticz.mk" rel="noreferrer" target="_blank">domoticz.mk</a> | 3 +++<br>
1 file changed, 3 insertions(+)<br>
<br>
diff --git a/package/domoticz/<a href="http://domoticz.mk" rel="noreferrer" target="_blank">domoticz.mk</a> b/package/domoticz/<a href="http://domoticz.mk" rel="noreferrer" target="_blank">domoticz.mk</a><br>
index 5efe86a784..0ceaab87b4 100644<br>
--- a/package/domoticz/<a href="http://domoticz.mk" rel="noreferrer" target="_blank">domoticz.mk</a><br>
+++ b/package/domoticz/<a href="http://domoticz.mk" rel="noreferrer" target="_blank">domoticz.mk</a><br>
@@ -38,6 +38,9 @@ DOMOTICZ_CONF_OPTS += \<br>
<br>
ifeq ($(BR2_PACKAGE_LIBUSB),y)<br>
DOMOTICZ_DEPENDENCIES += libusb<br>
+DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=ON<br>
+else<br>
+DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=OFF<br>
endif<br>
<br>
ifeq ($(BR2_PACKAGE_OPENZWAVE),y)<br>
<br>
<br>
------------------------------<br>
<br>
Message: 6<br>
Date: Fri, 08 May 2020 10:17:42 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: Timo Ketola <<a href="mailto:timo.ketola@exertus.fi" target="_blank">timo.ketola@exertus.fi</a>><br>
Cc: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a>, Gary Bisson <<a href="mailto:bisson.gary@gmail.com" target="_blank">bisson.gary@gmail.com</a>>,<br>
Refik Tuzakli <<a href="mailto:tuzakli.refik@gmail.com" target="_blank">tuzakli.refik@gmail.com</a>><br>
Subject: Re: [Buildroot] [PATCH v2 1/1]<br>
package/freescale-imx/imx-gpu-<wbr>g2d: fix the file name<br>
Message-ID: <<a href="mailto:87imh6suvt.fsf@dell.be.48ers.dk" target="_blank">87imh6suvt.fsf@dell.be.48ers.<wbr>dk</a>><br>
Content-Type: text/plain<br>
<br>
>>>>> "Timo" == Timo Ketola <<a href="mailto:timo.ketola@exertus.fi" target="_blank">timo.ketola@exertus.fi</a>> writes:<br>
<br>
> NXP apparently changed file naming convention for this particular file.<br>
> Fixes:<br>
> 1d0ea8d433 (package/freescale-imx/imx-gpu<wbr>-g2d: bump to version 6.4.0.p1.0)<br>
<br>
> Signed-off-by: Timo Ketola <<a href="mailto:timo.ketola@exertus.fi" target="_blank">timo.ketola@exertus.fi</a>><br>
> ---<br>
> Changes v1 -> v2:<br>
<br>
> - Add 'Fixes:' line as suggested by Gary<br>
<br>
Committed to 2020.02.x, thanks.<br>
<br>
-- <br>
Bye, Peter Korsgaard<br>
<br>
<br>
------------------------------<br>
<br>
Message: 7<br>
Date: Fri, 8 May 2020 09:13:34 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit branch/2020.02.x] package/midori:<br>
needs gcc >= 7<br>
Message-ID: <<a href="mailto:20200508080227.4B9DE90FE3@busybox.osuosl.org" target="_blank">20200508080227.4B9DE90FE3@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=fbc2f26d06e3f45c2fe316c6fad0fc18a275e9d8" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=fbc2f26d06e3f<wbr>45c2fe316c6fad0fc18a275e9d8</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.02.x" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>2020.02.x</a><br>
<br>
Commit ec1ff802df9a0f17dd2b734ba536a5<wbr>e206aa5aa4 forgot to propagate<br>
gcc >= 7 dependency to midori<br>
<br>
Fixes:<br>
- <a href="http://autobuild.buildroot.org/results/736a99dcaa72fba3f06775d08c4395f506fce944" rel="noreferrer" target="_blank">http://autobuild.buildroot.org<wbr>/results/736a99dcaa72fba3f0677<wbr>5d08c4395f506fce944</a><br>
<br>
Signed-off-by: Fabrice Fontaine <<a href="mailto:fontaine.fabrice@gmail.com" target="_blank">fontaine.fabrice@gmail.com</a>><br>
Signed-off-by: Thomas Petazzoni <<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>><br>
(cherry picked from commit de5a74193b270e4bff19a45a4b82a7<wbr>0fb70857fa)<br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
---<br>
package/midori/Config.in | 6 +++---<br>
1 file changed, 3 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/package/midori/Config.in b/package/midori/Config.in<br>
index 64139ce49e..089f36ced8 100644<br>
--- a/package/midori/Config.in<br>
+++ b/package/midori/Config.in<br>
@@ -1,7 +1,7 @@<br>
-comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6"<br>
+comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7"<br>
depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUP<wbr>PORTS<br>
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 || \<br>
- !BR2_TOOLCHAIN_GCC_AT_LEAST_6 || \<br>
+ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \<br>
!BR2_TOOLCHAIN_USES_GLIBC<br>
<br>
config BR2_PACKAGE_MIDORI<br>
@@ -9,7 +9,7 @@ config BR2_PACKAGE_MIDORI<br>
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_<wbr>SUPPORTS # libgcrypt, gcr, gnupg2<br>
depends on BR2_PACKAGE_LIBGTK3<br>
depends on BR2_INSTALL_LIBSTDCPP # webkitgtk<br>
- depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # webkitgtk<br>
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # webkitgtk<br>
depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk<br>
depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUP<wbr>PORTS<br>
# GCR can only be used with the X11 backend<br>
<br>
<br>
------------------------------<br>
<br>
Message: 8<br>
Date: Fri, 8 May 2020 10:05:03 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit branch/2020.02.x] {linux,<br>
linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.{4, 5, 6}.x series<br>
Message-ID: <<a href="mailto:20200508080227.8328B90FE4@busybox.osuosl.org" target="_blank">20200508080227.8328B90FE4@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=3788e762d802ed6d61f65e7bf757f046592b627b" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=3788e762d802e<wbr>d6d61f65e7bf757f046592b627b</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.02.x" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>2020.02.x</a><br>
<br>
Notice: 5.5.x is now EOL, so should be dropped at the next version bump.<br>
<br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
Signed-off-by: Thomas Petazzoni <<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>><br>
[Peter: drop 5.5.x / 5.6.x bump]<br>
(cherry picked from commit 72a6e50da9585d632e70c3f668857f<wbr>45601088fc)<br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
---<br>
linux/Config.in | 2 +-<br>
linux/linux.hash | 10 +++++-----<br>
package/linux-headers/Config.<wbr>in.host | 10 +++++-----<br>
3 files changed, 11 insertions(+), 11 deletions(-)<br>
<br>
diff --git a/linux/Config.in b/linux/Config.in<br>
index c367b33378..bdf3c26326 100644<br>
--- a/linux/Config.in<br>
+++ b/linux/Config.in<br>
@@ -128,7 +128,7 @@ endif<br>
<br>
config BR2_LINUX_KERNEL_VERSION<br>
string<br>
- default "5.4.31" if BR2_LINUX_KERNEL_LATEST_VERSIO<wbr>N<br>
+ default "5.4.35" if BR2_LINUX_KERNEL_LATEST_VERSIO<wbr>N<br>
default "4.19.98-cip19" if BR2_LINUX_KERNEL_LATEST_CIP_VE<wbr>RSION<br>
default "4.19.98-cip19-rt7" if BR2_LINUX_KERNEL_LATEST_CIP_RT<wbr>_VERSION<br>
default BR2_LINUX_KERNEL_CUSTOM_VERSIO<wbr>N_VALUE \<br>
diff --git a/linux/linux.hash b/linux/linux.hash<br>
index f6bad5c8ec..3226a2fafb 100644<br>
--- a/linux/linux.hash<br>
+++ b/linux/linux.hash<br>
@@ -1,10 +1,10 @@<br>
# From <a href="https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc-sha256" rel="noreferrer" target="_blank">https://www.kernel.org/pub/lin<wbr>ux/kernel/v5.x/sha256sums.asc<br>
-sha256</a> a11083f8f809887f6a0f8d44675323<wbr>85b99418f17998fe6e837807491c27<wbr>6eeb linux-5.4.31.tar.xz<br>
+sha256 e16bd5f7284a80a41328bf712e1136<wbr>b0adf5b71cc0bd263efa7cac755398<wbr>06d4 linux-5.4.35.tar.xz<br>
# From <a href="https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc-sha256" rel="noreferrer" target="_blank">https://www.kernel.org/pub/lin<wbr>ux/kernel/v4.x/sha256sums.asc<br>
-sha256</a> ea68cb8e9fa255bb1d0402c5aa8f26<wbr>984f9b1c8607ff3bed5d3284109167<wbr>f063 linux-4.4.218.tar.xz<br>
-sha256 df3a6e615ec4c57b04775e9c018c67<wbr>045223ac662e696d28fd37baa51143<wbr>49cd linux-4.9.218.tar.xz<br>
-sha256 cb440ac5d20071dcb482e506295851<wbr>4064b0c5a8375c92653062ea201ae0<wbr>222c linux-4.14.175.tar.xz<br>
-sha256 1e40a0dc6afc95a259f97b80d5f5ef<wbr>8f89e2ee49e993ba6844e2bc55de36<wbr>1f0e linux-4.19.114.tar.xz<br>
+sha256 4e98b51c2e3a8fd069dc941b9cb685<wbr>94f84ea767c2927e93255e1151c5c2<wbr>fdd6 linux-4.4.219.tar.xz<br>
+sha256 6b17238cced3e1c2753d6d5b4f662b<wbr>d347d4651f07c35506b849eb10aea7<wbr>bc44 linux-4.9.219.tar.xz<br>
+sha256 bcae0956baaeb55dab5bad0401873f<wbr>bc5baaa7fbe957ea6d27a5ab241cec<wbr>5ca2 linux-4.14.176.tar.xz<br>
+sha256 89749365f9dafa6c62cc5e920a7e53<wbr>2ed4aad9ab766fb436423b153ffbc0<wbr>8c96 linux-4.19.118.tar.xz<br>
# Locally computed<br>
sha256 18f9ddba0b777d1942d6c81877ba97<wbr>c4bcd08488e2c409e57dcce866b9de<wbr>5fc2 linux-cip-4.19.98-cip19.tar.gz<br>
sha256 7d5aeb67da41dc66ef28621ef994ef<wbr>4403e8b1f5c3df38b1843da2097244<wbr>4280 linux-cip-4.19.98-cip19-rt7.ta<wbr>r.gz<br>
diff --git a/package/linux-headers/Config<wbr>.in.host b/package/linux-headers/Config<wbr>.in.host<br>
index fde769e6a3..598d5a8853 100644<br>
--- a/package/linux-headers/Config<wbr>.in.host<br>
+++ b/package/linux-headers/Config<wbr>.in.host<br>
@@ -318,11 +318,11 @@ endchoice<br>
<br>
config BR2_DEFAULT_KERNEL_HEADERS<br>
string<br>
- default "4.4.218" if BR2_KERNEL_HEADERS_4_4<br>
- default "4.9.218" if BR2_KERNEL_HEADERS_4_9<br>
- default "4.14.175" if BR2_KERNEL_HEADERS_4_14<br>
- default "4.19.114" if BR2_KERNEL_HEADERS_4_19<br>
- default "5.4.31" if BR2_KERNEL_HEADERS_5_4<br>
+ default "4.4.219" if BR2_KERNEL_HEADERS_4_4<br>
+ default "4.9.219" if BR2_KERNEL_HEADERS_4_9<br>
+ default "4.14.176" if BR2_KERNEL_HEADERS_4_14<br>
+ default "4.19.118" if BR2_KERNEL_HEADERS_4_19<br>
+ default "5.4.35" if BR2_KERNEL_HEADERS_5_4<br>
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION<br>
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARB<wbr>ALL<br>
default BR2_KERNEL_HEADERS_CUSTOM_REPO<wbr>_VERSION \<br>
<br>
<br>
------------------------------<br>
<br>
Message: 9<br>
Date: Fri, 8 May 2020 10:06:52 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit branch/2020.02.x] package/python:<br>
bump version to 2.7.18<br>
Message-ID: <<a href="mailto:20200508080227.976C690FE3@busybox.osuosl.org" target="_blank">20200508080227.976C690FE3@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=6105fcaca3445fd1c69c3f80ec85017dbdb136c1" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=6105fcaca3445<wbr>fd1c69c3f80ec85017dbdb136c1</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.02.x" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>2020.02.x</a><br>
<br>
Release notes:<br>
<a href="https://pythoninsider.blogspot.com/2020/04/python-2718-last-release-of-python-2.html" rel="noreferrer" target="_blank">https://pythoninsider.blogspot<wbr>.com/2020/04/python-2718-last-<wbr>release-of-python-2.html</a><br>
<br>
Updated license hash due to upstream commit:<br>
<a href="https://github.com/python/cpython/commit/aa5b196c180d4c1dbe5a8593e55066e630d38c09" rel="noreferrer" target="_blank">https://github.com/python/cpyt<wbr>hon/commit/aa5b196c180d4c1dbe5<wbr>a8593e55066e630d38c09</a><br>
<br>
Signed-off-by: Bernd Kuhls <<a href="mailto:bernd.kuhls@t-online.de" target="_blank">bernd.kuhls@t-online.de</a>><br>
Signed-off-by: Thomas Petazzoni <<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>><br>
(cherry picked from commit 3586b0703fa9a8b4138ac4bf9e274c<wbr>7f1bef2e6c)<br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
---<br>
package/python/python.hash | 8 ++++----<br>
package/python/<a href="http://python.mk" rel="noreferrer" target="_blank">python.mk</a> | 2 +-<br>
2 files changed, 5 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/package/python/python.hash b/package/python/python.hash<br>
index aa809b9a61..f5e51d9638 100644<br>
--- a/package/python/python.hash<br>
+++ b/package/python/python.hash<br>
@@ -1,5 +1,5 @@<br>
-# From <a href="https://www.python.org/downloads/release/python-2717/" rel="noreferrer" target="_blank">https://www.python.org/downloa<wbr>ds/release/python-2717/</a><br>
-md5 b3b6d2c92f42a60667814358ab9f0c<wbr>fd Python-2.7.17.tar.xz<br>
+# From <a href="https://www.python.org/downloads/release/python-2718/" rel="noreferrer" target="_blank">https://www.python.org/downloa<wbr>ds/release/python-2718/</a><br>
+md5 fd6cc8ec0a78c44036f825e739f36e<wbr>5a Python-2.7.18.tar.xz<br>
# Locally calculated<br>
-sha256 4d43f033cdbd0aa7b7023c81b0e986<wbr>fd11e653b5248dac9144d508f11812<wbr>ba41 Python-2.7.17.tar.xz<br>
-sha256 a77d71d6be6f9032e6b6e5d2cf6da6<wbr>8f9eeab9036edfbc043633c8979cd5<wbr>e82c LICENSE<br>
+sha256 b62c0e7937551d0cc02b8fd5cb0f54<wbr>4f9405bafc9a54d3808ed4594812ed<wbr>ef43 Python-2.7.18.tar.xz<br>
+sha256 de4d1f2d2ad5ad0cfd1657a106476b<wbr>31cb5db5ef9d1ff842b237c0c81f0c<wbr>8a23 LICENSE<br>
diff --git a/package/python/<a href="http://python.mk" rel="noreferrer" target="_blank">python.mk</a> b/package/python/<a href="http://python.mk" rel="noreferrer" target="_blank">python.mk</a><br>
index 1c393b255d..532c372dee 100644<br>
--- a/package/python/<a href="http://python.mk" rel="noreferrer" target="_blank">python.mk</a><br>
+++ b/package/python/<a href="http://python.mk" rel="noreferrer" target="_blank">python.mk</a><br>
@@ -5,7 +5,7 @@<br>
#############################<wbr>##############################<wbr>#####################<br>
<br>
PYTHON_VERSION_MAJOR = 2.7<br>
-PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).17<br>
+PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).18<br>
PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.x<wbr>z<br>
PYTHON_SITE = <a href="https://python.org/ftp/python/$(PYTHON_VERSION)" rel="noreferrer" target="_blank">https://python.org/ftp/python/<wbr>$(PYTHON_VERSION)</a><br>
PYTHON_LICENSE = Python-2.0, others<br>
<br>
<br>
------------------------------<br>
<br>
Message: 10<br>
Date: Fri, 8 May 2020 10:06:22 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit branch/2020.02.x]<br>
package/python-jedi: add missing license<br>
Message-ID: <<a href="mailto:20200508080227.8D5D990FE3@busybox.osuosl.org" target="_blank">20200508080227.8D5D990FE3@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=279eddff6515c00e9633342895684f7540c365a3" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=279eddff6515c<wbr>00e9633342895684f7540c365a3</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.02.x" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>2020.02.x</a><br>
<br>
python-jedi bundles its own copy of typeshed since version 0.14.0 and<br>
<a href="https://github.com/davidhalter/jedi/commit/7d2b7bb3c1c4f79f325ccbde9d2b2734aa872312" rel="noreferrer" target="_blank">https://github.com/davidhalter<wbr>/jedi/commit/7d2b7bb3c1c4f79f3<wbr>25ccbde9d2b2734aa872312</a><br>
<br>
So add it to the license files (and update indentation of hash file to<br>
two spaces while at it)<br>
<br>
Signed-off-by: Fabrice Fontaine <<a href="mailto:fontaine.fabrice@gmail.com" target="_blank">fontaine.fabrice@gmail.com</a>><br>
Signed-off-by: Thomas Petazzoni <<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>><br>
(cherry picked from commit ab98c1ffb65b10ede668356014481f<wbr>63ac9a72e6)<br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
---<br>
package/python-jedi/python-je<wbr>di.hash | 9 +++++----<br>
package/python-jedi/<a href="http://python-jedi.mk" rel="noreferrer" target="_blank">python-je<wbr>di.mk</a> | 5 +++--<br>
2 files changed, 8 insertions(+), 6 deletions(-)<br>
<br>
diff --git a/package/python-jedi/python-j<wbr>edi.hash b/package/python-jedi/python-j<wbr>edi.hash<br>
index 1fc3a3da50..77af6e79f3 100644<br>
--- a/package/python-jedi/python-j<wbr>edi.hash<br>
+++ b/package/python-jedi/python-j<wbr>edi.hash<br>
@@ -1,6 +1,7 @@<br>
# md5, sha256 from <a href="https://pypi.org/pypi/jedi/json" rel="noreferrer" target="_blank">https://pypi.org/pypi/jedi/jso<wbr>n</a><br>
-md5 ba88266caac41988ffb4fd6041a3c3<wbr>54 jedi-0.15.1.tar.gz<br>
-sha256 ba859c74fa3c966a22f2aeebe1b74e<wbr>e27e2a462f56d3f5f7ca4a59af61bf<wbr>e42e jedi-0.15.1.tar.gz<br>
+md5 ba88266caac41988ffb4fd6041a3c3<wbr>54 jedi-0.15.1.tar.gz<br>
+sha256 ba859c74fa3c966a22f2aeebe1b74e<wbr>e27e2a462f56d3f5f7ca4a59af61bf<wbr>e42e jedi-0.15.1.tar.gz<br>
# Locally computed sha256 checksums<br>
-sha256 78e60cd0b8f28694f30195482c33d7<wbr>6908d846b0d15278deb7332aa22ba8<wbr>e412 LICENSE.txt<br>
-sha256 9c1e620a5cf8e74fe81c1fd4c55e9c<wbr>c0b189fc04e677cfc7ef915de746c3<wbr>f59e docs/_themes/flask/LICENSE<br>
+sha256 78e60cd0b8f28694f30195482c33d7<wbr>6908d846b0d15278deb7332aa22ba8<wbr>e412 LICENSE.txt<br>
+sha256 9c1e620a5cf8e74fe81c1fd4c55e9c<wbr>c0b189fc04e677cfc7ef915de746c3<wbr>f59e docs/_themes/flask/LICENSE<br>
+sha256 b41b78f562a2e65b75cab44354335f<wbr>6f435d4ef73065509600ac910cf4e2<wbr>2fe0 jedi/third_party/typeshed/LICE<wbr>NSE<br>
diff --git a/package/python-jedi/<a href="http://python-jedi.mk" rel="noreferrer" target="_blank">python-j<wbr>edi.mk</a> b/package/python-jedi/<a href="http://python-jedi.mk" rel="noreferrer" target="_blank">python-j<wbr>edi.mk</a><br>
index e11146def7..4e756a709c 100644<br>
--- a/package/python-jedi/<a href="http://python-jedi.mk" rel="noreferrer" target="_blank">python-j<wbr>edi.mk</a><br>
+++ b/package/python-jedi/<a href="http://python-jedi.mk" rel="noreferrer" target="_blank">python-j<wbr>edi.mk</a><br>
@@ -8,7 +8,8 @@ PYTHON_JEDI_VERSION = 0.15.1<br>
PYTHON_JEDI_SOURCE = jedi-$(PYTHON_JEDI_VERSION).ta<wbr>r.gz<br>
PYTHON_JEDI_SITE = <a href="https://files.pythonhosted.org/packages/85/03/cd5a6e44a5753b4d539288d9d1f9645caac889c17dd2950292a8818f86b2" rel="noreferrer" target="_blank">https://files.pythonhosted.org<wbr>/packages/85/03/cd5a6e44a5753b<wbr>4d539288d9d1f9645caac889c17dd2<wbr>950292a8818f86b2</a><br>
PYTHON_JEDI_SETUP_TYPE = setuptools<br>
-PYTHON_JEDI_LICENSE = MIT, BSD-3-Clause (flask theme)<br>
-PYTHON_JEDI_LICENSE_FILES = LICENSE.txt docs/_themes/flask/LICENSE<br>
+PYTHON_JEDI_LICENSE = MIT, BSD-3-Clause (flask theme), Apache-2.0 (typeshed)<br>
+PYTHON_JEDI_LICENSE_FILES = \<br>
+ LICENSE.txt docs/_themes/flask/LICENSE jedi/third_party/typeshed/LICE<wbr>NSE<br>
<br>
$(eval $(python-package))<br>
<br>
<br>
------------------------------<br>
<br>
Message: 11<br>
Date: Fri, 8 May 2020 10:17:23 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit branch/2020.02.x]<br>
package/freescale-imx/imx-gpu-<wbr>g2d: fix the file name for ARM<br>
Message-ID: <<a href="mailto:20200508080227.A896A90F63@busybox.osuosl.org" target="_blank">20200508080227.A896A90F63@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=1ac9faa318ea2dd6b82d0ea95a446ed74647edc6" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=1ac9faa318ea2<wbr>dd6b82d0ea95a446ed74647edc6</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.02.x" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>2020.02.x</a><br>
<br>
NXP apparently changed file naming convention for this particular file.<br>
<br>
Fixes: 1d0ea8d433 (package/freescale-imx/imx-gpu<wbr>-g2d: bump to version 6.4.0.p1.0)<br>
Signed-off-by: Timo Ketola <<a href="mailto:timo.ketola@exertus.fi" target="_blank">timo.ketola@exertus.fi</a>><br>
Reviewed-by: Gary Bisson <<a href="mailto:gary.bisson@boundarydevices.com" target="_blank">gary.bisson@boundarydevices.c<wbr>om</a>><br>
Signed-off-by: Thomas Petazzoni <<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>><br>
(cherry picked from commit cd3dc5b4fa59bdb14c3b5f1b46b9a4<wbr>466982b03b)<br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
---<br>
package/freescale-imx/imx-<wbr>gpu-g2d/imx-gpu-g2d.hash | 2 +-<br>
package/freescale-imx/imx-<wbr>gpu-g2d/<a href="http://imx-gpu-g2d.mk" rel="noreferrer" target="_blank">imx-gpu-g2d.mk</a> | 2 +-<br>
2 files changed, 2 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/package/freescale-imx/imx-gp<wbr>u-g2d/imx-gpu-g2d.hash b/package/freescale-imx/imx-gp<wbr>u-g2d/imx-gpu-g2d.hash<br>
index 8ecfbfe40f..98ca7fbe7e 100644<br>
--- a/package/freescale-imx/imx-gp<wbr>u-g2d/imx-gpu-g2d.hash<br>
+++ b/package/freescale-imx/imx-gp<wbr>u-g2d/imx-gpu-g2d.hash<br>
@@ -1,5 +1,5 @@<br>
# Locally calculated<br>
-sha256 6d6d02d035d988cbdb2014794f2efe<wbr>970a3f5ac277202882bbf553bb7fd7<wbr>89d2 imx-gpu-g2d-6.4.0.p1.0-aarch32<wbr>.bin<br>
+sha256 6d6d02d035d988cbdb2014794f2efe<wbr>970a3f5ac277202882bbf553bb7fd7<wbr>89d2 imx-gpu-g2d-6.4.0.p1.0-arm.bin<br>
sha256 35885f435dbe951d2c0f439a376ed8<wbr>a59a50b67a1b7e1e14fa2ab03995ab<wbr>b1ad imx-gpu-g2d-6.4.0.p1.0-aarch64<wbr>.bin<br>
sha256 d55f024af2bfff714b90de596f6d03<wbr>99124b999e8c18a86b13a3b507bae6<wbr>f561 COPYING<br>
sha256 9665930f69c0b6f4a4c055d7fe2b8e<wbr>e563e771efbc83892abb1955e61492<wbr>cdf7 EULA<br>
diff --git a/package/freescale-imx/imx-gp<wbr>u-g2d/<a href="http://imx-gpu-g2d.mk" rel="noreferrer" target="_blank">imx-gpu-g2d.mk</a> b/package/freescale-imx/imx-gp<wbr>u-g2d/<a href="http://imx-gpu-g2d.mk" rel="noreferrer" target="_blank">imx-gpu-g2d.mk</a><br>
index 6598e4c32b..7700170970 100644<br>
--- a/package/freescale-imx/imx-gp<wbr>u-g2d/<a href="http://imx-gpu-g2d.mk" rel="noreferrer" target="_blank">imx-gpu-g2d.mk</a><br>
+++ b/package/freescale-imx/imx-gp<wbr>u-g2d/<a href="http://imx-gpu-g2d.mk" rel="noreferrer" target="_blank">imx-gpu-g2d.mk</a><br>
@@ -7,7 +7,7 @@<br>
ifeq ($(BR2_aarch64),y)<br>
IMX_GPU_G2D_VERSION = 6.4.0.p1.0-aarch64<br>
else<br>
-IMX_GPU_G2D_VERSION = 6.4.0.p1.0-aarch32<br>
+IMX_GPU_G2D_VERSION = 6.4.0.p1.0-arm<br>
endif<br>
IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE)<br>
IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERS<wbr>ION).bin<br>
<br>
<br>
------------------------------<br>
<br>
Message: 12<br>
Date: Fri, 8 May 2020 09:26:06 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit branch/2020.02.x] package/openjdk:<br>
Remove sparc support<br>
Message-ID: <<a href="mailto:20200508080227.789D090FE3@busybox.osuosl.org" target="_blank">20200508080227.789D090FE3@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=e00fb250616937d92d1735c398c14e301c462107" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=e00fb25061693<wbr>7d92d1735c398c14e301c462107</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.02.x" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>2020.02.x</a><br>
<br>
Sparc support is deprecated and may be removed in future releases. There are<br>
two choices to fix this issue:<br>
<br>
1) Set --enable-deprecated-ports=yes in the CONF_OPTS to supress the error.<br>
2) Remove support for Sparc.<br>
<br>
Because this port is deprecated, it's safer to remove support alltogether.<br>
<br>
Fixes:<br>
<a href="http://autobuild.buildroot.net/results/692820b4b6d4da42cd557fa7badbbd11806bbeba/" rel="noreferrer" target="_blank">http://autobuild.buildroot.net<wbr>/results/692820b4b6d4da42cd557<wbr>fa7badbbd11806bbeba/</a><br>
<br>
Signed-off-by: Adam Duskett <<a href="mailto:Aduskett@gmail.com" target="_blank">Aduskett@gmail.com</a>><br>
Signed-off-by: Yann E. MORIN <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
(cherry picked from commit 6ee7de3d2f0a9c33622008a10b65db<wbr>019e2cfa3d)<br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
---<br>
package/openjdk/Config.in | 1 -<br>
1 file changed, 1 deletion(-)<br>
<br>
diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in<br>
index 61294ec49f..df769bbb35 100644<br>
--- a/package/openjdk/Config.in<br>
+++ b/package/openjdk/Config.in<br>
@@ -11,7 +11,6 @@ config BR2_PACKAGE_OPENJDK_ARCH_SUPPO<wbr>RTS<br>
default y if BR2_m68k<br>
default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le<br>
default y if BR2_sh<br>
- default y if BR2_sparc || BR2_sparc64<br>
<br>
config BR2_PACKAGE_OPENJDK<br>
bool "openjdk"<br>
<br>
<br>
------------------------------<br>
<br>
Message: 13<br>
Date: Fri, 8 May 2020 09:23:03 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit branch/2020.02.x] package/openjdk:<br>
copy all directories and files when installing<br>
Message-ID: <<a href="mailto:20200508080227.6E99A90FE4@busybox.osuosl.org" target="_blank">20200508080227.6E99A90FE4@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=0282033f42d4360b0f379cf01f12c1155d957f0d" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=0282033f42d43<wbr>60b0f379cf01f12c1155d957f0d</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.02.x" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>2020.02.x</a><br>
<br>
Several directories and files are currently not installed during the<br>
target installation, these include:<br>
- conf<br>
Several configuration files, including security configuration files which<br>
may be necessary for running various java applications.<br>
<br>
- legal<br>
This directory contains legal notices that some java applications may<br>
require, as they may print legal information and will throw exceptions at<br>
runtime if the legal files are not present on the system.<br>
<br>
- release<br>
This file contains a list of modules included in the image.<br>
<br>
Because these directories take up less than of megabyte extra, it is not an<br>
issue to install all of them.<br>
<br>
Signed-off-by: Adam Duskett <<a href="mailto:Aduskett@gmail.com" target="_blank">Aduskett@gmail.com</a>><br>
Reviewed-by: Ryan Barnett <<a href="mailto:ryan.barnett@rockwellcollins.com" target="_blank">ryan.barnett@rockwellcollins.<wbr>com</a>><br>
Tested-by: Ryan Barnett <<a href="mailto:ryan.barnett@rockwellcollins.com" target="_blank">ryan.barnett@rockwellcollins.<wbr>com</a>><br>
Signed-off-by: Yann E. MORIN <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
(cherry picked from commit 63b576095b1dbabaf15a6eee7ceabe<wbr>d6d868a707)<br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
---<br>
package/openjdk/<a href="http://openjdk.mk" rel="noreferrer" target="_blank">openjdk.mk</a> | 4 +---<br>
1 file changed, 1 insertion(+), 3 deletions(-)<br>
<br>
diff --git a/package/openjdk/<a href="http://openjdk.mk" rel="noreferrer" target="_blank">openjdk.mk</a> b/package/openjdk/<a href="http://openjdk.mk" rel="noreferrer" target="_blank">openjdk.mk</a><br>
index e58757b2ed..1f906517fe 100644<br>
--- a/package/openjdk/<a href="http://openjdk.mk" rel="noreferrer" target="_blank">openjdk.mk</a><br>
+++ b/package/openjdk/<a href="http://openjdk.mk" rel="noreferrer" target="_blank">openjdk.mk</a><br>
@@ -123,9 +123,7 @@ endef<br>
# which makes manual installation necessary.<br>
define OPENJDK_INSTALL_TARGET_CMDS<br>
mkdir -p $(TARGET_DIR)$(OPENJDK_INSTALL<wbr>_BASE)<br>
- cp -dpfr $(@D)/build/linux-*-release/im<wbr>ages/jre/bin/ \<br>
- $(TARGET_DIR)$(OPENJDK_INSTAL<wbr>L_BASE)/<br>
- cp -dpfr $(@D)/build/linux-*-release/im<wbr>ages/jre/lib/ \<br>
+ cp -dpfr $(@D)/build/linux-*-release/im<wbr>ages/jre/* \<br>
$(TARGET_DIR)$(OPENJDK_INSTALL<wbr>_BASE)/<br>
cd $(TARGET_DIR)/usr/bin && ln -snf ../..$(OPENJDK_INSTALL_BASE)/b<wbr>in/* .<br>
endef<br>
<br>
<br>
------------------------------<br>
<br>
Message: 14<br>
Date: Fri, 8 May 2020 09:15:43 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit branch/2020.02.x] package/libglib2:<br>
restore use of system printf<br>
Message-ID: <<a href="mailto:20200508080227.554CD90F63@busybox.osuosl.org" target="_blank">20200508080227.554CD90F63@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=6808e122f6ae9cca3966877e865e35b8922a9e9a" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=6808e122f6ae9<wbr>cca3966877e865e35b8922a9e9a</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.02.x" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>2020.02.x</a><br>
<br>
Prior to commit 4102db0f7a ("package/libglib2: bump to version 2.60.3")<br>
which converted libglib2 to meson, Buildroot used to set a range of<br>
autoconf options to bypass tests that require running binaries.<br>
<br>
The meson version of libglib2's build system has many fewer of these<br>
checks, but there are still some and these can be fed the "correct"<br>
answer by adding properties to cross-compilation.conf.<br>
<br>
Add the necessary properties to indicate that we have C99 compliant<br>
print functions to avoid pulling in the gnulib fallback.<br>
<br>
Signed-off-by: John Keeping <<a href="mailto:john@metanate.com" target="_blank">john@metanate.com</a>><br>
Reviewed-by: Peter Seiderer <<a href="mailto:ps.report@gmx.net" target="_blank">ps.report@gmx.net</a>><br>
Signed-off-by: Thomas Petazzoni <<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>><br>
(cherry picked from commit 4f91198f0d878adee4f3fd6c699187<wbr>9c1255951a)<br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
---<br>
package/libglib2/<a href="http://libglib2.mk" rel="noreferrer" target="_blank">libglib2.mk</a> | 5 +++++<br>
1 file changed, 5 insertions(+)<br>
<br>
diff --git a/package/libglib2/<a href="http://libglib2.mk" rel="noreferrer" target="_blank">libglib2.mk</a> b/package/libglib2/<a href="http://libglib2.mk" rel="noreferrer" target="_blank">libglib2.mk</a><br>
index f00818f69c..a206639f74 100644<br>
--- a/package/libglib2/<a href="http://libglib2.mk" rel="noreferrer" target="_blank">libglib2.mk</a><br>
+++ b/package/libglib2/<a href="http://libglib2.mk" rel="noreferrer" target="_blank">libglib2.mk</a><br>
@@ -52,6 +52,11 @@ LIBGLIB2_CONF_OPTS = \<br>
-Dinstalled_tests=false \<br>
-Doss_fuzz=disabled<br>
<br>
+LIBGLIB2_MESON_EXTRA_PROPERTI<wbr>ES = \<br>
+ have_c99_vsnprintf=true \<br>
+ have_c99_snprintf=true \<br>
+ have_unix98_printf=true<br>
+<br>
ifneq ($(BR2_ENABLE_LOCALE),y)<br>
LIBGLIB2_DEPENDENCIES += libiconv<br>
endif<br>
<br>
<br>
------------------------------<br>
<br>
Message: 15<br>
Date: Fri, 8 May 2020 09:21:12 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit branch/2020.02.x] package/openjdk:<br>
fix installation with merged usr directories<br>
Message-ID: <<a href="mailto:20200508080227.60EBF90FE3@busybox.osuosl.org" target="_blank">20200508080227.60EBF90FE3@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=f61ae433703711952dc3a230e71532d110c4e899" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=f61ae43370371<wbr>1952dc3a230e71532d110c4e899</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.02.x" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>2020.02.x</a><br>
<br>
Currently, Buildroot installs the jre libraries using<br>
cp -dprf /build/linux-*-release/images/<wbr>jre/lib/* $(TARGET_DIR)/usr/lib/<br>
<br>
However, if a system has a merged /usr directory, and there is a built kernel<br>
before installing OpenJDK, the installation fails because jre/lib has binary<br>
modules file, which causes the following error: cp: cannot overwrite directory<br>
'/usr/lib/modules with non-directory<br>
<br>
The obvious fix is to install the modules to /usr/lib/jvm/ and set the<br>
appropriate rpaths via the --with-extra-ldflags conf option. However, this fix<br>
does not work because the built binaries themselves do not link against<br>
libjava.so<br>
<br>
Indeed, running readelf on the built java binary reports the following:<br>
"(RUNPATH) Library runpath: [/usr/lib/jvm]" and /usr/lib/jvm/libjava.so exists.<br>
However, when running the Java binary on the target, the following error<br>
occurs: "Error: could not find libjava.so."<br>
<br>
The following is the result of "strace java" ran on the target:<br>
faccessat(AT_FDCWD, "/usr/lib/libjava.so", F_OK) = -1 ENOENT<br>
faccessat(AT_FDCWD, "/usr/jre/lib/libjava.so", F_OK) = -1 ENOENT<br>
newfstatat(AT_FDCWD, "/usr/lib/libjava.so", 0x7ffe7b4af8, 0) = -1 ENOENT<br>
newfstatat(AT_FDCWD, "/usr/lib/jvm/libjli.so", [sic] AT_SYMLINK_NOFOLLOW) = 0<br>
<br>
As seen above, the java binary searches for libjli.so in /usr/lib/jvm,<br>
which demonstrates that the java binary searches for some of the<br>
DT_NEEDED libraries using the correct rpath. But libjava.so is not<br>
searched from the rpath; it is instead dl-opened manually, looked for in<br>
the search paths hardcoded to the following directories:<br>
- /usr/lib/<br>
- /usr/jre/lib/<br>
- $(dirname $0)/../lib/<br>
<br>
The reason behind the hardcoded paths given by the maintainers is due to<br>
historical purposes for the need to support several java versions at the<br>
same time on a single system, and that changing the above behavior is not<br>
likely to ever happen.<br>
<br>
As such, most distributions such as Redhat do the following:<br>
- Create the directory /usr/lib/jvm/java-$(JAVA_VERSI<wbr>ON)/<br>
- Install all directories and files found in images/jre to that directory.<br>
- Symlink the binaries to in /usr/lib/jvm/java-$(JAVA_VERSI<wbr>ON)/bin to<br>
/usr/bin.<br>
<br>
However, because Buildroot does not need to support multiple versions of java<br>
concurrently, there is no need for the additional java-$(JAVA_VERSION)<br>
directory.<br>
<br>
To fix the above issue, the following changes are performed:<br>
- Introduce the variable "OPENJDK_INSTALL_BASE" which points to /usr/lib/jvm<br>
- Set the --with-extra-ldflags conf_opt to<br>
"-Wl,-rpath,$(OPENJDK_INSTALL_<wbr>BASE)/lib,-rpath,<br>
$(OPENJDK_INSTALL_BASE)/lib/$(<wbr>OPENJDK_JVM_VARIANT)"<br>
- Run "mkdir -p $(TARGET_DIR)/usr/lib/jvm/" in the INSTALL_TARGET_CMDS step.<br>
- Copy both the lib and bin directories to /usr/lib/jvm/<br>
- Symlink the binaries in /usr/lib/jvm/bin/ to /usr/bin.<br>
<br>
Fixes: <a href="https://bugs.busybox.net/show_bug.cgi?id=12751" rel="noreferrer" target="_blank">https://bugs.busybox.net/show_<wbr>bug.cgi?id=12751</a><br>
<br>
Signed-off-by: Adam Duskett <<a href="mailto:Aduskett@gmail.com" target="_blank">Aduskett@gmail.com</a>><br>
Reviewed-by: Ryan Barnett <<a href="mailto:ryan.barnett@rockwellcollins.com" target="_blank">ryan.barnett@rockwellcollins.<wbr>com</a>><br>
Tested-by: Ryan Barnett <<a href="mailto:ryan.barnett@rockwellcollins.com" target="_blank">ryan.barnett@rockwellcollins.<wbr>com</a>><br>
[<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>: fix two remaining mis-placed '/']<br>
Signed-off-by: Yann E. MORIN <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
(cherry picked from commit 3edb915709dec21158542b15e62f15<wbr>60b8dc2fa2)<br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
---<br>
package/openjdk/<a href="http://openjdk.mk" rel="noreferrer" target="_blank">openjdk.mk</a> | 16 ++++++++++++++--<br>
1 file changed, 14 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/package/openjdk/<a href="http://openjdk.mk" rel="noreferrer" target="_blank">openjdk.mk</a> b/package/openjdk/<a href="http://openjdk.mk" rel="noreferrer" target="_blank">openjdk.mk</a><br>
index 030a205228..e58757b2ed 100644<br>
--- a/package/openjdk/<a href="http://openjdk.mk" rel="noreferrer" target="_blank">openjdk.mk</a><br>
+++ b/package/openjdk/<a href="http://openjdk.mk" rel="noreferrer" target="_blank">openjdk.mk</a><br>
@@ -46,6 +46,13 @@ OPENJDK_JVM_VARIANT = zero<br>
OPENJDK_DEPENDENCIES += libffi<br>
endif<br>
<br>
+# OpenJDK installs a file named 'modules' in jre/lib, which gets installed as<br>
+# /usr/lib/modules. However, with a merged /usr, this conflicts with the<br>
+# directory named 'modules' installed by the kernel. If OpenJDK gets built<br>
+# after the kernel, this manifests itself with: "cp: cannot overwrite<br>
+# directory '/usr/lib/modules with non-directory."<br>
+OPENJDK_INSTALL_BASE = /usr/lib/jvm<br>
+<br>
# OpenJDK ignores some variables unless passed via the environment.<br>
# These variables are PATH, LD, CC, CXX, and CPP.<br>
# OpenJDK defaults ld to the ld binary but passes -Xlinker and -z as<br>
@@ -75,6 +82,7 @@ OPENJDK_CONF_OPTS = \<br>
--with-devkit=$(HOST_DIR) \<br>
--with-extra-cflags="$(TARGET_<wbr>CFLAGS)" \<br>
--with-extra-cxxflags="$(TARGE<wbr>T_CXXFLAGS)" \<br>
+ --with-extra-ldflags="-Wl,-rp<wbr>ath,$(OPENJDK_INSTALL_BASE)/li<wbr>b,-rpath,$(OPENJDK_INSTALL_BAS<wbr>E)/lib/$(OPENJDK_JVM_VARIANT)" \<br>
--with-giflib=system \<br>
--with-jobs=$(PARALLEL_JOBS) \<br>
--with-jvm-variants=$(OPENJDK_<wbr>JVM_VARIANT) \<br>
@@ -114,8 +122,12 @@ endef<br>
# Calling make install always builds and installs the JDK instead of the JRE,<br>
# which makes manual installation necessary.<br>
define OPENJDK_INSTALL_TARGET_CMDS<br>
- cp -dpfr $(@D)/build/linux-*-release/im<wbr>ages/jre/bin/* $(TARGET_DIR)/usr/bin/<br>
- cp -dpfr $(@D)/build/linux-*-release/im<wbr>ages/jre/lib/* $(TARGET_DIR)/usr/lib/<br>
+ mkdir -p $(TARGET_DIR)$(OPENJDK_INSTALL<wbr>_BASE)<br>
+ cp -dpfr $(@D)/build/linux-*-release/im<wbr>ages/jre/bin/ \<br>
+ $(TARGET_DIR)$(OPENJDK_INSTAL<wbr>L_BASE)/<br>
+ cp -dpfr $(@D)/build/linux-*-release/im<wbr>ages/jre/lib/ \<br>
+ $(TARGET_DIR)$(OPENJDK_INSTAL<wbr>L_BASE)/<br>
+ cd $(TARGET_DIR)/usr/bin && ln -snf ../..$(OPENJDK_INSTALL_BASE)/b<wbr>in/* .<br>
endef<br>
<br>
$(eval $(generic-package))<br>
<br>
<br>
------------------------------<br>
<br>
Message: 16<br>
Date: Fri, 8 May 2020 10:27:13 +0200<br>
From: "Yann E. MORIN" <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
To: Danomi Manchego <<a href="mailto:danomimanchego123@gmail.com" target="_blank">danomimanchego123@gmail.com</a>><br>
Cc: buildroot <<a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a>><br>
Subject: Re: [Buildroot] .br2-external files<br>
Message-ID: <20200508082713.GL12536@scaer><br>
Content-Type: text/plain; charset=utf-8<br>
<br>
Danomi, All,<br>
<br>
On 2020-05-04 17:04 -0400, Danomi Manchego spake thusly:<br>
> Hi all,<br>
> <br>
> I noticed that the<br>
> <a href="https://buildroot.org/downloads/buildroot-2020.02.1.tar.bz2" rel="noreferrer" target="_blank">https://buildroot.org/download<wbr>s/buildroot-2020.02.1.tar.bz2</a> has these<br>
> files in it:<br>
> <br>
> $ ls -1 .br2*<br>
> .br2-external.in.jpeg<br>
> .br2-external.in.menus<br>
> .br2-external.in.openssl<br>
> .br2-external.in.paths<br>
> .br2-external.in.toolchains<br>
> .<a href="http://br2-external.mk" rel="noreferrer" target="_blank">br2-external.mk</a><br>
> <br>
> But when I look at the 2020.02.x tag in git, those files are not there.<br>
> These are derived files, yes? Are they expected to be in the release tarball?<br>
<br>
Indeed they should not be there. They should not be a problem in<br>
practice, but this is not clean. I'll send a patch.<br>
<br>
Thanks for the feedback,<br>
<br>
Regards,<br>
Yann E. MORIN.<br>
<br>
-- <br>
.-----------------.-----------<wbr>---------.------------------.-<wbr>-------------------.<br>
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |<br>
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |<br>
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |<br>
| <a href="http://ymorin.is-a-geek.org/" rel="noreferrer" target="_blank">http://ymorin.is-a-geek.org/</a> | _/*\_ | / \ HTML MAIL | v conspiracy. |<br>
'-----------------------------<wbr>-^-------^------------------^-<wbr>-------------------'<br>
<br>
<br>
------------------------------<br>
<br>
Message: 17<br>
Date: Fri, 8 May 2020 01:31:32 -0700<br>
From: Max Filippov <<a href="mailto:jcmvbkbc@gmail.com" target="_blank">jcmvbkbc@gmail.com</a>><br>
To: Romain Naour <<a href="mailto:romain.naour@gmail.com" target="_blank">romain.naour@gmail.com</a>><br>
Cc: buildroot <<a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a>>, Thomas Petazzoni<br>
<<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>><br>
Subject: Re: [Buildroot] [PATCH] package/binutils: fix XTENSA_NDIFF<br>
handling for PR ld/25861<br>
Message-ID:<br>
<CAMo8BfKCYu9aSMn-3F2Cy8Sj7nJv<wbr>Go4eHzM=<a href="mailto:gx2QgUmQjGNTyw@mail.gmail.com" target="_blank">gx2QgUmQjGNTyw@mail.<wbr>gmail.com</a>><br>
Content-Type: text/plain; charset="UTF-8"<br>
<br>
Hi Romain,<br>
<br>
On Thu, May 7, 2020 at 2:10 PM Romain Naour <<a href="mailto:romain.naour@gmail.com" target="_blank">romain.naour@gmail.com</a>> wrote:<br>
> It seems elf2flt used by qemu_xtensa_lx60_nommu_defconf<wbr>ig doesn't support<br>
> R_XTENSA_PDIFF32:<br>
><br>
> elf2flt: 267 bad relocs<br>
><br>
> <a href="https://gitlab.com/kubu93/buildroot/-/jobs/543293510" rel="noreferrer" target="_blank">https://gitlab.com/kubu93/buil<wbr>droot/-/jobs/543293510</a><br>
<br>
Thanks for the report. Proposed fix:<br>
<a href="https://github.com/uclinux-dev/elf2flt/pull/18" rel="noreferrer" target="_blank">https://github.com/uclinux-dev<wbr>/elf2flt/pull/18</a><br>
<br>
-- <br>
Thanks.<br>
-- Max<br>
<br>
<br>
------------------------------<br>
<br>
Message: 18<br>
Date: Fri, 8 May 2020 10:32:20 +0200<br>
From: "Yann E. MORIN" <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Cc: "Yann E. MORIN" <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>>, Danomi Manchego<br>
<<a href="mailto:danomimanchego123@gmail.com" target="_blank">danomimanchego123@gmail.com</a>>, Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
Subject: [Buildroot] [PATCH] release: don't include temp files<br>
Message-ID: <<a href="mailto:20200508083220.18927-1-yann.morin.1998@free.fr" target="_blank">20200508083220.18927-1-yann.m<wbr>orin.1998@free.fr</a>><br>
<br>
When we prepare the release, we generate the manual in various formats,<br>
so that it can be consulted locally without needing the miriads of tools<br>
needed to generate it.<br>
<br>
However, this creates the temporary .br2-external.* files in the output<br>
directory, and those end up in the release tarball.<br>
<br>
This is not a problem in practice, but is not clean.<br>
<br>
Run 'distclean' in the output directory, to get rid of everything but<br>
the generated documentation.<br>
<br>
Reported-by: Danomi Manchego <<a href="mailto:danomimanchego123@gmail.com" target="_blank">danomimanchego123@gmail.com</a>><br>
Signed-off-by: Yann E. MORIN <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
Cc: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
---<br>
Makefile | 2 +-<br>
1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/Makefile b/Makefile<br>
index 3aa4ba4532..2da34b5305 100644<br>
--- a/Makefile<br>
+++ b/Makefile<br>
@@ -1190,7 +1190,7 @@ release: OUT = buildroot-$(BR2_VERSION)<br>
release:<br>
git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar<br>
$(MAKE) O=$(OUT) manual-html manual-text manual-pdf<br>
- $(MAKE) O=$(OUT) clean<br>
+ $(MAKE) O=$(OUT) distclean<br>
tar rf $(OUT).tar $(OUT)<br>
gzip -9 -c < $(OUT).tar > $(OUT).tar.gz<br>
bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2<br>
-- <br>
2.20.1<br>
<br>
<br>
<br>
------------------------------<br>
<br>
Message: 19<br>
Date: Fri, 8 May 2020 10:33:07 +0200<br>
From: "Yann E. MORIN" <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
To: Fabrice Fontaine <<a href="mailto:fontaine.fabrice@gmail.com" target="_blank">fontaine.fabrice@gmail.com</a>><br>
Cc: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: Re: [Buildroot] [PATCH 1/1] package/domoticz: set WITH_LIBUSB<br>
Message-ID: <20200508083307.GM12536@scaer><br>
Content-Type: text/plain; charset=utf-8<br>
<br>
Fabrice, All,<br>
<br>
On 2020-05-08 00:37 +0200, Fabrice Fontaine spake thusly:<br>
> Use WITH_LIBUSB which is available since version 4.9700 and<br>
> <a href="https://github.com/domoticz/domoticz/commit/f53817577a834ed0c3fc16458c374aea490be49e" rel="noreferrer" target="_blank">https://github.com/domoticz/do<wbr>moticz/commit/f53817577a834ed0<wbr>c3fc16458c374aea490be49e</a><br>
> <br>
> Signed-off-by: Fabrice Fontaine <<a href="mailto:fontaine.fabrice@gmail.com" target="_blank">fontaine.fabrice@gmail.com</a>><br>
<br>
Applied to master, thanks.<br>
<br>
Regards,<br>
Yann E. MORIN.<br>
<br>
> ---<br>
> package/domoticz/<a href="http://domoticz.mk" rel="noreferrer" target="_blank">domoticz.mk</a> | 3 +++<br>
> 1 file changed, 3 insertions(+)<br>
> <br>
> diff --git a/package/domoticz/<a href="http://domoticz.mk" rel="noreferrer" target="_blank">domoticz.mk</a> b/package/domoticz/<a href="http://domoticz.mk" rel="noreferrer" target="_blank">domoticz.mk</a><br>
> index 5efe86a784..0ceaab87b4 100644<br>
> --- a/package/domoticz/<a href="http://domoticz.mk" rel="noreferrer" target="_blank">domoticz.mk</a><br>
> +++ b/package/domoticz/<a href="http://domoticz.mk" rel="noreferrer" target="_blank">domoticz.mk</a><br>
> @@ -38,6 +38,9 @@ DOMOTICZ_CONF_OPTS += \<br>
> <br>
> ifeq ($(BR2_PACKAGE_LIBUSB),y)<br>
> DOMOTICZ_DEPENDENCIES += libusb<br>
> +DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=ON<br>
> +else<br>
> +DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=OFF<br>
> endif<br>
> <br>
> ifeq ($(BR2_PACKAGE_OPENZWAVE),y)<br>
> -- <br>
> 2.26.2<br>
> <br>
> ______________________________<wbr>_________________<br>
> buildroot mailing list<br>
> <a href="mailto:buildroot@busybox.net" target="_blank">buildroot@busybox.net</a><br>
> <a href="http://lists.busybox.net/mailman/listinfo/buildroot" rel="noreferrer" target="_blank">http://lists.busybox.net/mailm<wbr>an/listinfo/buildroot</a><br>
<br>
-- <br>
.-----------------.-----------<wbr>---------.------------------.-<wbr>-------------------.<br>
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |<br>
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |<br>
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |<br>
| <a href="http://ymorin.is-a-geek.org/" rel="noreferrer" target="_blank">http://ymorin.is-a-geek.org/</a> | _/*\_ | / \ HTML MAIL | v conspiracy. |<br>
'-----------------------------<wbr>-^-------^------------------^-<wbr>-------------------'<br>
<br>
<br>
------------------------------<br>
<br>
Message: 20<br>
Date: Fri, 8 May 2020 10:34:33 +0200<br>
From: Romain Naour <<a href="mailto:romain.naour@gmail.com" target="_blank">romain.naour@gmail.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Cc: Romain Naour <<a href="mailto:romain.naour@gmail.com" target="_blank">romain.naour@gmail.com</a>>, Thomas Petazzoni<br>
<<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>><br>
Subject: [Buildroot] [PATCH] package/gcc: remove powerpc conditional<br>
patch<br>
Message-ID: <<a href="mailto:20200508083433.1313246-1-romain.naour@gmail.com" target="_blank">20200508083433.1313246-1-roma<wbr>in.naour@gmail.com</a>><br>
<br>
We lost track the powerpc conditional patch that was added for gcc 4.3.3 [1]<br>
and present up to gcc 4.9 (gcc 4.9 removed by [2]). But the code in <a href="http://gcc.mk" rel="noreferrer" target="_blank">gcc.mk</a><br>
is still present.<br>
<br>
The patch was dropped starting gcc 5.1 [3] but it's know to be useful for<br>
gcc 4.7.3 [4].<br>
<br>
Since we used to have a patch directory (package/gcc/$(GCC_VERSION)) for<br>
every gcc version available in Buildroot, the apply-patches.sh script<br>
doesn't error out even if 1000-powerpc-link-with-math-li<wbr>b.patch.conditional<br>
is missing.<br>
<br>
But with gcc 10, we don't need (for the moment) to apply any patch, so the<br>
patch directory doesn't exist. apply-patches.sh break the build since<br>
the patch directory is missing:<br>
<br>
Aborting. 'package/gcc/10.1.0' is not a directory.<br>
<br>
Since we removed gcc 4.9 last year [2], we can safely remove this code.<br>
<br>
Tested using qemu_ppc_virtex_ml507_defconfi<wbr>g.<br>
<br>
[1] bb1f42e4426c432af60fc80da45c6d<wbr>af7e31c1a0<br>
[2] baf177502214a67619d9d0d6d0a780<wbr>458e4d652d<br>
[3] 4deb2d93c5ab317b6addf4e1e13257<wbr>1ba8dac031<br>
[4] 197006a41c1a0450bf6350d5742e18<wbr>6b5b0c69de<br>
<br>
Signed-off-by: Romain Naour <<a href="mailto:romain.naour@gmail.com" target="_blank">romain.naour@gmail.com</a>><br>
Cc: Thomas Petazzoni <<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>><br>
---<br>
package/gcc/<a href="http://gcc.mk" rel="noreferrer" target="_blank">gcc.mk</a> | 8 --------<br>
1 file changed, 8 deletions(-)<br>
<br>
diff --git a/package/gcc/<a href="http://gcc.mk" rel="noreferrer" target="_blank">gcc.mk</a> b/package/gcc/<a href="http://gcc.mk" rel="noreferrer" target="_blank">gcc.mk</a><br>
index 50f2a3fcb7..af25d268a7 100644<br>
--- a/package/gcc/<a href="http://gcc.mk" rel="noreferrer" target="_blank">gcc.mk</a><br>
+++ b/package/gcc/<a href="http://gcc.mk" rel="noreferrer" target="_blank">gcc.mk</a><br>
@@ -32,14 +32,6 @@ endef<br>
# Apply patches<br>
#<br>
<br>
-ifeq ($(ARCH),powerpc)<br>
-ifneq ($(BR2_SOFT_FLOAT),)<br>
-define HOST_GCC_APPLY_POWERPC_PATCH<br>
- $(APPLY_PATCHES) $(@D) package/gcc/$(GCC_VERSION) 1000-powerpc-link-with-math-li<wbr>b.patch.conditional<br>
-endef<br>
-endif<br>
-endif<br>
-<br>
# gcc is a special package, not named gcc, but gcc-initial and<br>
# gcc-final, but patches are nonetheless stored in package/gcc in the<br>
# tree, and potentially in BR2_GLOBAL_PATCH_DIR directories as well.<br>
-- <br>
2.25.4<br>
<br>
<br>
<br>
------------------------------<br>
<br>
Message: 21<br>
Date: Fri, 8 May 2020 11:01:08 +0200<br>
From: Fabrice Fontaine <<a href="mailto:fontaine.fabrice@gmail.com" target="_blank">fontaine.fabrice@gmail.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Cc: Guillaume Gardet <<a href="mailto:guillaume.gardet@oliseo.fr" target="_blank">guillaume.gardet@oliseo.fr</a>>, Fabrice Fontaine<br>
<<a href="mailto:fontaine.fabrice@gmail.com" target="_blank">fontaine.fabrice@gmail.com</a>><br>
Subject: [Buildroot] [PATCH 1/1] package/c-icap: fix musl build<br>
Message-ID: <<a href="mailto:20200508090108.315450-1-fontaine.fabrice@gmail.com" target="_blank">20200508090108.315450-1-fonta<wbr>ine.fabrice@gmail.com</a>><br>
<br>
Commit cb5df2fea516d4861af3c0629f49df<wbr>697ee4f70e wrongly removed the<br>
first patch which is not in version 0.5.6. So add it back and update it<br>
so that it applies cleanly.<br>
<br>
Fixes:<br>
- <a href="http://autobuild.buildroot.org/results/ddb57462945c5c2340cc375aa6fe2848d13d7001" rel="noreferrer" target="_blank">http://autobuild.buildroot.org<wbr>/results/ddb57462945c5c2340cc3<wbr>75aa6fe2848d13d7001</a><br>
<br>
Signed-off-by: Fabrice Fontaine <<a href="mailto:fontaine.fabrice@gmail.com" target="_blank">fontaine.fabrice@gmail.com</a>><br>
---<br>
...ixes-to-compile-and-run-un<wbr>der-cygwin.patch | 391 ++++++++++++++++++<br>
1 file changed, 391 insertions(+)<br>
create mode 100644 package/c-icap/0001-Required-f<wbr>ixes-to-compile-and-run-under-<wbr>cygwin.patch<br>
<br>
diff --git a/package/c-icap/0001-Required<wbr>-fixes-to-compile-and-run-<wbr>under-cygwin.patch b/package/c-icap/0001-Required<wbr>-fixes-to-compile-and-run-<wbr>under-cygwin.patch<br>
new file mode 100644<br>
index 0000000000..6f886c9b72<br>
--- /dev/null<br>
+++ b/package/c-icap/0001-Required<wbr>-fixes-to-compile-and-run-<wbr>under-cygwin.patch<br>
@@ -0,0 +1,391 @@<br>
+From 1631a6c1f50e152b8a45d8279c9608<wbr>6e5636795b Mon Sep 17 00:00:00 2001<br>
+From: Christos Tsantilas <<a href="mailto:christos@chtsanti.net" target="_blank">christos@chtsanti.net</a>><br>
+Date: Fri, 25 Jan 2019 06:42:22 -0800<br>
+Subject: [PATCH] Required fixes to compile and run under cygwin<br>
+<br>
+[Retrieved (and backported) from:<br>
+<a href="https://github.com/c-icap/c-icap-server/commit/1631a6c1f50e152b8a45d8279c96086e5636795b" rel="noreferrer" target="_blank">https://github.com/c-icap/c-i<wbr>cap-server/commit/1631a6c1f50e<wbr>152b8a45d8279c96086e5636795b</a>,<br>
+which has the side effect of fixing the build with the musl C library]<br>
+Signed-off-by: Fabrice Fontaine <<a href="mailto:fontaine.fabrice@gmail.com" target="_blank">fontaine.fabrice@gmail.com</a>><br>
+---<br>
+ Makefile.am | 2 +-<br>
+ <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> | 10 +++++++---<br>
+ header.c | 34 ------------------------------<wbr>----<br>
+ include/header.h | 8 --------<br>
+ modules/Makefile.am | 34 ++++++++++++++++++++----------<wbr>----<br>
+ modules/bdb_tables.c | 17 +++++++++++++++--<br>
+ modules/shared_cache.c | 12 ++++++++++++<br>
+ modules/sys_logger.c | 13 +++++++++++++<br>
+ services/echo/Makefile.am | 10 ++++++++--<br>
+ services/ex-206/Makefile.am | 10 ++++++++--<br>
+ utils/c-icap-mkbdb.c | 8 ++++----<br>
+ 11 files changed, 88 insertions(+), 70 deletions(-)<br>
+<br>
+diff --git a/Makefile.am b/Makefile.am<br>
+index 4c34033..ab80f4f 100644<br>
+--- a/Makefile.am<br>
++++ b/Makefile.am<br>
+@@ -53,7 +53,7 @@ c_icap_SOURCES = aserver.c request.c cfg_param.c \<br>
+ libicapapi_la_CFLAGS= $(INVISIBILITY_CFLAG) -I$(srcdir)/include/ -Iinclude/ @ZLIB_ADD_FLAG@ @OPENSSL_ADD_FLAG@ @BZLIB_ADD_FLAG@ @BROTLI_ADD_FLAG@ @PCRE_ADD_FLAG@ -DCI_BUILD_LIB<br>
+ <br>
+ libicapapi_la_LIBADD = @ZLIB_ADD_LDADD@ @BZLIB_ADD_LDADD@ @BROTLI_ADD_LDADD@ @PCRE_ADD_LDADD@ @DL_ADD_FLAG@ @THREADS_LDADD@ @OPENSSL_ADD_LDADD@<br>
+-libicapapi_la_LDFLAGS= -shared -version-info @CICAPLIB_VERSION@ @THREADS_LDFLAGS@<br>
++libicapapi_la_LDFLAGS= -shared -version-info @CICAPLIB_VERSION@ @LIBS_LDFLAGS@ @THREADS_LDFLAGS@<br>
+ <br>
+ export EXT_PROGRAMS_MKLIB = @ZLIB_LNDIR_LDADD@ @BZLIB_LNDIR_LDADD@ @BROTLI_LNDIR_LDADD@ @PCRE_LNDIR_LDADD@ @OPENSSL_LNDIR_LDADD@<br>
+ <br>
+diff --git a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
+index 405571b..8059cb7 100644<br>
+--- a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
++++ b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
+@@ -45,12 +45,14 @@ case "$host_os" in<br>
+ CFLAGS="-D_REENTRANT $CFLAGS"<br>
+ THREADS_LDADD="-lpthread"<br>
+ THREADS_LDFLAGS=""<br>
++ LIBS_LDFLAGS=""<br>
+ ;;<br>
+ solaris2.*)<br>
+ CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $CFLAGS"<br>
+ LIBS="-lsocket -lnsl -lrt $LIBS"<br>
+ THREADS_LDADD="-lpthread"<br>
+ THREADS_LDFLAGS=""<br>
++ LIBS_LDFLAGS=""<br>
+ ;;<br>
+ freebsd5*)<br>
+ ## If I understand how all those threading models works correctly<br>
+@@ -69,6 +71,7 @@ case "$host_os" in<br>
+ CFLAGS="-pthread -D_THREAD_SAFE $CFLAGS"<br>
+ THREADS_LDADD="-XCClinker -lc_r"<br>
+ THREADS_LDFLAGS=""<br>
++ LIBS_LDFLAGS=""<br>
+ ## FreeBSD has pthreads rwlocks from version 3 (I think)<br>
+ # AC_DEFINE(HAVE_PTHREADS_RWLOC<wbr>K,1,[Define HAVE_PTHREADS_RWLOCK if pthreads library supports rwlocks])<br>
+ ## 1:1 threads<br>
+@@ -82,24 +85,28 @@ case "$host_os" in<br>
+ CFLAGS="-D_THREAD_SAFE $CFLAGS"<br>
+ THREADS_LDADD="-XCClinker -lthr"<br>
+ THREADS_LDFLAGS=""<br>
++ LIBS_LDFLAGS=""<br>
+ ;;<br>
+ <br>
+ cygwin*)<br>
+ CFLAGS="-D_REENTRANT $CFLAGS"<br>
+ THREADS_LDADD="-lpthread"<br>
+ THREADS_LDFLAGS="";<br>
++ LIBS_LDFLAGS="-no-undefined"<br>
+ iscygwin="yes"<br>
+ ;;<br>
+ *)<br>
+ CFLAGS="-D_REENTRANT $CFLAGS"<br>
+ THREADS_LDADD="-lpthread"<br>
+ THREADS_LDFLAGS=""<br>
++ LIBS_LDFLAGS=""<br>
+ ;;<br>
+ esac<br>
+ <br>
+ TEST_LIBS="$TEST_LIBS $THREADS_LDADD"<br>
+ AC_SUBST(THREADS_LDADD)<br>
+ AC_SUBST(THREADS_LDFLAGS)<br>
++AC_SUBST(LIBS_LDFLAGS)<br>
+ <br>
+ AC_DEFINE_UNQUOTED(C_ICAP_CONF<wbr>IGURE_OPTIONS, "$ac_configure_args",<br>
+ [configure command line used to configure c-icap])<br>
+@@ -984,9 +991,6 @@ LIBS="$LIBS $EXTRALIBS"<br>
+ <br>
+ #Configure common flags<br>
+ MODULES_LIBADD=""<br>
+-if test a"$iscygwin" != a; then<br>
+- MODULES_LIBADD="-L../../ -licapapi"<br>
+-fi<br>
+ MODULES_CFLAGS="$INVISIBILITY_<wbr>CFLAG -DCI_BUILD_MODULE"<br>
+ AC_SUBST(MODULES_LIBADD)<br>
+ AC_SUBST(MODULES_CFLAGS)<br>
+diff --git a/header.c b/header.c<br>
+index 807a2e0..266b958 100644<br>
+--- a/header.c<br>
++++ b/header.c<br>
+@@ -110,21 +110,6 @@ const struct ci_error_code ci_error_codes[] = {<br>
+ {505, "Unsupported version"} /*ICAP version not supported by server. */<br>
+ };<br>
+ <br>
+-/*<br>
+-#ifdef __CYGWIN__<br>
+-int ci_error_code(int ec){<br>
+- return (ec >= EC_100 && ec < EC_MAX ? ci_error_codes[ec].code:1000);<br>
+-}<br>
+-<br>
+-const char *unknownerrorcode = "UNKNOWN ERROR CODE";<br>
+-<br>
+-const char *ci_error_code_string(int ec){<br>
+- return (ec >= EC_100 && ec < EC_MAX?ci_error_codes[ec].str:<wbr>unknownerrorcode);<br>
+-}<br>
+-#endif<br>
+-*/<br>
+-<br>
+-<br>
+ const char *ci_encaps_entities[] = {<br>
+ "req-hdr",<br>
+ "res-hdr",<br>
+@@ -134,25 +119,6 @@ const char *ci_encaps_entities[] = {<br>
+ "opt-body"<br>
+ };<br>
+ <br>
+-#ifdef __CYGWIN__<br>
+-<br>
+-const char *unknownentity = "UNKNOWN";<br>
+-const char *unknownmethod = "UNKNOWN";<br>
+-<br>
+-const char *ci_method_string(int method)<br>
+-{<br>
+- return (method <= ICAP_RESPMOD<br>
+- && method >= ICAP_OPTIONS ? CI_Methods[method] : unknownmethod);<br>
+-}<br>
+-<br>
+-<br>
+-const char *ci_encaps_entity_string(int e)<br>
+-{<br>
+- return (e <= ICAP_OPT_BODY<br>
+- && e >= ICAP_REQ_HDR ? CI_EncapsEntities[e] : unknownentity);<br>
+-}<br>
+-#endif<br>
+-<br>
+ ci_headers_list_t *ci_headers_create()<br>
+ {<br>
+ ci_headers_list_t *h;<br>
+diff --git a/include/header.h b/include/header.h<br>
+index 4cab365..ed2de88 100644<br>
+--- a/include/header.h<br>
++++ b/include/header.h<br>
+@@ -52,16 +52,8 @@ enum ci_encapsulated_entities {ICAP_REQ_HDR, ICAP_RES_HDR,<br>
+ };<br>
+ CI_DECLARE_DATA extern const char *ci_encaps_entities[];<br>
+ <br>
+-#ifdef __CYGWIN__<br>
+-<br>
+-const char *ci_encaps_entity_string(int e);<br>
+-<br>
+-#else<br>
+-<br>
+ #define ci_encaps_entity_string(e) (e <= ICAP_OPT_BODY && e >= ICAP_REQ_HDR?ci_encaps_entitie<wbr>s[e]:"UNKNOWN")<br>
+ <br>
+-#endif<br>
+-<br>
+ /**<br>
+ \typedef ci_headers_list_t<br>
+ \ingroup HEADERS<br>
+diff --git a/modules/Makefile.am b/modules/Makefile.am<br>
+index e6e9270..2d43a60 100644<br>
+--- a/modules/Makefile.am<br>
++++ b/modules/Makefile.am<br>
+@@ -21,38 +21,44 @@ endif<br>
+ <br>
+ AM_CPPFLAGS=-I$(top_srcdir)/ -I$(top_srcdir)/include/ -I$(top_builddir)/include/<br>
+ <br>
+-sys_logger_la_LIBADD = @MODULES_LIBADD@<br>
++if ISCYGWIN<br>
++MODS_LIB_ADD=$(top_builddir)<wbr>/<a href="http://libicapapi.la" rel="noreferrer" target="_blank">libicapapi.la</a><br>
++else<br>
++MODS_LIB_ADD=<br>
++endif<br>
++<br>
++sys_logger_la_LIBADD = $(MODS_LIB_ADD)<br>
+ sys_logger_la_CFLAGS= @MODULES_CFLAGS@ @OPENSSL_ADD_FLAG@<br>
+-sys_logger_la_LDFLAGS= -module -avoid-version<br>
++sys_logger_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@<br>
+ sys_logger_la_SOURCES = sys_logger.c<br>
+ <br>
+-dnsbl_tables_la_LIBADD = @MODULES_LIBADD@<br>
++dnsbl_tables_la_LIBADD = $(MODS_LIB_ADD)<br>
+ dnsbl_tables_la_CFLAGS= @MODULES_CFLAGS@ @OPENSSL_ADD_FLAG@<br>
+-dnsbl_tables_la_LDFLAGS= -module -avoid-version<br>
++dnsbl_tables_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@<br>
+ dnsbl_tables_la_SOURCES = dnsbl_tables.c<br>
+ <br>
+-perl_handler_la_LIBADD = @MODULES_LIBADD@ @perllib@ -L@perlcore@ -lperl<br>
++perl_handler_la_LIBADD = $(MODS_LIB_ADD) @perllib@ -L@perlcore@ -lperl<br>
+ perl_handler_la_CFLAGS= @MODULES_CFLAGS@ @perlccflags@ -I@perlcore@<br>
+-perl_handler_la_LDFLAGS= -module -avoid-version @perlldflags@<br>
++perl_handler_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@ @perlldflags@<br>
+ perl_handler_la_SOURCES = perl_handler.c<br>
+ <br>
+ <br>
+-bdb_tables_la_LIBADD = @MODULES_LIBADD@ @BDB_ADD_LDADD@<br>
++bdb_tables_la_LIBADD = $(MODS_LIB_ADD) @BDB_ADD_LDADD@<br>
+ bdb_tables_la_CFLAGS= @MODULES_CFLAGS@ @BDB_ADD_FLAG@<br>
+-bdb_tables_la_LDFLAGS= -module -avoid-version<br>
++bdb_tables_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@<br>
+ bdb_tables_la_SOURCES = bdb_tables.c<br>
+ <br>
+-ldap_module_la_LIBADD = @MODULES_LIBADD@ @LDAP_ADD_LDADD@ $(top_builddir)/<a href="http://libicapapi.la" rel="noreferrer" target="_blank">libicapapi.la</a><br>
++ldap_module_la_LIBADD = $(MODS_LIB_ADD) @LDAP_ADD_LDADD@<br>
+ ldap_module_la_CFLAGS= @MODULES_CFLAGS@ @LDAP_ADD_FLAG@<br>
+-ldap_module_la_LDFLAGS= -module -avoid-version<br>
++ldap_module_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@<br>
+ ldap_module_la_SOURCES = ldap_module.c<br>
+ <br>
+-memcached_cache_la_LIBADD= @MODULES_LIBADD@ @MEMCACHED_ADD_LDADD@<br>
++memcached_cache_la_LIBADD= $(MODS_LIB_ADD) @MEMCACHED_ADD_LDADD@<br>
+ memcached_cache_la_CFLAGS= @MODULES_CFLAGS@ @MEMCACHED_ADD_FLAG@<br>
+-memcached_cache_la_LDFLAGS= -module -avoid-version<br>
++memcached_cache_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@<br>
+ memcached_cache_la_SOURCES= memcached.c<br>
+ <br>
+-shared_cache_la_LIBADD= @MODULES_LIBADD@<br>
++shared_cache_la_LIBADD= $(MODS_LIB_ADD)<br>
+ shared_cache_la_CFLAGS= @OPENSSL_ADD_FLAG@<br>
+-shared_cache_la_LDFLAGS= -module -avoid-version<br>
++shared_cache_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@<br>
+ shared_cache_la_SOURCES= shared_cache.c<br>
+diff --git a/modules/bdb_tables.c b/modules/bdb_tables.c<br>
+index b8459be..1e908a9 100644<br>
+--- a/modules/bdb_tables.c<br>
++++ b/modules/bdb_tables.c<br>
+@@ -176,8 +176,8 @@ void *bdb_table_open(struct ci_lookup_table *table)<br>
+ <br>
+ /*We can not fork a Berkeley DB table, so we have to<br>
+ open bdb tables for every child, on childs start-up procedure*/<br>
+- register_command_extend("openB<wbr>DBtable", CHILD_START_CMD, table,<br>
+- command_real_open_table);<br>
++ ci_command_register_action("op<wbr>enBDBtable", CHILD_START_CMD, table,<br>
++ command_real_open_table);<br>
+ <br>
+ return table->data;<br>
+ }<br>
+@@ -257,3 +257,16 @@ void bdb_table_release_result(struc<wbr>t ci_lookup_table *table,void **val)<br>
+ {<br>
+ ci_buffer_free(val);<br>
+ }<br>
++<br>
++ #ifdef __CYGWIN__<br>
++#include <w32api/windows.h><br>
++void ci_command_register_action(con<wbr>st char *name, int type, void *data,<br>
++ void (*command_action) (const char *name, int type, void *data))<br>
++ {<br>
++ typedef void (*RA)(const char *, int, void *, void(*)(const char *, int, void *));<br>
++ RA fn;<br>
++ fn = (RA)GetProcAddress(GetModuleHa<wbr>ndle(NULL), "ci_command_register_action");<br>
++ if (fn)<br>
++ (*fn)(name, type, data, command_action);<br>
++ }<br>
++#endif<br>
+diff --git a/modules/shared_cache.c b/modules/shared_cache.c<br>
+index 103b760..a79d51a 100644<br>
+--- a/modules/shared_cache.c<br>
++++ b/modules/shared_cache.c<br>
+@@ -345,3 +345,15 @@ void ci_shared_cache_destroy(struct ci_cache *cache)<br>
+ ci_shared_mem_detach(&data->i<wbr>d);<br>
+ }<br>
+ <br>
++#ifdef __CYGWIN__<br>
++#include <w32api/windows.h><br>
++void ci_command_register_action(con<wbr>st char *name, int type, void *data,<br>
++ void (*command_action) (const char *name, int type, void *data))<br>
++ {<br>
++ typedef void (*RA)(const char *, int, void *, void(*)(const char *, int, void *));<br>
++ RA fn;<br>
++ fn = (RA)GetProcAddress(GetModuleHa<wbr>ndle(NULL), "ci_command_register_action");<br>
++ if (fn)<br>
++ (*fn)(name, type, data, command_action);<br>
++ }<br>
++#endif<br>
+diff --git a/modules/sys_logger.c b/modules/sys_logger.c<br>
+index 1c47753..1764b0d 100644<br>
+--- a/modules/sys_logger.c<br>
++++ b/modules/sys_logger.c<br>
+@@ -60,7 +60,20 @@ int cfg_syslog_access(const char *directive, const char **argv, void *setdata);<br>
+ functions declared in log.c. This file is not included in c-icap library<br>
+ but defined in primary c-icap binary.<br>
+ */<br>
++#ifdef __CYGWIN__<br>
++#include <w32api/windows.h><br>
++char *logformat_fmt(const char *name)<br>
++{<br>
++ typedef char* (*LF_FMT)(const char *);<br>
++ LF_FMT fn;<br>
++ fn = (LF_FMT)GetProcAddress(GetModu<wbr>leHandle(NULL), "logformat_fmt");<br>
++ if (fn)<br>
++ return (*fn)(name);<br>
++ return NULL;<br>
++}<br>
++#else<br>
+ extern char *logformat_fmt(const char *name);<br>
++#endif<br>
+ <br>
+ /*Configuration Table .....*/<br>
+ static struct ci_conf_entry conf_variables[] = {<br>
+diff --git a/services/echo/Makefile.am b/services/echo/Makefile.am<br>
+index 402c8f9..7d701b1 100644<br>
+--- a/services/echo/Makefile.am<br>
++++ b/services/echo/Makefile.am<br>
+@@ -3,9 +3,15 @@ pkglib_LTLIBRARIES=<a href="http://srv_echo.la" rel="noreferrer" target="_blank">srv_echo.la</a><br>
+ <br>
+ AM_CPPFLAGS=-I$(top_srcdir)/ -I$(top_srcdir)/include/ -I$(top_builddir)/include/<br>
+ <br>
+-srv_echo_la_LIBADD = @MODULES_LIBADD@<br>
++if ISCYGWIN<br>
++MODS_LIB_ADD=$(top_builddir)<wbr>/<a href="http://libicapapi.la" rel="noreferrer" target="_blank">libicapapi.la</a><br>
++else<br>
++MODS_LIB_ADD=<br>
++endif<br>
++<br>
++srv_echo_la_LIBADD = $(MODS_LIB_ADD)<br>
+ srv_echo_la_CFLAGS= @MODULES_CFLAGS@ @OPENSSL_ADD_FLAG@<br>
+-srv_echo_la_LDFLAGS= -module -avoid-version<br>
++srv_echo_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@<br>
+ srv_echo_la_SOURCES = srv_echo.c<br>
+ <br>
+ <br>
+diff --git a/services/ex-206/Makefile.am b/services/ex-206/Makefile.am<br>
+index 44bbf21..ff73399 100644<br>
+--- a/services/ex-206/Makefile.am<br>
++++ b/services/ex-206/Makefile.am<br>
+@@ -3,8 +3,14 @@ pkglib_LTLIBRARIES=<a href="http://srv_ex206.la" rel="noreferrer" target="_blank">srv_ex206.l<wbr>a</a><br>
+ <br>
+ AM_CPPFLAGS=-I$(top_srcdir)/ -I$(top_srcdir)/include/ -I$(top_builddir)/include/<br>
+ <br>
+-srv_ex206_la_LIBADD = @MODULES_LIBADD@<br>
++if ISCYGWIN<br>
++MODS_LIB_ADD=$(top_builddir)<wbr>/<a href="http://libicapapi.la" rel="noreferrer" target="_blank">libicapapi.la</a><br>
++else<br>
++MODS_LIB_ADD=<br>
++endif<br>
++<br>
++srv_ex206_la_LIBADD = $(MODS_LIB_ADD)<br>
+ srv_ex206_la_CFLAGS= @MODULES_CFLAGS@ @OPENSSL_ADD_FLAG@<br>
+-srv_ex206_la_LDFLAGS= -module -avoid-version<br>
++srv_ex206_la_LDFLAGS= -module -avoid-version @LIBS_LDFLAGS@<br>
+ srv_ex206_la_SOURCES = srv_ex206.c<br>
+ <br>
+diff --git a/utils/c-icap-mkbdb.c b/utils/c-icap-mkbdb.c<br>
+index c29a46f..326ee1c 100644<br>
+--- a/utils/c-icap-mkbdb.c<br>
++++ b/utils/c-icap-mkbdb.c<br>
+@@ -23,7 +23,7 @@ char *dbfile = NULL;<br>
+ int DUMP_MODE = 0;<br>
+ int VERSION_MODE = 0;<br>
+ int USE_DBTREE = 0;<br>
+-long int PAGE_SIZE;<br>
++long int DB_PAGE_SIZE;<br>
+ <br>
+ ci_mem_allocator_t *allocator = NULL;<br>
+ int cfg_set_type(const char *directive, const char **argv, void *setdata);<br>
+@@ -52,7 +52,7 @@ static struct ci_options_entry options[] = {<br>
+ "The type of values"<br>
+ },<br>
+ {<br>
+- "-p", "page_size", &PAGE_SIZE, ci_cfg_size_long,<br>
++ "-p", "page_size", &DB_PAGE_SIZE, ci_cfg_size_long,<br>
+ "The page size to use for the database"<br>
+ },<br>
+ {<br>
+@@ -107,8 +107,8 @@ int open_db(char *path)<br>
+ return 0;<br>
+ }<br>
+ <br>
+- if (PAGE_SIZE > 512 && PAGE_SIZE <= 64*1024)<br>
+- db->set_pagesize(db, (uint32_t)PAGE_SIZE);<br>
++ if (DB_PAGE_SIZE > 512 && DB_PAGE_SIZE <= 64*1024)<br>
++ db->set_pagesize(db, (uint32_t)DB_PAGE_SIZE);<br>
+ <br>
+ if ((ret = db->open(db, NULL, path, NULL,<br>
+ (USE_DBTREE ? DB_BTREE : DB_HASH),<br>
-- <br>
2.26.2<br>
<br>
<br>
<br>
------------------------------<br>
<br>
Message: 22<br>
Date: Fri, 08 May 2020 09:10:41 +0000<br>
From: <a href="mailto:bugzilla@busybox.net" target="_blank">bugzilla@busybox.net</a><br>
To: <a href="mailto:buildroot@uclibc.org" target="_blank">buildroot@uclibc.org</a><br>
Subject: [Buildroot] [Bug 12841] util-linux/sfdisk 2.35.1 fails on<br>
sector-size header<br>
Message-ID: <<a href="http://bug-12841-163-UUAiJL3FjH@https.bugs.busybox.net/" rel="noreferrer" target="_blank">bug-12841-163-UUAiJL3FjH@http<wbr>s.bugs.busybox.net/</a>><br>
Content-Type: text/plain; charset="UTF-8"<br>
<br>
<a href="https://bugs.busybox.net/show_bug.cgi?id=12841" rel="noreferrer" target="_blank">https://bugs.busybox.net/show_<wbr>bug.cgi?id=12841</a><br>
<br>
--- Comment #1 from Fabrice Fontaine <<a href="mailto:fontaine.fabrice@gmail.com" target="_blank">fontaine.fabrice@gmail.com</a>> ---<br>
Hi,<br>
<br>
Instead of adding a custom patch, I retrieved the upstream patch:<br>
<a href="https://patchwork.ozlabs.org/project/buildroot/patch/20200507224150.242211-2-fontaine.fabrice@gmail.com" rel="noreferrer" target="_blank">https://patchwork.ozlabs.org/p<wbr>roject/buildroot/patch/2020050<wbr>7224150.242211-2-fontaine.<wbr>fabrice@gmail.com</a><br>
<br>
Can you confirm that the patch above fixes your issue?<br>
<br>
Best Regards,<br>
<br>
Fabrice<br>
<br>
-- <br>
You are receiving this mail because:<br>
You are on the CC list for the bug.<br>
<br>
------------------------------<br>
<br>
Message: 23<br>
Date: Fri, 08 May 2020 11:34:13 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: "Yann E. MORIN" <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
Cc: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a>, Danomi Manchego<br>
<<a href="mailto:danomimanchego123@gmail.com" target="_blank">danomimanchego123@gmail.com</a>><br>
Subject: Re: [Buildroot] [PATCH] release: don't include temp files<br>
Message-ID: <<a href="mailto:87eerusrca.fsf@dell.be.48ers.dk" target="_blank">87eerusrca.fsf@dell.be.48ers.<wbr>dk</a>><br>
Content-Type: text/plain<br>
<br>
>>>>> "Yann" == Yann E MORIN <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>> writes:<br>
<br>
> When we prepare the release, we generate the manual in various formats,<br>
> so that it can be consulted locally without needing the miriads of tools<br>
> needed to generate it.<br>
<br>
> However, this creates the temporary .br2-external.* files in the output<br>
> directory, and those end up in the release tarball.<br>
<br>
> This is not a problem in practice, but is not clean.<br>
<br>
> Run 'distclean' in the output directory, to get rid of everything but<br>
> the generated documentation.<br>
<br>
> Reported-by: Danomi Manchego <<a href="mailto:danomimanchego123@gmail.com" target="_blank">danomimanchego123@gmail.com</a>><br>
> Signed-off-by: Yann E. MORIN <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
> Cc: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
<br>
I am a bit surprised that our 'make distclean' doesn't delete the<br>
generated documentation, but OK - Here it is handy.<br>
<br>
Committed, thanks.<br>
<br>
-- <br>
Bye, Peter Korsgaard<br>
<br>
<br>
------------------------------<br>
<br>
Message: 24<br>
Date: Fri, 8 May 2020 11:33:31 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit] release: don't include temp files<br>
Message-ID: <<a href="mailto:20200508091917.38AF691046@busybox.osuosl.org" target="_blank">20200508091917.38AF691046@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=bee47598aa1f853df14f7edb51d8a7cadcfa9939" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=bee47598aa1f8<wbr>53df14f7edb51d8a7cadcfa9939</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/master" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>master</a><br>
<br>
When we prepare the release, we generate the manual in various formats,<br>
so that it can be consulted locally without needing the miriads of tools<br>
needed to generate it.<br>
<br>
However, this creates the temporary .br2-external.* files in the output<br>
directory, and those end up in the release tarball.<br>
<br>
This is not a problem in practice, but is not clean.<br>
<br>
Run 'distclean' in the output directory, to get rid of everything but<br>
the generated documentation.<br>
<br>
Reported-by: Danomi Manchego <<a href="mailto:danomimanchego123@gmail.com" target="_blank">danomimanchego123@gmail.com</a>><br>
Signed-off-by: Yann E. MORIN <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
Cc: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
---<br>
Makefile | 2 +-<br>
1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/Makefile b/Makefile<br>
index 3aa4ba4532..2da34b5305 100644<br>
--- a/Makefile<br>
+++ b/Makefile<br>
@@ -1190,7 +1190,7 @@ release: OUT = buildroot-$(BR2_VERSION)<br>
release:<br>
git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar<br>
$(MAKE) O=$(OUT) manual-html manual-text manual-pdf<br>
- $(MAKE) O=$(OUT) clean<br>
+ $(MAKE) O=$(OUT) distclean<br>
tar rf $(OUT).tar $(OUT)<br>
gzip -9 -c < $(OUT).tar > $(OUT).tar.gz<br>
bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2<br>
<br>
<br>
------------------------------<br>
<br>
Message: 25<br>
Date: Fri, 08 May 2020 11:38:30 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: Max Filippov <<a href="mailto:jcmvbkbc@gmail.com" target="_blank">jcmvbkbc@gmail.com</a>><br>
Cc: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a>, Thomas Petazzoni<br>
<<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>><br>
Subject: Re: [Buildroot] [PATCH] package/binutils: fix xtensa PR<br>
ld/25861<br>
Message-ID: <<a href="mailto:87a72isr55.fsf@dell.be.48ers.dk" target="_blank">87a72isr55.fsf@dell.be.48ers.<wbr>dk</a>><br>
Content-Type: text/plain<br>
<br>
>>>>> "Max" == Max Filippov <<a href="mailto:jcmvbkbc@gmail.com" target="_blank">jcmvbkbc@gmail.com</a>> writes:<br>
<br>
> Handle link-time relaxation of full 16-bit difference values correctly<br>
> in xtensa linker. This fixes the following kind of build errors:<br>
<br>
> .../five-point.cpp:338:(.debug<wbr>_line+0x3b12):<br>
> dangerous relocation: overflow after relaxation<br>
<br>
> Backported from:<br>
> <a href="https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=30ce8e47fad9b057b6d7af9e1d43061126d34d20" rel="noreferrer" target="_blank">https://sourceware.org/git/git<wbr>web.cgi?p=binutils-gdb.git;a=<wbr>commitdiff;h=30ce8e47fad9b057b<wbr>6d7af9e1d43061126d34d20</a><br>
> Fixes:<br>
> <a href="http://autobuild.buildroot.net/results/67a5545779bbe8ca2b21da1f3ff2002053710ce1/" rel="noreferrer" target="_blank">http://autobuild.buildroot.net<wbr>/results/67a5545779bbe8ca2b21d<wbr>a1f3ff2002053710ce1/</a><br>
> <a href="http://autobuild.buildroot.net/results/87f38998d2d60b6bce3128589973187ef9596e28/" rel="noreferrer" target="_blank">http://autobuild.buildroot.net<wbr>/results/87f38998d2d60b6bce312<wbr>8589973187ef9596e28/</a><br>
<br>
> Signed-off-by: Max Filippov <<a href="mailto:jcmvbkbc@gmail.com" target="_blank">jcmvbkbc@gmail.com</a>><br>
<br>
Committed to 2020.02.x, thanks.<br>
<br>
-- <br>
Bye, Peter Korsgaard<br>
<br>
<br>
------------------------------<br>
<br>
Message: 26<br>
Date: Fri, 08 May 2020 11:38:46 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: Max Filippov <<a href="mailto:jcmvbkbc@gmail.com" target="_blank">jcmvbkbc@gmail.com</a>><br>
Cc: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a>, Romain Naour <<a href="mailto:romain.naour@gmail.com" target="_blank">romain.naour@gmail.com</a>>,<br>
Thomas Petazzoni <<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>><br>
Subject: Re: [Buildroot] [PATCH] package/binutils: fix XTENSA_NDIFF<br>
handling for PR ld/25861<br>
Message-ID: <<a href="mailto:875zd6sr4p.fsf@dell.be.48ers.dk" target="_blank">875zd6sr4p.fsf@dell.be.48ers.<wbr>dk</a>><br>
Content-Type: text/plain<br>
<br>
>>>>> "Max" == Max Filippov <<a href="mailto:jcmvbkbc@gmail.com" target="_blank">jcmvbkbc@gmail.com</a>> writes:<br>
<br>
> Fix for xtensa PR ld/25861 introduced a regression in handling negative<br>
> symbol differences resulting in linker performing incorrect relaxation<br>
> or failing to link. Fix XTENSA_NDIFF relocation handling.<br>
<br>
> Backported from:<br>
> <a href="https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=d548f47df4d2e3d117d504a4c9977982c78a0556" rel="noreferrer" target="_blank">https://sourceware.org/git/git<wbr>web.cgi?p=binutils-gdb.git;a=<wbr>commitdiff;h=d548f47df4d2e3d11<wbr>7d504a4c9977982c78a0556</a><br>
<br>
> Fixes: f0291ef4aba0 ("package/binutils: fix xtensa PR ld/25861")<br>
> Signed-off-by: Max Filippov <<a href="mailto:jcmvbkbc@gmail.com" target="_blank">jcmvbkbc@gmail.com</a>><br>
<br>
Committed to 2020.02.x, thanks.<br>
<br>
-- <br>
Bye, Peter Korsgaard<br>
<br>
<br>
------------------------------<br>
<br>
Message: 27<br>
Date: Fri, 08 May 2020 11:39:37 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: S?bastien Szymanski <<a href="mailto:sebastien.szymanski@armadeus.com" target="_blank">sebastien.szymanski@armadeus.<wbr>com</a>><br>
Cc: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: Re: [Buildroot] [PATCH 1/1] package/evtest: switch to Gitlab<br>
Message-ID: <<a href="mailto:871rnusr3a.fsf@dell.be.48ers.dk" target="_blank">871rnusr3a.fsf@dell.be.48ers.<wbr>dk</a>><br>
Content-Type: text/plain; charset=utf-8<br>
<br>
>>>>> "S?bastien" == S?bastien Szymanski <<a href="mailto:sebastien.szymanski@armadeus.com" target="_blank">sebastien.szymanski@armadeus.<wbr>com</a>> writes:<br>
<br>
> Downloading from the cgit repo is now broken and it is a mirror of the<br>
> Gitlab repo so use the Gitlab repo.<br>
<br>
> Signed-off-by: S?bastien Szymanski <<a href="mailto:sebastien.szymanski@armadeus.com" target="_blank">sebastien.szymanski@armadeus.<wbr>com</a>><br>
<br>
Committed to 2020.02.x, thanks.<br>
<br>
-- <br>
Bye, Peter Korsgaard<br>
<br>
<br>
------------------------------<br>
<br>
Message: 28<br>
Date: Fri, 8 May 2020 11:45:09 +0200<br>
From: Joachim Nilsson <<a href="mailto:troglobit@gmail.com" target="_blank">troglobit@gmail.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Cc: Joachim Nilsson <<a href="mailto:troglobit@gmail.com" target="_blank">troglobit@gmail.com</a>><br>
Subject: [Buildroot] [PATCH 1/1] configs/globalscale_espressobi<wbr>n: new<br>
defconfig<br>
Message-ID: <<a href="mailto:20200508094509.2574240-1-troglobit@gmail.com" target="_blank">20200508094509.2574240-1-trog<wbr>lobit@gmail.com</a>><br>
<br>
Basic support for the Marvell ESPRESSObin, by Globalscale Technologies.<br>
<br>
<a href="http://espressobin.net" rel="noreferrer" target="_blank">http://espressobin.net</a><br>
<br>
The kernel config has been extended with a fragment to enable switchcore<br>
support, DSA drivers, and VLAN filtering in the bridge. To make use of<br>
this you need a custom libnl based application, or the iproute2 suite<br>
rather than the brctl tools, which don't support the VLAN filtering.<br>
<br>
Signed-off-by: Joachim Nilsson <<a href="mailto:troglobit@gmail.com" target="_blank">troglobit@gmail.com</a>><br>
---<br>
.gitlab-ci.yml | 1 +<br>
DEVELOPERS | 4 +<br>
board/globalscale/<wbr>espressobin/genimage.cfg | 11 +++<br>
.../espressobin/linux-extras.<wbr>config | 14 +++<br>
board/globalscale/<wbr>espressobin/readme.txt | 90 +++++++++++++++++++<br>
configs/globalscale_espressob<wbr>in_defconfig | 26 ++++++<br>
6 files changed, 146 insertions(+)<br>
create mode 100644 board/globalscale/espressobin/<wbr>genimage.cfg<br>
create mode 100644 board/globalscale/espressobin/<wbr>linux-extras.config<br>
create mode 100644 board/globalscale/espressobin/<wbr>readme.txt<br>
create mode 100644 configs/globalscale_espressobi<wbr>n_defconfig<br>
<br>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml<br>
index fa8e077a07..071d76974a 100644<br>
--- a/.gitlab-ci.yml<br>
+++ b/.gitlab-ci.yml<br>
@@ -197,6 +197,7 @@ friendlyarm_nanopi_a64_defconf<wbr>ig: { extends: .defconfig }<br>
friendlyarm_nanopi_neo2_defco<wbr>nfig: { extends: .defconfig }<br>
friendlyarm_nanopi_neo_plus2_<wbr>defconfig: { extends: .defconfig }<br>
galileo_defconfig: { extends: .defconfig }<br>
+globalscale_espressobin_defco<wbr>nfig: { extends: .defconfig }<br>
grinn_chiliboard_defconfig: { extends: .defconfig }<br>
grinn_liteboard_defconfig: { extends: .defconfig }<br>
hifive_unleashed_defconfig: { extends: .defconfig }<br>
diff --git a/DEVELOPERS b/DEVELOPERS<br>
index e427ab15d4..e926174797 100644<br>
--- a/DEVELOPERS<br>
+++ b/DEVELOPERS<br>
@@ -1291,6 +1291,10 @@ F: package/libuhttpd/<br>
F: package/libuwsc/<br>
F: package/rtty/<br>
<br>
+N: Joachim Nilsson <<a href="mailto:troglobit@gmail.com" target="_blank">troglobit@gmail.com</a>><br>
+F: configs/globalscale_espressob<wbr>in_defconfig<br>
+F: board/globalscale/<wbr>espressobin/<br>
+<br>
N: Joao Pinto <<a href="mailto:jpinto@synopsys.com" target="_blank">jpinto@synopsys.com</a>><br>
F: board/synopsys/vdk/<br>
F: configs/snps_aarch64_vdk_defc<wbr>onfig<br>
diff --git a/board/globalscale/espressobi<wbr>n/genimage.cfg b/board/globalscale/espressobi<wbr>n/genimage.cfg<br>
new file mode 100644<br>
index 0000000000..360c8f098f<br>
--- /dev/null<br>
+++ b/board/globalscale/espressobi<wbr>n/genimage.cfg<br>
@@ -0,0 +1,11 @@<br>
+# Minimal image, no U-boot since v3/v5 cannot boot from sdcard, see<br>
+# readme.txt for details on configuring the on-board u-boot.<br>
+image sdcard.img {<br>
+ hdimage {<br>
+ }<br>
+<br>
+ partition rootfs {<br>
+ partition-type = 0x83<br>
+ image = "rootfs.ext4"<br>
+ }<br>
+}<br>
diff --git a/board/globalscale/espressobi<wbr>n/linux-extras.config b/board/globalscale/espressobi<wbr>n/linux-extras.config<br>
new file mode 100644<br>
index 0000000000..7ce0a495c1<br>
--- /dev/null<br>
+++ b/board/globalscale/espressobi<wbr>n/linux-extras.config<br>
@@ -0,0 +1,14 @@<br>
+#<br>
+# The Espressobin has a switchcore with full support in the kernel.<br>
+# This fragment enables DSA and its drivers, inclding VLAN aware bridge<br>
+# support to allow users to easily set up a LAN switch + WAN interface.<br>
+#<br>
+CONFIG_NET_DSA=m<br>
+CONFIG_VLAN_8021Q=y<br>
+<br>
+CONFIG_BRIDGE=m<br>
+CONFIG_BRIDGE_IGMP_SNOOPING=y<br>
+CONFIG_BRIDGE_VLAN_FILTERING=<wbr>y<br>
+<br>
+CONFIG_NET_DSA_MV88E6XXX=m<br>
+CONFIG_NET_DSA_MV88E6XXX_PTP=<wbr>y<br>
diff --git a/board/globalscale/espressobi<wbr>n/readme.txt b/board/globalscale/espressobi<wbr>n/readme.txt<br>
new file mode 100644<br>
index 0000000000..e519b1e1f4<br>
--- /dev/null<br>
+++ b/board/globalscale/espressobi<wbr>n/readme.txt<br>
@@ -0,0 +1,90 @@<br>
+Marvell ESPRESSObin<br>
+===================<br>
+<br>
+This default configuration allows you to quickly get up and running with<br>
+the Marvell ESPRESSObin board by Globalscale Technologies Inc.<br>
+<br>
+The ESPRESSObin is based on the Marvell Armada 88F3720 SoC, coupled with<br>
+a Marvell 88E6341 switch core "Topaz", with three exposed gigabit ports.<br>
+<br>
+ _________________________<br>
+ |# U W L L U #|<br>
+ |# S A A A S #|<br>
+ |# B N N N B #|<br>
+ |# 0 1 #|<br>
+ |# Mini #|<br>
+ |# -PCI #|<br>
+ |# #|<br>
+ |# 5 #|<br>
+ |#__V___usb_PWR_SATA__SW_#|<br>
+<br>
+ Fig 1: Overview of board<br>
+<br>
+Notice difference in Ethernet port layout compared to the Globalscale<br>
+docs. They order the ports; LAN2, LAN1, WAN (left to right in figure<br>
+above). For more information, see <a href="http://espressobin.net" rel="noreferrer" target="_blank">http://espressobin.net</a><br>
+<br>
+<br>
+Building<br>
+--------<br>
+<br>
+ $ make globalscale_espressobin_defcon<wbr>fig<br>
+ $ make<br>
+<br>
+This generates the kernel image, the devicetree binary, the rootfs as a<br>
+tar.gz, and a filesystem image containing everything.<br>
+<br>
+All build artifacts are located in `output/images/`<br>
+<br>
+<br>
+Booting<br>
+-------<br>
+<br>
+To boot, you need a UART connection, using the on-board micro USB port<br>
+set to 115200 8N1.<br>
+<br>
+By default, the ESPRESSObin comes with a pre-flashed U-Boot set up to<br>
+load the kernel, device-tree and rootfs from SPI NOR flash. The board<br>
+jumpers can be changed to boot from different sources, see the quick<br>
+start guide for each board revision for details:<br>
+<br>
+- <a href="ftp://downloads.globalscaletechnologies.com/Downloads/Espressobin/ESPRESSObin%20V5/" rel="noreferrer" target="_blank">ftp://downloads.globalscaletec<wbr>hnologies.com/Downloads/<wbr>Espressobin/ESPRESSObin%20V5/</a><br>
+- <a href="ftp://downloads.globalscaletechnologies.com/Downloads/Espressobin/ESPRESSObin%20V7/" rel="noreferrer" target="_blank">ftp://downloads.globalscaletec<wbr>hnologies.com/Downloads/<wbr>Espressobin/ESPRESSObin%20V7/</a><br>
+<br>
+Note: the v5, and earlier, cannot boot from sdcard, so you have to set<br>
+up the factory U-Boot to boot into Buildroot:<br>
+<br>
+1. Flash rootfs image to sdcard drive, your `of=` device may differ:<br>
+<br>
+ $ sudo dd if=output/images/sdcard.img of=/dev/mmcblk0 bs=1M<br>
+ $ sync<br>
+<br>
+2. Boot board from SPI NOR, interrupt boot by pressing any key ...<br>
+3. Check with `printenv` that the default setup is OK, otherwise ensure<br>
+ the following are set, and define `bootcmd` for automatic boot:<br>
+<br>
+ > setenv kernel_addr 0x5000000<br>
+ > setenv fdt_addr 0x1800000<br>
+ > setenv fdt_name boot/armada-3720-espressobin.d<wbr>tb<br>
+ > setenv console console=ttyMV0,115200 earlycon=ar3700_uart,0xd001200<wbr>0<br>
+ > setenv bootcmd 'mmc dev 0; ext4load mmc 0:1 $kernel_addr $image_name;ext4load mmc 0:1 $fdt_addr $fdt_name;setenv bootargs $console root=/dev/mmcblk0p1 rw rootwait; booti $kernel_addr - $fdt_addr'<br>
+<br>
+4. Call the boot command, or `reset` the board to start:<br>
+<br>
+ > run bootcmd<br>
+<br>
+<br>
+Networking<br>
+----------<br>
+<br>
+To enable Ethernet networking, load the `mv88e6xxx` kernel module, and<br>
+bring up each respective interface needed:<br>
+<br>
+ # modprobe mv88e6xxx<br>
+ # ifconfig wan up<br>
+<br>
+A more advanced scenario is setting up switching between the ports using<br>
+the Linux bridge. The kernel switchdev layer, and DSA driver, ensure<br>
+switch functions are "offloaded" to the HW switch, i.e., all traffic<br>
+between LAN ports never reach the CPU. For this you need the iproute2<br>
+suite of tools.<br>
diff --git a/configs/globalscale_espresso<wbr>bin_defconfig b/configs/globalscale_espresso<wbr>bin_defconfig<br>
new file mode 100644<br>
index 0000000000..c0b9f69559<br>
--- /dev/null<br>
+++ b/configs/globalscale_espresso<wbr>bin_defconfig<br>
@@ -0,0 +1,26 @@<br>
+BR2_aarch64=y<br>
+BR2_cortex_a53=y<br>
+BR2_ARM_FPU_VFPV4=y<br>
+<br>
+# Linux headers same as kernel, a 5.6 series<br>
+BR2_PACKAGE_HOST_LINUX_HEADER<wbr>S_CUSTOM_5_6=y<br>
+<br>
+# Kernel<br>
+BR2_LINUX_KERNEL=y<br>
+BR2_LINUX_KERNEL_CUSTOM_VERSI<wbr>ON=y<br>
+BR2_LINUX_KERNEL_CUSTOM_VERSI<wbr>ON_VALUE="5.6.11"<br>
+BR2_LINUX_KERNEL_USE_ARCH_DEF<wbr>AULT_CONFIG=y<br>
+BR2_LINUX_KERNEL_CONFIG_FRAGM<wbr>ENT_FILES="board/globalscale/<wbr>espressobin/linux-extras.<wbr>config"<br>
+BR2_LINUX_KERNEL_DTS_SUPPORT=<wbr>y<br>
+BR2_LINUX_KERNEL_INTREE_DTS_N<wbr>AME="marvell/armada-3720-espre<wbr>ssobin marvell/armada-3720-espressobi<wbr>n-emmc marvell/armada-3720-espressobi<wbr>n-v7 marvell/armada-3720-espressobi<wbr>n-v7-emmc"<br>
+BR2_LINUX_KERNEL_INSTALL_TARG<wbr>ET=y<br>
+<br>
+# Filesystem<br>
+BR2_TARGET_GENERIC_ISSUE="Wel<wbr>come to Buildroot for the Marvell ESPRESSObin"<br>
+BR2_TARGET_ROOTFS_EXT2=y<br>
+BR2_TARGET_ROOTFS_EXT2_4=y<br>
+BR2_TARGET_ROOTFS_EXT2_SIZE="<wbr>120M"<br>
+BR2_TARGET_ROOTFS_TAR_GZIP=y<br>
+BR2_PACKAGE_HOST_GENIMAGE=y<br>
+BR2_ROOTFS_POST_IMAGE_SCRIPT=<wbr>"support/scripts/genimage.sh"<br>
+BR2_ROOTFS_POST_SCRIPT_ARGS="<wbr>-c board/globalscale/espressobin/<wbr>genimage.cfg"<br>
-- <br>
2.25.1<br>
<br>
<br>
<br>
------------------------------<br>
<br>
Message: 29<br>
Date: Fri, 08 May 2020 11:49:07 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: Angelo Compagnucci <<a href="mailto:angelo@amarulasolutions.com" target="_blank">angelo@amarulasolutions.com</a>><br>
Cc: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: Re: [Buildroot] [PATCH] package/apache: fixing apxs path<br>
mangling<br>
Message-ID: <<a href="mailto:87wo5mrc30.fsf@dell.be.48ers.dk" target="_blank">87wo5mrc30.fsf@dell.be.48ers.<wbr>dk</a>><br>
Content-Type: text/plain<br>
<br>
>>>>> "Angelo" == Angelo Compagnucci <<a href="mailto:angelo@amarulasolutions.com" target="_blank">angelo@amarulasolutions.com</a>> writes:<br>
<br>
> Latest version of Apache introduce a new apxs with a slightly modified<br>
> path handling logic. In order to simplify the crosscompilation, the<br>
> software removes the common prefix from bin install dir and build<br>
> install dir, but for this to work they both should have a common<br>
> prefix. So we introduce a new regexp to fix /usr/bin to staging dir,<br>
> the regexps are also fixed to replace only the exact path between<br>
> double quotes.a<br>
<br>
> Fixes:<br>
> <a href="http://autobuild.buildroot.net/results/c41f31566974209897a3a1ec35afe2536fb248cc" rel="noreferrer" target="_blank">http://autobuild.buildroot.net<wbr>/results/c41f31566974209897a3a<wbr>1ec35afe2536fb248cc</a><br>
> <a href="http://autobuild.buildroot.net/results/b93f19976ce96e79ea159c25ed74a7377c78f334" rel="noreferrer" target="_blank">http://autobuild.buildroot.net<wbr>/results/b93f19976ce96e79ea159<wbr>c25ed74a7377c78f334</a><br>
<br>
> Signed-off-by: Angelo Compagnucci <<a href="mailto:angelo@amarulasolutions.com" target="_blank">angelo@amarulasolutions.com</a>><br>
<br>
Committed to 2020.02.x, thanks.<br>
<br>
-- <br>
Bye, Peter Korsgaard<br>
<br>
<br>
------------------------------<br>
<br>
Message: 30<br>
Date: Fri, 08 May 2020 11:51:09 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: Thomas Petazzoni <<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>><br>
Cc: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: Re: [Buildroot] [git commit] package/wireguard-linux-compat<wbr>:<br>
depend on headers < 5.6<br>
Message-ID: <<a href="mailto:87sggarbzm.fsf@dell.be.48ers.dk" target="_blank">87sggarbzm.fsf@dell.be.48ers.<wbr>dk</a>><br>
Content-Type: text/plain<br>
<br>
>>>>> "Thomas" == Thomas Petazzoni <<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>> writes:<br>
<br>
> commit: <a href="https://git.buildroot.net/buildroot/commit/?id=da5afc10a45d1e1b5ab7ab6f9230ed7ba44581e7" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=da5afc10a45d1<wbr>e1b5ab7ab6f9230ed7ba44581e7</a><br>
> branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/master" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>master</a><br>
<br>
> Since wireguard is built into kernels 5.6 and later we can't build<br>
> wireguard-linux-compat on them, so we need to depend on<br>
> !BR2_TOOLCHAIN_HEADERS_AT_LEAS<wbr>T_5_6.<br>
<br>
> Signed-off-by: James Hilliard <<a href="mailto:james.hilliard1@gmail.com" target="_blank">james.hilliard1@gmail.com</a>><br>
> Signed-off-by: Thomas Petazzoni <<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>><br>
<br>
Committed to 2020.02.x, thanks.<br>
<br>
-- <br>
Bye, Peter Korsgaard<br>
<br>
<br>
------------------------------<br>
<br>
Message: 31<br>
Date: Fri, 08 May 2020 11:51:42 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: Re: [Buildroot] [git commit] package/wireguard-linux-compat<wbr>:<br>
tweak kernel-headers < 5.6 logic<br>
Message-ID: <<a href="mailto:87o8qyrbyp.fsf@dell.be.48ers.dk" target="_blank">87o8qyrbyp.fsf@dell.be.48ers.<wbr>dk</a>><br>
Content-Type: text/plain<br>
<br>
>>>>> "Peter" == Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>> writes:<br>
<br>
> commit: <a href="https://git.buildroot.net/buildroot/commit/?id=74a865b1fc85352b814d032fa8725ace13f27eca" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=74a865b1fc853<wbr>52b814d032fa8725ace13f27eca</a><br>
> branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/master" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>master</a><br>
<br>
> The reason why the external wireguard kernel module is not allowed with<br>
> kernel headers >= 5.6 is that wireguard is included in the upstream kernel<br>
> since 5.6 rather than some kind of (fixable) incompatibility issue. Adjust<br>
> the comment to make that clear.<br>
<br>
> While we're at it, drop the redundant !5.6 dependency on the kernel headers<br>
> dependency comment. If headers are older than 3.10, then they are also<br>
> older than 5.6, so the statement is redundant.<br>
<br>
> Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
<br>
Committed to 2020.02.x, thanks.<br>
<br>
-- <br>
Bye, Peter Korsgaard<br>
<br>
<br>
------------------------------<br>
<br>
Message: 32<br>
Date: Fri, 08 May 2020 11:52:55 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: "Yann E. MORIN" <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
Cc: Timo Ketola <<a href="mailto:Timo.Ketola@exertus.fi" target="_blank">Timo.Ketola@exertus.fi</a>>, "buildroot\@<a href="http://buildroot.org" rel="noreferrer" target="_blank">buildroot.org</a>"<br>
<<a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a>><br>
Subject: Re: [Buildroot] [PATCH 1/1] fs/cpio: make initramfs init<br>
script survive 'console=' kernel argument<br>
Message-ID: <<a href="mailto:87k11mrbwo.fsf@dell.be.48ers.dk" target="_blank">87k11mrbwo.fsf@dell.be.48ers.<wbr>dk</a>><br>
Content-Type: text/plain<br>
<br>
>>>>> "Yann" == Yann E MORIN <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>> writes:<br>
<br>
> Timo, All,<br>
> On 2019-09-23 10:58 +0000, Timo Ketola spake thusly:<br>
>> When booting with 'console=<empty>' in the kernel command line (as e.g.<br>
>> U-Boot does with silent flags in effect), opening /dev/console fails.<br>
>> That is fatal in the /init script and kernel will panic. It is also<br>
>> needless, because the kernel tries to open it anyway (well, as long as<br>
>> we have console node in initramfs /dev; <a href="http://cpio.mk" rel="noreferrer" target="_blank">cpio.mk</a> creates that alright).<br>
>> <br>
>> Signed-off-by: Timo Ketola <<a href="mailto:timo.ketola@exertus.fi" target="_blank">timo.ketola@exertus.fi</a>><br>
<br>
> I've applied to master, after extending the commit log with all the gory<br>
> details explaininng why we can indeed safely remove those redisrections<br>
> now.<br>
<br>
> Thank you for the patience on this patch.<br>
<br>
> Thanks also to Peter for helping on IRC about this research.<br>
<br>
Committed to 2020.02.x, thanks.<br>
<br>
-- <br>
Bye, Peter Korsgaard<br>
<br>
<br>
------------------------------<br>
<br>
Message: 33<br>
Date: Fri, 8 May 2020 11:50:34 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit branch/2020.02.x]<br>
package/wireguard-linux-compat<wbr>: tweak kernel-headers < 5.6 logic<br>
Message-ID: <<a href="mailto:20200508093729.D38B491054@busybox.osuosl.org" target="_blank">20200508093729.D38B491054@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=0b3ca0be160ae5a2b1ee5da26772f02d7f130f6a" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=0b3ca0be160ae<wbr>5a2b1ee5da26772f02d7f130f6a</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.02.x" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>2020.02.x</a><br>
<br>
The reason why the external wireguard kernel module is not allowed with<br>
kernel headers >= 5.6 is that wireguard is included in the upstream kernel<br>
since 5.6 rather than some kind of (fixable) incompatibility issue. Adjust<br>
the comment to make that clear.<br>
<br>
While we're at it, drop the redundant !5.6 dependency on the kernel headers<br>
dependency comment. If headers are older than 3.10, then they are also<br>
older than 5.6, so the statement is redundant.<br>
<br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
(cherry picked from commit 74a865b1fc85352b814d032fa8725a<wbr>ce13f27eca)<br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
---<br>
package/wireguard-linux-compa<wbr>t/Config.in | 3 +--<br>
1 file changed, 1 insertion(+), 2 deletions(-)<br>
<br>
diff --git a/package/wireguard-linux-comp<wbr>at/Config.in b/package/wireguard-linux-comp<wbr>at/Config.in<br>
index 6e41a0951b..5a323a35e5 100644<br>
--- a/package/wireguard-linux-comp<wbr>at/Config.in<br>
+++ b/package/wireguard-linux-comp<wbr>at/Config.in<br>
@@ -3,7 +3,7 @@ config BR2_PACKAGE_WIREGUARD_LINUX_CO<wbr>MPAT<br>
depends on BR2_LINUX_KERNEL<br>
# kernel module requires 3.10+<br>
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST<wbr>_3_10<br>
- # kernel module incompatible with 5.6+<br>
+ # kernel module in upstream linux since 5.6<br>
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAS<wbr>T_5_6<br>
help<br>
WireGuard is an extremely simple yet fast and modern VPN<br>
@@ -23,5 +23,4 @@ config BR2_PACKAGE_WIREGUARD_LINUX_CO<wbr>MPAT<br>
<br>
comment "wireguard-linux-compat needs a toolchain w/ headers >= 3.10"<br>
depends on BR2_LINUX_KERNEL<br>
- depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAS<wbr>T_5_6<br>
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAS<wbr>T_3_10<br>
<br>
<br>
------------------------------<br>
<br>
Message: 34<br>
Date: Fri, 8 May 2020 11:41:46 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit branch/2020.02.x] package/apache:<br>
fixing apxs path mangling<br>
Message-ID: <<a href="mailto:20200508093729.B977391052@busybox.osuosl.org" target="_blank">20200508093729.B977391052@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=b9580c835b9cb36ef3264ebee82fca2c6fe4ce60" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=b9580c835b9cb<wbr>36ef3264ebee82fca2c6fe4ce60</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.02.x" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>2020.02.x</a><br>
<br>
Latest version of Apache introduce a new apxs with a slightly modified<br>
path handling logic. In order to simplify the crosscompilation, the<br>
software removes the common prefix from bin install dir and build<br>
install dir, but for this to work they both should have a common prefix.<br>
<br>
So we introduce a new regexp to fix /usr/bin to staging dir, the regexps<br>
are also fixed to replace only the exact path between double quotes, to<br>
avoid replacing the she-bang line.<br>
<br>
Fixes:<br>
<a href="http://autobuild.buildroot.net/results/c41f31566974209897a3a1ec35afe2536fb248cc" rel="noreferrer" target="_blank">http://autobuild.buildroot.net<wbr>/results/c41f31566974209897a3a<wbr>1ec35afe2536fb248cc</a><br>
<a href="http://autobuild.buildroot.net/results/b93f19976ce96e79ea159c25ed74a7377c78f334" rel="noreferrer" target="_blank">http://autobuild.buildroot.net<wbr>/results/b93f19976ce96e79ea159<wbr>c25ed74a7377c78f334</a><br>
<br>
Signed-off-by: Angelo Compagnucci <<a href="mailto:angelo@amarulasolutions.com" target="_blank">angelo@amarulasolutions.com</a>><br>
[<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>:<br>
- add the last few words about the she-bang blurb<br>
- do not use quotes in the existing /sur/bin regexp<br>
]<br>
Signed-off-by: Yann E. MORIN <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
(cherry picked from commit aa04edab77c75bc04ffb52755430bc<wbr>deb19c6d74)<br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
---<br>
package/apache/<a href="http://apache.mk" rel="noreferrer" target="_blank">apache.mk</a> | 1 +<br>
1 file changed, 1 insertion(+)<br>
<br>
diff --git a/package/apache/<a href="http://apache.mk" rel="noreferrer" target="_blank">apache.mk</a> b/package/apache/<a href="http://apache.mk" rel="noreferrer" target="_blank">apache.mk</a><br>
index 48a64eae0e..068f36e325 100644<br>
--- a/package/apache/<a href="http://apache.mk" rel="noreferrer" target="_blank">apache.mk</a><br>
+++ b/package/apache/<a href="http://apache.mk" rel="noreferrer" target="_blank">apache.mk</a><br>
@@ -99,6 +99,7 @@ APACHE_CONF_OPTS += --disable-deflate<br>
endif<br>
<br>
define APACHE_FIX_STAGING_APACHE_CONF<wbr>IG<br>
+ $(SED) 's%"/usr/bin"%"$(STAGING_DIR)/<wbr>usr/bin"%' $(STAGING_DIR)/usr/bin/apxs<br>
$(SED) 's%/usr/build%$(STAGING_DIR)/u<wbr>sr/build%' $(STAGING_DIR)/usr/bin/apxs<br>
$(SED) 's%^prefix =.*%prefix = $(STAGING_DIR)/usr%' $(STAGING_DIR)/usr/build/<a href="http://config_vars.mk" rel="noreferrer" target="_blank">confi<wbr>g_vars.mk</a><br>
endef<br>
<br>
<br>
------------------------------<br>
<br>
Message: 35<br>
Date: Fri, 8 May 2020 11:50:29 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit branch/2020.02.x]<br>
package/wireguard-linux-compat<wbr>: depend on headers < 5.6<br>
Message-ID: <<a href="mailto:20200508093729.C96C391052@busybox.osuosl.org" target="_blank">20200508093729.C96C391052@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=50f63e027172070358a1af5ec08a1b9d880ac767" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=50f63e0271720<wbr>70358a1af5ec08a1b9d880ac767</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.02.x" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>2020.02.x</a><br>
<br>
Since wireguard is built into kernels 5.6 and later we can't build<br>
wireguard-linux-compat on them, so we need to depend on<br>
!BR2_TOOLCHAIN_HEADERS_AT_LEAS<wbr>T_5_6.<br>
<br>
Signed-off-by: James Hilliard <<a href="mailto:james.hilliard1@gmail.com" target="_blank">james.hilliard1@gmail.com</a>><br>
Signed-off-by: Thomas Petazzoni <<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>><br>
(cherry picked from commit da5afc10a45d1e1b5ab7ab6f9230ed<wbr>7ba44581e7)<br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
---<br>
package/wireguard-linux-compa<wbr>t/Config.in | 6 +++++-<br>
1 file changed, 5 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/package/wireguard-linux-comp<wbr>at/Config.in b/package/wireguard-linux-comp<wbr>at/Config.in<br>
index 4ee214be63..6e41a0951b 100644<br>
--- a/package/wireguard-linux-comp<wbr>at/Config.in<br>
+++ b/package/wireguard-linux-comp<wbr>at/Config.in<br>
@@ -3,6 +3,8 @@ config BR2_PACKAGE_WIREGUARD_LINUX_CO<wbr>MPAT<br>
depends on BR2_LINUX_KERNEL<br>
# kernel module requires 3.10+<br>
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST<wbr>_3_10<br>
+ # kernel module incompatible with 5.6+<br>
+ depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAS<wbr>T_5_6<br>
help<br>
WireGuard is an extremely simple yet fast and modern VPN<br>
that utilizes state-of-the-art cryptography. It aims to be<br>
@@ -20,4 +22,6 @@ config BR2_PACKAGE_WIREGUARD_LINUX_CO<wbr>MPAT<br>
<a href="https://www.wireguard.com" rel="noreferrer" target="_blank">https://www.wireguard.com</a><br>
<br>
comment "wireguard-linux-compat needs a toolchain w/ headers >= 3.10"<br>
- depends on BR2_LINUX_KERNEL && !BR2_TOOLCHAIN_HEADERS_AT_LEAS<wbr>T_3_10<br>
+ depends on BR2_LINUX_KERNEL<br>
+ depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAS<wbr>T_5_6<br>
+ depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAS<wbr>T_3_10<br>
<br>
<br>
------------------------------<br>
<br>
Message: 36<br>
Date: Fri, 8 May 2020 11:37:44 +0200<br>
From: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
To: <a href="mailto:buildroot@buildroot.org" target="_blank">buildroot@buildroot.org</a><br>
Subject: [Buildroot] [git commit branch/2020.02.x] package/binutils:<br>
fix XTENSA_NDIFF handling for PR ld/25861<br>
Message-ID: <<a href="mailto:20200508093729.9AE7B90FE2@busybox.osuosl.org" target="_blank">20200508093729.9AE7B90FE2@bus<wbr>ybox.osuosl.org</a>><br>
<br>
commit: <a href="https://git.buildroot.net/buildroot/commit/?id=05e9d76c1271628abd138227f9063c5942e720ba" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=05e9d76c12716<wbr>28abd138227f9063c5942e720ba</a><br>
branch: <a href="https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.02.x" rel="noreferrer" target="_blank">https://git.buildroot.net/buil<wbr>droot/commit/?id=refs/heads/<wbr>2020.02.x</a><br>
<br>
Fix for xtensa PR ld/25861 introduced a regression in handling negative<br>
symbol differences resulting in linker performing incorrect relaxation<br>
or failing to link. Fix XTENSA_NDIFF relocation handling.<br>
<br>
Backported from:<br>
<a href="https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=d548f47df4d2e3d117d504a4c9977982c78a0556" rel="noreferrer" target="_blank">https://sourceware.org/git/git<wbr>web.cgi?p=binutils-gdb.git;a=<wbr>commitdiff;h=d548f47df4d2e3d11<wbr>7d504a4c9977982c78a0556</a><br>
<br>
Fixes: f0291ef4aba0 ("package/binutils: fix xtensa PR ld/25861")<br>
Signed-off-by: Max Filippov <<a href="mailto:jcmvbkbc@gmail.com" target="_blank">jcmvbkbc@gmail.com</a>><br>
Tested-by: Romain Naour <<a href="mailto:romain.naour@gmail.com" target="_blank">romain.naour@gmail.com</a>><br>
Signed-off-by: Yann E. MORIN <<a href="mailto:yann.morin.1998@free.fr" target="_blank">yann.morin.1998@free.fr</a>><br>
(cherry picked from commit f31db17a8d3accc7367e262c326f46<wbr>7f7dc879a2)<br>
Signed-off-by: Peter Korsgaard <<a href="mailto:peter@korsgaard.com" target="_blank">peter@korsgaard.com</a>><br>
---<br>
...fix-XTENSA_NDIFF-handling-<wbr>for-PR-ld-25861.patch | 128 +++++++++++++++++++++<br>
...fix-XTENSA_NDIFF-handling-<wbr>for-PR-ld-25861.patch | 128 +++++++++++++++++++++<br>
...fix-XTENSA_NDIFF-handling-<wbr>for-PR-ld-25861.patch | 128 +++++++++++++++++++++<br>
3 files changed, 384 insertions(+)<br>
<br>
diff --git a/package/binutils/2.31.1/0020<wbr>-xtensa-fix-XTENSA_NDIFF-handl<wbr>ing-for-PR-ld-25861.patch b/package/binutils/2.31.1/0020<wbr>-xtensa-fix-XTENSA_NDIFF-handl<wbr>ing-for-PR-ld-25861.patch<br>
new file mode 100644<br>
index 0000000000..28f17d7c56<br>
--- /dev/null<br>
+++ b/package/binutils/2.31.1/0020<wbr>-xtensa-fix-XTENSA_NDIFF-handl<wbr>ing-for-PR-ld-25861.patch<br>
@@ -0,0 +1,128 @@<br>
+From 735321812435ae278d3766a3371f55<wbr>937dc776d6 Mon Sep 17 00:00:00 2001<br>
+From: Max Filippov <<a href="mailto:jcmvbkbc@gmail.com" target="_blank">jcmvbkbc@gmail.com</a>><br>
+Date: Sat, 25 Apr 2020 00:40:25 -0700<br>
+Subject: [PATCH] xtensa: fix XTENSA_NDIFF handling for PR ld/25861<br>
+<br>
+Fields marked with XTENSA_NDIFF relocations are not negated, they only<br>
+have sign bits removed. Don't negate their values when relaxation is<br>
+performed. Don't add sign bits when the value is zero. Report overflow<br>
+when the result has negative sign but all significant bits are zero.<br>
+<br>
+2020-04-29 Max Filippov <<a href="mailto:jcmvbkbc@gmail.com" target="_blank">jcmvbkbc@gmail.com</a>><br>
+bfd/<br>
+ * elf32-xtensa.c (relax_section): Don't negate diff_value for<br>
+ XTENSA_NDIFF relocations. Don't add sign bits whe diff_value<br>
+ equals 0. Report overflow when the result has negative sign but<br>
+ all significant bits are zero.<br>
+<br>
+Signed-off-by: Max Filippov <<a href="mailto:jcmvbkbc@gmail.com" target="_blank">jcmvbkbc@gmail.com</a>><br>
+Backported from: d548f47df4d2e3d117d504a4c99779<wbr>82c78a0556<br>
+---<br>
+<br>
+ bfd/elf32-xtensa.c | 26 +++++++++++++++-----------<br>
+ 1 file changed, 15 insertions(+), 11 deletions(-)<br>
+<br>
+diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c<br>
+index fded42d52a9a..4327b027911f 100644<br>
+--- a/bfd/elf32-xtensa.c<br>
++++ b/bfd/elf32-xtensa.c<br>
+@@ -9670,37 +9670,44 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)<br>
+ switch (r_type)<br>
+ {<br>
+ case R_XTENSA_DIFF8:<br>
++ diff_mask = 0x7f;<br>
+ diff_value =<br>
+ bfd_get_signed_8 (abfd, &contents[old_source_offset]);<br>
+ break;<br>
+ case R_XTENSA_DIFF16:<br>
++ diff_mask = 0x7fff;<br>
+ diff_value =<br>
+ bfd_get_signed_16 (abfd, &contents[old_source_offset]);<br>
+ break;<br>
+ case R_XTENSA_DIFF32:<br>
++ diff_mask = 0x7fffffff;<br>
+ diff_value =<br>
+ bfd_get_signed_32 (abfd, &contents[old_source_offset]);<br>
+ break;<br>
+ case R_XTENSA_PDIFF8:<br>
+ case R_XTENSA_NDIFF8:<br>
++ diff_mask = 0xff;<br>
+ diff_value =<br>
+ bfd_get_8 (abfd, &contents[old_source_offset]);<br>
+ break;<br>
+ case R_XTENSA_PDIFF16:<br>
+ case R_XTENSA_NDIFF16:<br>
++ diff_mask = 0xffff;<br>
+ diff_value =<br>
+ bfd_get_16 (abfd, &contents[old_source_offset]);<br>
+ break;<br>
+ case R_XTENSA_PDIFF32:<br>
+ case R_XTENSA_NDIFF32:<br>
++ diff_mask = 0xffffffff;<br>
+ diff_value =<br>
+ bfd_get_32 (abfd, &contents[old_source_offset]);<br>
+ break;<br>
+ }<br>
+ <br>
+ if (r_type >= R_XTENSA_NDIFF8<br>
+- && r_type <= R_XTENSA_NDIFF32)<br>
+- diff_value = -diff_value;<br>
++ && r_type <= R_XTENSA_NDIFF32<br>
++ && diff_value)<br>
++ diff_value |= ~diff_mask;<br>
+ <br>
+ new_end_offset = offset_with_removed_text_map<br>
+ (&target_relax_info->action_l<wbr>ist,<br>
+@@ -9710,43 +9717,40 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)<br>
+ switch (r_type)<br>
+ {<br>
+ case R_XTENSA_DIFF8:<br>
+- diff_mask = 0x7f;<br>
+ bfd_put_signed_8 (abfd, diff_value,<br>
+ &contents[old_source_offset]);<br>
+ break;<br>
+ case R_XTENSA_DIFF16:<br>
+- diff_mask = 0x7fff;<br>
+ bfd_put_signed_16 (abfd, diff_value,<br>
+ &contents[old_source_offset])<wbr>;<br>
+ break;<br>
+ case R_XTENSA_DIFF32:<br>
+- diff_mask = 0x7fffffff;<br>
+ bfd_put_signed_32 (abfd, diff_value,<br>
+ &contents[old_source_offset])<wbr>;<br>
+ break;<br>
+ case R_XTENSA_PDIFF8:<br>
+ case R_XTENSA_NDIFF8:<br>
+- diff_mask = 0xff;<br>
+ bfd_put_8 (abfd, diff_value,<br>
+ &contents[old_source_offset]);<br>
+ break;<br>
+ case R_XTENSA_PDIFF16:<br>
+ case R_XTENSA_NDIFF16:<br>
+- diff_mask = 0xffff;<br>
+ bfd_put_16 (abfd, diff_value,<br>
+ &contents[old_source_offset])<wbr>;<br>
+ break;<br>
+ case R_XTENSA_PDIFF32:<br>
+ case R_XTENSA_NDIFF32:<br>
+- diff_mask = 0xffffffff;<br>
+ bfd_put_32 (abfd, diff_value,<br>
+ &contents[old_source_offset])<wbr>;<br>
+ break;<br>
+ }<br>
+ <br>
+- /* Check for overflow. Sign bits must be all zeroes or all ones */<br>
+- if ((diff_value & ~diff_mask) != 0 &&<br>
+- (diff_value & ~diff_mask) != (-1 & ~diff_mask))<br>
++ /* Check for overflow. Sign bits must be all zeroes or<br>
++ all ones. When sign bits are all ones diff_value<br>
++ may not be zero. */<br>
++ if (((diff_value & ~diff_mask) != 0<br>
++ && (diff_value & ~diff_mask) != ~diff_mask)<br>
++ || (diff_value && (bfd_vma) diff_value == ~diff_mask))<br>
+ {<br>
+ (*link_info->callbacks-><wbr>reloc_dangerous)<br>
+ (link_info, _("overflow after relaxation"),<br>
+-- <br>
+2.20.1<br>
+<br>
diff --git a/package/binutils/2.32/0009-x<wbr>tensa-fix-XTENSA_NDIFF-handlin<wbr>g-for-PR-ld-25861.patch b/package/binutils/2.32/0009-x<wbr>tensa-fix-XTENSA_NDIFF-handlin<wbr>g-for-PR-ld-25861.patch<br>
new file mode 100644<br>
index 0000000000..28f17d7c56<br>
--- /dev/null<br>
+++ b/package/binutils/2.32/0009-x<wbr>tensa-fix-XTENSA_NDIFF-handlin<wbr>g-for-PR-ld-25861.patch<br>
@@ -0,0 +1,128 @@<br>
+From 735321812435ae278d3766a3371f55<wbr>937dc776d6 Mon Sep 17 00:00:00 2001<br>
+From: Max Filippov <<a href="mailto:jcmvbkbc@gmail.com" target="_blank">jcmvbkbc@gmail.com</a>><br>
+Date: Sat, 25 Apr 2020 00:40:25 -0700<br>
+Subject: [PATCH] xtensa: fix XTENSA_NDIFF handling for PR ld/25861<br>
+<br>
+Fields marked with XTENSA_NDIFF relocations are not negated, they only<br>
+have sign bits removed. Don't negate their values when relaxation is<br>
+performed. Don't add sign bits when the value is zero. Report overflow<br>
+when the result has negative sign but all significant bits are zero.<br>
+<br>
+2020-04-29 Max Filippov <<a href="mailto:jcmvbkbc@gmail.com" target="_blank">jcmvbkbc@gmail.com</a>><br>
+bfd/<br>
+ * elf32-xtensa.c (relax_section): Don't negate diff_value for<br>
+ XTENSA_NDIFF relocations. Don't add sign bits whe diff_value<br>
+ equals 0. Report overflow when the result has negative sign but<br>
+ all significant bits are zero.<br>
+<br>
+Signed-off-by: Max Filippov <<a href="mailto:jcmvbkbc@gmail.com" target="_blank">jcmvbkbc@gmail.com</a>><br>
+Backported from: d548f47df4d2e3d117d504a4c99779<wbr>82c78a0556<br>
+---<br>
+<br>
+ bfd/elf32-xtensa.c | 26 +++++++++++++++-----------<br>
+ 1 file changed, 15 insertions(+), 11 deletions(-)<br>
+<br>
+diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c<br>
+index fded42d52a9a..4327b027911f 100644<br>
+--- a/bfd/elf32-xtensa.c<br>
++++ b/bfd/elf32-xtensa.c<br>
+@@ -9670,37 +9670,44 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)<br>
+ switch (r_type)<br>
+ {<br>
+ case R_XTENSA_DIFF8:<br>
++ diff_mask = 0x7f;<br>
+ diff_value =<br>
+ bfd_get_signed_8 (abfd, &contents[old_source_offset]);<br>
+ break;<br>
+ case R_XTENSA_DIFF16:<br>
++ diff_mask = 0x7fff;<br>
+ diff_value =<br>
+ bfd_get_signed_16 (abfd, &contents[old_source_offset]);<br>
+ break;<br>
+ case R_XTENSA_DIFF32:<br>
++ diff_mask = 0x7fffffff;<br>
+ diff_value =<br>
+ bfd_get_signed_32 (abfd, &contents[old_source_offset]);<br>
+ break;<br>
...</blockquote></div><br></div></div></div>