mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
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>
This commit is contained in:
parent
2104ab479b
commit
e0b9f2c906
|
@ -1,43 +0,0 @@
|
|||
From 4acda6d01c5abd33f1a1a3275fd695363f59473f Mon Sep 17 00:00:00 2001
|
||||
From: Alex Stewart <alex.stewart@ni.com>
|
||||
Date: Tue, 15 Dec 2020 15:17:54 -0600
|
||||
Subject: [opkg][opkg-0.4.4 PATCH] tests: let the OS negotiate relative package
|
||||
dirs
|
||||
|
||||
In cases where a regression test requires that a package be installed to
|
||||
a subdirectory in the test feed, the opk.py module will attempt to
|
||||
resolve the subdirectory and rebase it to the root of the test feed.
|
||||
|
||||
This is unnecessary, since all operations which make use of the
|
||||
subdirectory path do so from the perspective of the test feed already.
|
||||
Further, the rebase implementation breaks in cases where the test feed
|
||||
is beyond a symlink.
|
||||
|
||||
Remove the resolve-and-rebase logic, and allow the OS to negotiate the
|
||||
relative path.
|
||||
|
||||
Upstream-Status: Submitted [https://groups.google.com/g/opkg-devel/c/dE1o7_OVQSY]
|
||||
|
||||
Signed-off-by: Alex Stewart <alex.stewart@ni.com>
|
||||
---
|
||||
tests/opk.py | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/tests/opk.py b/tests/opk.py
|
||||
index 692339567f72441766c8e658edc5bdf6a339f77d..711abacaeb328283e31524f6a49305fc7d39696a 100644
|
||||
--- a/tests/opk.py
|
||||
+++ b/tests/opk.py
|
||||
@@ -58,9 +58,7 @@ class Opk:
|
||||
if 'Version' not in control.keys():
|
||||
control['Version'] = '1.0'
|
||||
if subdirectory is not None:
|
||||
- subdir = Path(subdirectory).resolve()
|
||||
- opkdir = Path(cfg.opkdir)
|
||||
- self._relative_dir = subdir.relative_to(opkdir)
|
||||
+ self._relative_dir = Path(subdirectory)
|
||||
else:
|
||||
self._relative_dir = None
|
||||
self.control = control
|
||||
--
|
||||
2.29.2
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
Having CLEAN_DATE come from the current date doesn't allow for build
|
||||
reproducibility. Add the option of using SOURCE_DATE_EPOCH if set
|
||||
which for OE, it will be.
|
||||
|
||||
Upstream-Status: Pending
|
||||
RP 2021/2/2
|
||||
|
||||
Index: opkg-0.4.4/configure.ac
|
||||
===================================================================
|
||||
--- opkg-0.4.4.orig/configure.ac
|
||||
+++ opkg-0.4.4/configure.ac
|
||||
@@ -281,7 +281,11 @@ AC_FUNC_UTIME_NULL
|
||||
AC_FUNC_VPRINTF
|
||||
AC_CHECK_FUNCS([memmove memset mkdir regcomp strchr strcspn strdup strerror strndup strrchr strstr strtol strtoul sysinfo utime])
|
||||
|
||||
-CLEAN_DATE=`date +"%B %Y" | tr -d '\n'`
|
||||
+if ! test -z "$SOURCE_DATE_EPOCH" ; then
|
||||
+ CLEAN_DATE=`LC_ALL=C date -d @$SOURCE_DATE_EPOCH +"%B %Y" | tr -d '\n'`
|
||||
+else
|
||||
+ CLEAN_DATE=`date +"%B %Y" | tr -d '\n'`
|
||||
+fi
|
||||
|
||||
AC_SUBST([CLEAN_DATE])
|
||||
|
|
@ -15,13 +15,11 @@ PE = "1"
|
|||
SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
|
||||
file://opkg.conf \
|
||||
file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
|
||||
file://0001-tests-let-the-OS-negotiate-relative-package-dirs.patch \
|
||||
file://sourcedateepoch.patch \
|
||||
file://run-ptest \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "345900c1d4747d58455867f9fe88ca43"
|
||||
SRC_URI[sha256sum] = "2217acc58b8eb31300631ebae75e222ebc700c9c1cf6408088705d19a472c839"
|
||||
SRC_URI[md5sum] = "5dc41ad37d88803b5e0f456a9c5a0811"
|
||||
SRC_URI[sha256sum] = "a1214a75fa34fb9228db8da47308e0e711b1c93fd8938cf164c10fd28eb50f1e"
|
||||
|
||||
# This needs to be before ptest inherit, otherwise all ptest files end packaged
|
||||
# in libopkg package if OPKGLIBDIR == libdir, because default
|
Loading…
Reference in New Issue
Block a user