From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
To: <openembedded-core@lists.openembedded.org>
Subject: [PATCH 2/2] opkg-utils: upgrade to version 0.3.6
Date: Thu, 22 Feb 2018 13:57:36 -0600 [thread overview]
Message-ID: <20180222195736.21391-3-alejandro.delcastillo@ni.com> (raw)
In-Reply-To: <20180222195736.21391-1-alejandro.delcastillo@ni.com>
0.3.5 -> 0.3.6
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
---
.../recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch | 8 ++++----
.../opkg-utils/{opkg-utils_0.3.5.bb => opkg-utils_0.3.6.bb} | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
rename meta/recipes-devtools/opkg-utils/{opkg-utils_0.3.5.bb => opkg-utils_0.3.6.bb} (94%)
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
index 75c6f3b8de..99c0883e17 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
@@ -25,19 +25,19 @@ Index: git/opkg-build
mkdir $tmp_dir
echo $CONTROL > $tmp_dir/tarX
--( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -c --$compressor $tarformat -f $tmp_dir/data.tar.$cext . )
--( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . )
+-( cd $pkg_dir && tar $ogargs --sort=name --mtime=$build_date -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
+-( cd $pkg_dir/$CONTROL && tar $ogargs --sort=name --mtime=$build_date -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz )
+
+
+# Ignore error code 1, caused by modifying the number of hard links while creating the tar file
+rc=0
-+( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -c --$compressor $tarformat -f $tmp_dir/data.tar.$cext . ) || rc=$?
++( cd $pkg_dir && tar $ogargs --sort=name --mtime=$build_date -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) || rc=$?
+if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then
+ exit $rc
+fi
+
+rc=0
-+( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . ) || rc=$?
++( cd $pkg_dir/$CONTROL && tar $ogargs --sort=name --mtime=$build_date -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz ) || rc=$?
+if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then
+ exit $rc
+fi
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb
similarity index 94%
rename from meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb
rename to meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb
index e9ba9de094..0c21142b6d 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.5.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb
@@ -14,8 +14,8 @@ SRC_URI_append_class-native = " file://tar_ignore_error.patch"
UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/"
-SRC_URI[md5sum] = "a19e09c79bf1152aac62e8a120d679ff"
-SRC_URI[sha256sum] = "7f4b08912e26a3f4f6f423f3b4e7157a73b1f3a7483fc59b216d1a80b50b0c38"
+SRC_URI[md5sum] = "391c1c80aca26961375dd22e1d2d0cbf"
+SRC_URI[sha256sum] = "26b3f4dd1c1ef65f519d4cddfb35ebea41ae8af989aea2699a39783598c33769"
TARGET_CC_ARCH += "${LDFLAGS}"
--
2.16.1
next prev parent reply other threads:[~2018-02-22 19:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-22 19:57 [PATCH 0/2] opkg & opkg-utils upgrade to 0.3.6 Alejandro del Castillo
2018-02-22 19:57 ` [PATCH 1/2] opkg: upgrade to version 0.3.6 Alejandro del Castillo
2018-02-22 19:57 ` Alejandro del Castillo [this message]
2018-02-28 20:36 ` [PATCH v2] opkg-utils: " Alejandro del Castillo
2018-03-01 0:03 ` [PATCH v3] " Alejandro del Castillo
2018-02-28 21:05 ` ✗ patchtest: failure for opkg & opkg-utils upgrade to 0.3.6 (rev2) Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180222195736.21391-3-alejandro.delcastillo@ni.com \
--to=alejandro.delcastillo@ni.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.