Skip to contentSkip to conversation

libnspr: fix nios2 and microblaze support patches

PATCH New Baruch Siach 2 participants 3 messages Nov 13, 2018 – Nov 25, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libnspr: fix nios2 and microblaze support patches

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 <[email protected]>
---
 package/libnspr/0001-nios2.patch      | 6 +++---
 package/libnspr/0002-microblaze.patch | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
package/libnspr/0001-nios2.patch +3 -3
index c08fbb272b91..2a967c4593c9 100644
@@ -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__)
 +
package/libnspr/0002-microblaze.patch +1 -1
index 46a44852776e..4c23259d58c6 100644
@@ -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
  
Signature · 1 line
2.19.1
#1 lore raw

PATCH 1/1 libnspr: fix nios2 and microblaze support patches

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> 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.

Quoted 5 lines

Fixes:
http://autobuild.buildroot.net/results/2d1/2d1288e98a6459d84c2599c99b5617a2fde81f62/

Cc Fabrice Fontaine <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 libnspr: fix nios2 and microblaze support patches

In reply to Baruch Siach
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> 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.

Quoted 5 lines

Fixes:
http://autobuild.buildroot.net/results/2d1/2d1288e98a6459d84c2599c99b5617a2fde81f62/

Cc Fabrice Fontaine <[email protected]>

Committed to 2018.02.x and 2018.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard