mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 12:32:12 +02:00
opkg: upgrade to version 0.4.4
Include an upstream patch for 0.4.4 which fixes a test framework error that occurs on host systems with symlinked /tmp directories (like OE). (From OE-Core rev: 8064abb6664e16c6e0c63df3a466661f9b5b0d10) Signed-off-by: Alex Stewart <alex.stewart@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
8c4e5c0466
commit
fae7b0ddba
@@ -0,0 +1,43 @@
|
||||
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
|
||||
|
||||
@@ -14,11 +14,12 @@ 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://run-ptest \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "86ec5eee9362aca0990994a402e077e9"
|
||||
SRC_URI[sha256sum] = "dda452854bc0cd1334f7ba18a66003d1c12a98600c894111b56919b1ea434718"
|
||||
SRC_URI[md5sum] = "345900c1d4747d58455867f9fe88ca43"
|
||||
SRC_URI[sha256sum] = "2217acc58b8eb31300631ebae75e222ebc700c9c1cf6408088705d19a472c839"
|
||||
|
||||
# This needs to be before ptest inherit, otherwise all ptest files end packaged
|
||||
# in libopkg package if OPKGLIBDIR == libdir, because default
|
||||
Reference in New Issue
Block a user