diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2019-06-04 18:48:41 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-06 00:40:07 +0100 |
commit | 6832cd497b95f6cc043abf00fc39d27073531cdf (patch) | |
tree | 5f7d68cc771e43f83283b31eceacf5abca7ce5de /meta | |
parent | 5afd85f1d51c1b5ae14b9e7e82e1755804971f8c (diff) | |
download | poky-6832cd497b95f6cc043abf00fc39d27073531cdf.tar.gz |
opkg-utils: fix opkg-list-fields script
(From OE-Core rev: 95c557761de6a89cc31f5a5910be3fced5259de6)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-list-fields-fix-to-print-the-fields-again.patch | 41 | ||||
-rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils_0.4.0.bb | 1 |
2 files changed, 42 insertions, 0 deletions
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 new file mode 100644 index 0000000000..deaf561d1e --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-list-fields-fix-to-print-the-fields-again.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From df675c91f4b33490f0fa831b11162bdb0e2ff550 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 23 May 2019 20:50:45 +0000 | ||
4 | Subject: [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 | |||
21 | Upstream-Status: Backport [http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/commit/?id=5163a74a59d54b2a8374414435ece9d542dbd5e2] | ||
22 | |||
23 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
24 | --- | ||
25 | opkg-list-fields | 3 +-- | ||
26 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
27 | |||
28 | diff --git a/opkg-list-fields b/opkg-list-fields | ||
29 | index 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 | -- | ||
40 | 2.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.0.bb index 9a3e06b92e..b2fb760267 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.0.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.0.bb | |||
@@ -10,6 +10,7 @@ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtu | |||
10 | SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ | 10 | SRC_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 \ | 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 \ | ||
13 | " | 14 | " |
14 | UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" | 15 | UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" |
15 | 16 | ||