summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--changelog2
-rw-r--r--patches/0001-ob-buildopk-Really-check-for-BB-tar-reverse-ordering.patch25
2 files changed, 27 insertions, 0 deletions
diff --git a/changelog b/changelog
index 0c7cbe6..13ea50d 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ opkbuild (4.1.4-1) trunk
* New upstream version.
* Build with opkbuild 4.1.4 to fix packages broken by a bug in busybox
(<< 1.22.0) exposed by opkbuild 4.1.0.
+ * Apply patch from upstream to fix ob-buildopk's detection of the BusyBox
+ tar reverse ordering bug.
-- Patrick McDermott <patrick.mcdermott@libiquity.com> Sun, 04 Aug 2019 16:10:53 -0400
diff --git a/patches/0001-ob-buildopk-Really-check-for-BB-tar-reverse-ordering.patch b/patches/0001-ob-buildopk-Really-check-for-BB-tar-reverse-ordering.patch
new file mode 100644
index 0000000..df1135e
--- /dev/null
+++ b/patches/0001-ob-buildopk-Really-check-for-BB-tar-reverse-ordering.patch
@@ -0,0 +1,25 @@
+From bc7912ee552446471dadc49893b1a821f1acb1c4 Mon Sep 17 00:00:00 2001
+From: Patrick McDermott <patrick.mcdermott@libiquity.com>
+Date: Sun, 4 Aug 2019 21:11:30 -0400
+Subject: [PATCH] ob-buildopk: Really check for BB tar reverse ordering bug
+
+---
+ src/ob-buildopk.sh | 2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ob-buildopk.sh b/src/ob-buildopk.sh
+index 598419f..b781abb 100644
+--- a/src/ob-buildopk.sh
++++ b/src/ob-buildopk.sh
+@@ -57,7 +57,7 @@ build_opk()
+ # order.
+ touch '.opkbuild/a' '.opkbuild/b'
+ if [ x"$(printf '.opkbuild/a\n.opkbuild/b\n' | ${TAR} -c -T - | \
+- ${TAR} -t | head -n 1)" = x'b' ]; then
++ ${TAR} -t | head -n 1)" = x'.opkbuild/b' ]; then
+ sort_r='-r'
+ else
+ sort_r=''
+--
+2.11.0
+