From 8cb2805f184e6c92f8a5759ac99a868e36143ba6 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Fri, 10 Jul 2020 18:49:04 -0400
Subject: changelog: New upstream version

---
diff --git a/changelog b/changelog
index 9bf1154..8268934 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+opkbuild (4.2.0-1) trunk
+
+  * New upstream version.
+    - Drop patch from upstream.
+
+ -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Fri, 10 Jul 2020 18:48:40 -0400
+
 opkbuild (4.1.4-1) trunk
 
   * New upstream version.
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
deleted file mode 100644
index df1135e..0000000
--- a/patches/0001-ob-buildopk-Really-check-for-BB-tar-reverse-ordering.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
--
cgit v0.9.1