diff options
Diffstat (limited to 'meta/recipes-devtools/opkg/opkg')
-rw-r--r-- | meta/recipes-devtools/opkg/opkg/0001-tests-let-the-OS-negotiate-relative-package-dirs.patch | 43 | ||||
-rw-r--r-- | meta/recipes-devtools/opkg/opkg/sourcedateepoch.patch | 24 |
2 files changed, 0 insertions, 67 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 @@ | |||
1 | From 4acda6d01c5abd33f1a1a3275fd695363f59473f Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Stewart <alex.stewart@ni.com> | ||
3 | Date: Tue, 15 Dec 2020 15:17:54 -0600 | ||
4 | Subject: [opkg][opkg-0.4.4 PATCH] tests: let the OS negotiate relative package | ||
5 | dirs | ||
6 | |||
7 | In cases where a regression test requires that a package be installed to | ||
8 | a subdirectory in the test feed, the opk.py module will attempt to | ||
9 | resolve the subdirectory and rebase it to the root of the test feed. | ||
10 | |||
11 | This is unnecessary, since all operations which make use of the | ||
12 | subdirectory path do so from the perspective of the test feed already. | ||
13 | Further, the rebase implementation breaks in cases where the test feed | ||
14 | is beyond a symlink. | ||
15 | |||
16 | Remove the resolve-and-rebase logic, and allow the OS to negotiate the | ||
17 | relative path. | ||
18 | |||
19 | Upstream-Status: Submitted [https://groups.google.com/g/opkg-devel/c/dE1o7_OVQSY] | ||
20 | |||
21 | Signed-off-by: Alex Stewart <alex.stewart@ni.com> | ||
22 | --- | ||
23 | tests/opk.py | 4 +--- | ||
24 | 1 file changed, 1 insertion(+), 3 deletions(-) | ||
25 | |||
26 | diff --git a/tests/opk.py b/tests/opk.py | ||
27 | index 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 | -- | ||
42 | 2.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 @@ | |||
1 | Having CLEAN_DATE come from the current date doesn't allow for build | ||
2 | reproducibility. Add the option of using SOURCE_DATE_EPOCH if set | ||
3 | which for OE, it will be. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | RP 2021/2/2 | ||
7 | |||
8 | Index: 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 | |||