* [Buildroot] [PATCH] libnspr: fix nios2 and microblaze support patches
@ 2018-11-13 7:43 Baruch Siach
2018-11-13 8:16 ` Peter Korsgaard
2018-11-25 22:44 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Baruch Siach @ 2018-11-13 7:43 UTC (permalink / raw)
To: buildroot
Commit c9e3d5b6c57 (libnspr: bump to version 4.20) did not refresh the
hunks touching the _linux.cfg file. As a result, these hunk were applied
to the wrong (x86 specific) place in that file, rendering them
ineffective. Refresh the patches to fix that.
Fixes:
http://autobuild.buildroot.net/results/2d1/2d1288e98a6459d84c2599c99b5617a2fde81f62/
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/libnspr/0001-nios2.patch | 6 +++---
package/libnspr/0002-microblaze.patch | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/libnspr/0001-nios2.patch b/package/libnspr/0001-nios2.patch
index c08fbb272b91..2a967c4593c9 100644
--- a/package/libnspr/0001-nios2.patch
+++ b/package/libnspr/0001-nios2.patch
@@ -9,9 +9,9 @@ Index: b/nspr/pr/include/md/_linux.cfg
===================================================================
--- a/nspr/pr/include/md/_linux.cfg
+++ b/nspr/pr/include/md/_linux.cfg
-@@ -1017,6 +1017,51 @@
- #define PR_BYTES_PER_WORD_LOG2 2
- #define PR_BYTES_PER_DWORD_LOG2 3
+@@ -1112,6 +1112,51 @@
+ #define PR_BYTES_PER_WORD_LOG2 3
+ #define PR_BYTES_PER_DWORD_LOG2 3
+#elif defined(__nios2__)
+
diff --git a/package/libnspr/0002-microblaze.patch b/package/libnspr/0002-microblaze.patch
index 46a44852776e..4c23259d58c6 100644
--- a/package/libnspr/0002-microblaze.patch
+++ b/package/libnspr/0002-microblaze.patch
@@ -9,7 +9,7 @@ Index: b/nspr/pr/include/md/_linux.cfg
===================================================================
--- a/nspr/pr/include/md/_linux.cfg
+++ b/nspr/pr/include/md/_linux.cfg
-@@ -1062,6 +1062,56 @@
+@@ -1157,6 +1157,56 @@
#define PR_BYTES_PER_WORD_LOG2 2
#define PR_BYTES_PER_DWORD_LOG2 3
--
2.19.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] libnspr: fix nios2 and microblaze support patches
2018-11-13 7:43 [Buildroot] [PATCH] libnspr: fix nios2 and microblaze support patches Baruch Siach
@ 2018-11-13 8:16 ` Peter Korsgaard
2018-11-25 22:44 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2018-11-13 8:16 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> Commit c9e3d5b6c57 (libnspr: bump to version 4.20) did not refresh the
> hunks touching the _linux.cfg file. As a result, these hunk were applied
> to the wrong (x86 specific) place in that file, rendering them
> ineffective. Refresh the patches to fix that.
> Fixes:
> http://autobuild.buildroot.net/results/2d1/2d1288e98a6459d84c2599c99b5617a2fde81f62/
> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] libnspr: fix nios2 and microblaze support patches
2018-11-13 7:43 [Buildroot] [PATCH] libnspr: fix nios2 and microblaze support patches Baruch Siach
2018-11-13 8:16 ` Peter Korsgaard
@ 2018-11-25 22:44 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2018-11-25 22:44 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> Commit c9e3d5b6c57 (libnspr: bump to version 4.20) did not refresh the
> hunks touching the _linux.cfg file. As a result, these hunk were applied
> to the wrong (x86 specific) place in that file, rendering them
> ineffective. Refresh the patches to fix that.
> Fixes:
> http://autobuild.buildroot.net/results/2d1/2d1288e98a6459d84c2599c99b5617a2fde81f62/
> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Committed to 2018.02.x and 2018.08.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-11-25 22:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-13 7:43 [Buildroot] [PATCH] libnspr: fix nios2 and microblaze support patches Baruch Siach
2018-11-13 8:16 ` Peter Korsgaard
2018-11-25 22:44 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.