summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/opkg
diff options
context:
space:
mode:
authorAlex Stewart <alex.stewart@ni.com>2021-06-09 16:10:43 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-11 23:50:58 +0100
commite0b9f2c906141598f1e417a44853131a8baf7ab1 (patch)
tree02d11ac0371d8d44aea1d32350a2bb3c788952d3 /meta/recipes-devtools/opkg
parent2104ab479b19000d3e4e9ebbc61d112f9b8017ea (diff)
downloadpoky-e0b9f2c906141598f1e417a44853131a8baf7ab1.tar.gz
opkg: upgrade to version 0.4.5
Drop patches which have been accepted upstream. (From OE-Core rev: 9fed64cca20e98ab8df874a172cfe17fb3f77142) Signed-off-by: Alex Stewart <alex.stewart@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/opkg')
-rw-r--r--meta/recipes-devtools/opkg/opkg/0001-tests-let-the-OS-negotiate-relative-package-dirs.patch43
-rw-r--r--meta/recipes-devtools/opkg/opkg/sourcedateepoch.patch24
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.4.5.bb (renamed from meta/recipes-devtools/opkg/opkg_0.4.4.bb)6
3 files changed, 2 insertions, 71 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/0001-tests-let-the-OS-negotiate-relative-package-dirs.patch b/meta/recipes-devtools/opkg/opkg/0001-tests-let-the-OS-negotiate-relative-package-dirs.patch
deleted file mode 100644
index 33b7280e5a..0000000000
--- a/meta/recipes-devtools/opkg/opkg/0001-tests-let-the-OS-negotiate-relative-package-dirs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 4acda6d01c5abd33f1a1a3275fd695363f59473f Mon Sep 17 00:00:00 2001
2From: Alex Stewart <alex.stewart@ni.com>
3Date: Tue, 15 Dec 2020 15:17:54 -0600
4Subject: [opkg][opkg-0.4.4 PATCH] tests: let the OS negotiate relative package
5 dirs
6
7In cases where a regression test requires that a package be installed to
8a subdirectory in the test feed, the opk.py module will attempt to
9resolve the subdirectory and rebase it to the root of the test feed.
10
11This is unnecessary, since all operations which make use of the
12subdirectory path do so from the perspective of the test feed already.
13Further, the rebase implementation breaks in cases where the test feed
14is beyond a symlink.
15
16Remove the resolve-and-rebase logic, and allow the OS to negotiate the
17relative path.
18
19Upstream-Status: Submitted [https://groups.google.com/g/opkg-devel/c/dE1o7_OVQSY]
20
21Signed-off-by: Alex Stewart <alex.stewart@ni.com>
22---
23 tests/opk.py | 4 +---
24 1 file changed, 1 insertion(+), 3 deletions(-)
25
26diff --git a/tests/opk.py b/tests/opk.py
27index 692339567f72441766c8e658edc5bdf6a339f77d..711abacaeb328283e31524f6a49305fc7d39696a 100644
28--- a/tests/opk.py
29+++ b/tests/opk.py
30@@ -58,9 +58,7 @@ class Opk:
31 if 'Version' not in control.keys():
32 control['Version'] = '1.0'
33 if subdirectory is not None:
34- subdir = Path(subdirectory).resolve()
35- opkdir = Path(cfg.opkdir)
36- self._relative_dir = subdir.relative_to(opkdir)
37+ self._relative_dir = Path(subdirectory)
38 else:
39 self._relative_dir = None
40 self.control = control
41--
422.29.2
43
diff --git a/meta/recipes-devtools/opkg/opkg/sourcedateepoch.patch b/meta/recipes-devtools/opkg/opkg/sourcedateepoch.patch
deleted file mode 100644
index 4578fa33be..0000000000
--- a/meta/recipes-devtools/opkg/opkg/sourcedateepoch.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Having CLEAN_DATE come from the current date doesn't allow for build
2reproducibility. Add the option of using SOURCE_DATE_EPOCH if set
3which for OE, it will be.
4
5Upstream-Status: Pending
6RP 2021/2/2
7
8Index: opkg-0.4.4/configure.ac
9===================================================================
10--- opkg-0.4.4.orig/configure.ac
11+++ opkg-0.4.4/configure.ac
12@@ -281,7 +281,11 @@ AC_FUNC_UTIME_NULL
13 AC_FUNC_VPRINTF
14 AC_CHECK_FUNCS([memmove memset mkdir regcomp strchr strcspn strdup strerror strndup strrchr strstr strtol strtoul sysinfo utime])
15
16-CLEAN_DATE=`date +"%B %Y" | tr -d '\n'`
17+if ! test -z "$SOURCE_DATE_EPOCH" ; then
18+ CLEAN_DATE=`LC_ALL=C date -d @$SOURCE_DATE_EPOCH +"%B %Y" | tr -d '\n'`
19+else
20+ CLEAN_DATE=`date +"%B %Y" | tr -d '\n'`
21+fi
22
23 AC_SUBST([CLEAN_DATE])
24
diff --git a/meta/recipes-devtools/opkg/opkg_0.4.4.bb b/meta/recipes-devtools/opkg/opkg_0.4.5.bb
index 9eca61be2a..bc948647c8 100644
--- a/meta/recipes-devtools/opkg/opkg_0.4.4.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.4.5.bb
@@ -15,13 +15,11 @@ PE = "1"
15SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ 15SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
16 file://opkg.conf \ 16 file://opkg.conf \
17 file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ 17 file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
18 file://0001-tests-let-the-OS-negotiate-relative-package-dirs.patch \
19 file://sourcedateepoch.patch \
20 file://run-ptest \ 18 file://run-ptest \
21" 19"
22 20
23SRC_URI[md5sum] = "345900c1d4747d58455867f9fe88ca43" 21SRC_URI[md5sum] = "5dc41ad37d88803b5e0f456a9c5a0811"
24SRC_URI[sha256sum] = "2217acc58b8eb31300631ebae75e222ebc700c9c1cf6408088705d19a472c839" 22SRC_URI[sha256sum] = "a1214a75fa34fb9228db8da47308e0e711b1c93fd8938cf164c10fd28eb50f1e"
25 23
26# This needs to be before ptest inherit, otherwise all ptest files end packaged 24# This needs to be before ptest inherit, otherwise all ptest files end packaged
27# in libopkg package if OPKGLIBDIR == libdir, because default 25# in libopkg package if OPKGLIBDIR == libdir, because default