summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-07-10 19:56:52 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-07-10 19:56:52 (EDT)
commit69625e2ca493e7d0fd0ace8f713911835ff2d528 (patch)
tree6f23cfeb21233fd5b1b18b5baf342998cee46926
parentfd78e21c90039a9053d32562eadaa801f8f70b89 (diff)
patches: Build with BusyBox < 1.22.0
-rw-r--r--changelog1
-rw-r--r--patches/03_use-non-posix-sed-r.patch17
2 files changed, 18 insertions, 0 deletions
diff --git a/changelog b/changelog
index d3e909d..c808565 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,7 @@ linux-libre-4.19 (4.19.56+gnu-1) trunk
* New upstream version.
- Drop patches/01_no-bash.patch, issue fixed upstream.
+ - Add patch to build with BusyBox < 1.22.0.
- New build dependencies: bison, flex.
* Update Maintainer and Homepage.
* Regenerate M+ fonts from M+ version 063a using otf2bdf and bdf2fbcon and
diff --git a/patches/03_use-non-posix-sed-r.patch b/patches/03_use-non-posix-sed-r.patch
new file mode 100644
index 0000000..02c2e82
--- /dev/null
+++ b/patches/03_use-non-posix-sed-r.patch
@@ -0,0 +1,17 @@
+Author: Patrick McDermott <patrick.mcdermott@libiquity.com>
+Subject: Use non-POSIX sed -r
+
+BusyBox didn't support the POSIX -E option until version 1.22.0.
+
+diff -Naurp src.orig/scripts/headers_install.sh src/scripts/headers_install.sh
+--- src.orig/scripts/headers_install.sh 2019-06-24 23:36:02.000000000 -0400
++++ src/scripts/headers_install.sh 2019-07-10 19:52:42.152146074 -0400
+@@ -31,7 +31,7 @@ trap 'rm -f "$OUTDIR/$FILE" "$OUTDIR/$FI
+ for i in "$@"
+ do
+ FILE="$(basename "$i")"
+- sed -E \
++ sed -r \
+ -e 's/([[:space:](])(__user|__force|__iomem)[[:space:]]/\1/g' \
+ -e 's/__attribute_const__([[:space:]]|$)/\1/g' \
+ -e 's@^#include <linux/compiler(|_types).h>@@' \