summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlejandro del Castillo <alejandro.delcastillo@ni.com>2019-06-13 15:17:01 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-14 22:48:22 +0100
commit9d9163d36f7830f7ddc5923d3a7cf3a9f1f47983 (patch)
tree5a3116cebd36b0b9af29014bf8701c9effc94eeb /meta/recipes-devtools
parentd9b0adbce87293be1fa2db39c3b09076477e9990 (diff)
downloadpoky-9d9163d36f7830f7ddc5923d3a7cf3a9f1f47983.tar.gz
opkg-utils: upgrade to version 0.4.1
- Drop 0001-opkg-build-do-not-set-mtime-on-data.tar.X.patch - Drop 0001-opkg-list-fields-fix-to-print-the-fields-again.patch (From OE-Core rev: 76a7f0d60f5dc38da15f21720cb97bf761562b44) Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-do-not-set-mtime-on-data.tar.X.patch33
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-list-fields-fix-to-print-the-fields-again.patch41
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb (renamed from meta/recipes-devtools/opkg-utils/opkg-utils_0.4.0.bb)6
3 files changed, 2 insertions, 78 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-do-not-set-mtime-on-data.tar.X.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-do-not-set-mtime-on-data.tar.X.patch
deleted file mode 100644
index 6c058c71d7..0000000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-do-not-set-mtime-on-data.tar.X.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 42afc1f652d28dce3c5b9915d0cd3087a144e445 Mon Sep 17 00:00:00 2001
2From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
3Date: Mon, 18 Feb 2019 11:25:43 -0600
4Subject: [PATCH] opkg-build: do not set mtime on data.tar.X
5
6Opkg should make sure the binaries it creates are created in a
7repoducibe way, but it shouldn't modify the mtime of the binaries it
8consumes. Doing so has side effects, for exmaple, Python pyc files are
9invalidated.
10
11Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
12
13Upstream-Status: Submitted
14---
15 opkg-build | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/opkg-build b/opkg-build
19index 13782ee..363cd01 100755
20--- a/opkg-build
21+++ b/opkg-build
22@@ -301,7 +301,7 @@ build_date="${SOURCE_DATE_EPOCH:-$(date +%s)}"
23
24 ( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list )
25 ( cd $pkg_dir && find . -path ./$CONTROL -prune -o -print > $tmp_dir/file_list )
26-( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
27+( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
28 ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz )
29 rm $tmp_dir/file_list
30 rm $tmp_dir/control_list
31--
322.20.1
33
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-list-fields-fix-to-print-the-fields-again.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-list-fields-fix-to-print-the-fields-again.patch
deleted file mode 100644
index deaf561d1e..0000000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-list-fields-fix-to-print-the-fields-again.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From df675c91f4b33490f0fa831b11162bdb0e2ff550 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 23 May 2019 20:50:45 +0000
4Subject: [PATCH] opkg-list-fields: fix to print the fields again
5
6* printing opkg.Package directly doesn't return anything useful now
7 <opkg.Package object at 0x7fd49e9f2780>
8
9* we need to call Package.print() function and specify which checksums
10 to print, we can include both md5 and sha256 for opkg-list-fields
11
12* it was changed in this commit:
13 commit 601d691dd80ef494aef069017edc5bf80aa883a1
14 Author: Alejandro del Castillo <alejandro.delcastillo@ni.com>
15 Date: Wed Dec 19 11:40:15 2018 -0600
16
17 opkg-make-index: add sha256sum support
18
19 which replaced the modified __str__ function with print(self, checksum)
20
21Upstream-Status: Backport [http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/commit/?id=5163a74a59d54b2a8374414435ece9d542dbd5e2]
22
23Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
24---
25 opkg-list-fields | 3 +--
26 1 file changed, 1 insertion(+), 2 deletions(-)
27
28diff --git a/opkg-list-fields b/opkg-list-fields
29index c14a90f..8a5a588 100755
30--- a/opkg-list-fields
31+++ b/opkg-list-fields
32@@ -11,5 +11,4 @@ def usage():
33 if (len(sys.argv) < 2):
34 usage()
35
36-print(opkg.Package(sys.argv[1]))
37-
38+print(opkg.Package(sys.argv[1]).print(('md5','sha256')))
39--
402.17.1
41
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.0.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb
index b2fb760267..4be7b16d8a 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.0.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb
@@ -9,14 +9,12 @@ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtu
9 9
10SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ 10SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \
11 file://0001-Switch-all-scripts-to-use-Python-3.x.patch \ 11 file://0001-Switch-all-scripts-to-use-Python-3.x.patch \
12 file://0001-opkg-build-do-not-set-mtime-on-data.tar.X.patch \
13 file://0001-opkg-list-fields-fix-to-print-the-fields-again.patch \
14" 12"
15UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" 13UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/"
16 14
17 15
18SRC_URI[md5sum] = "6e1c2eae96239520a8eb3d05372773ea" 16SRC_URI[md5sum] = "8c140f835b694a0c27cfb23d2426a02b"
19SRC_URI[sha256sum] = "8153f4e5dadde422d35feaf86bf595266af9d0037389bc418fa87feb0437efb3" 17SRC_URI[sha256sum] = "9ea9efdd9fe13661ad251e3a2860c1c93045adcfaa6659c3e86d9748ecda3b6e"
20 18
21TARGET_CC_ARCH += "${LDFLAGS}" 19TARGET_CC_ARCH += "${LDFLAGS}"
22 20