From 6832cd497b95f6cc043abf00fc39d27073531cdf Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 4 Jun 2019 18:48:41 +0000 Subject: opkg-utils: fix opkg-list-fields script (From OE-Core rev: 95c557761de6a89cc31f5a5910be3fced5259de6) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- ...list-fields-fix-to-print-the-fields-again.patch | 41 ++++++++++++++++++++++ .../opkg-utils/opkg-utils_0.4.0.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-list-fields-fix-to-print-the-fields-again.patch (limited to 'meta/recipes-devtools/opkg-utils') 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 @@ +From df675c91f4b33490f0fa831b11162bdb0e2ff550 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 23 May 2019 20:50:45 +0000 +Subject: [PATCH] opkg-list-fields: fix to print the fields again + +* printing opkg.Package directly doesn't return anything useful now + + +* we need to call Package.print() function and specify which checksums + to print, we can include both md5 and sha256 for opkg-list-fields + +* it was changed in this commit: + commit 601d691dd80ef494aef069017edc5bf80aa883a1 + Author: Alejandro del Castillo + Date: Wed Dec 19 11:40:15 2018 -0600 + + opkg-make-index: add sha256sum support + + which replaced the modified __str__ function with print(self, checksum) + +Upstream-Status: Backport [http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/commit/?id=5163a74a59d54b2a8374414435ece9d542dbd5e2] + +Signed-off-by: Martin Jansa +--- + opkg-list-fields | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/opkg-list-fields b/opkg-list-fields +index c14a90f..8a5a588 100755 +--- a/opkg-list-fields ++++ b/opkg-list-fields +@@ -11,5 +11,4 @@ def usage(): + if (len(sys.argv) < 2): + usage() + +-print(opkg.Package(sys.argv[1])) +- ++print(opkg.Package(sys.argv[1]).print(('md5','sha256'))) +-- +2.17.1 + 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 SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ file://0001-Switch-all-scripts-to-use-Python-3.x.patch \ file://0001-opkg-build-do-not-set-mtime-on-data.tar.X.patch \ + file://0001-opkg-list-fields-fix-to-print-the-fields-again.patch \ " UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/" -- cgit v1.2.3-54-g00ecf