summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-07-10 17:43:44 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-07-16 11:25:29 +0100
commit119bf8d1e72c70776904d1e02e483af9730d5b3d (patch)
treed6a168c1ea079161707ccf3361fbe1887445fe78
parent507cc5f96a4f12070bc3be733380cd3281bd0e60 (diff)
downloadpoky-119bf8d1e72c70776904d1e02e483af9730d5b3d.tar.gz
opkg-utils: upgrade 0.6.3 -> 0.7.0
0001-opkg-build-remove-numeric-owner-parameter-overzealou.patch removed since it's included in 0.7.0 (From OE-Core rev: 66b8bb37242c0c1038b9d92a4120ba50ed3ea6af) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-remove-numeric-owner-parameter-overzealou.patch34
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils_0.7.0.bb (renamed from meta/recipes-devtools/opkg-utils/opkg-utils_0.6.3.bb)3
2 files changed, 1 insertions, 36 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-remove-numeric-owner-parameter-overzealou.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-remove-numeric-owner-parameter-overzealou.patch
deleted file mode 100644
index 0cdeb9574a..0000000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-remove-numeric-owner-parameter-overzealou.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 19c2c6a14c8760c3595f5dc6cc89cde85fbdbac1 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Piotr=20=C5=81obacz?= <p.lobacz@welotec.com>
3Date: Tue, 9 Jan 2024 09:20:55 +0100
4Subject: [PATCH] opkg-build: remove `--numeric-owner` parameter overzealously
5 added
6
7In some corner cases this parameter has been added overzealously.
8All discussion on this topic can be read in here:
9https://bugzilla.yoctoproject.org/show_bug.cgi?id=15334
10
11Upstream-Status: Backport [https://git.yoctoproject.org/opkg-utils/commit/?id=68a969f0e867ace0d94faf8ebe7c7bb67f59d386]
12
13Signed-off-by: Alex Stewart <alex.stewart@ni.com>
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 opkg-build | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/opkg-build b/opkg-build
20index 6edd938..0582958 100755
21--- a/opkg-build
22+++ b/opkg-build
23@@ -337,7 +337,7 @@ export LANG=C
24 export LC_ALL=C
25 ( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list )
26 ( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list )
27-( cd $pkg_dir && tar $attributesargs $ogargs $tsortargs --numeric-owner --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
28+( cd $pkg_dir && tar $attributesargs $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
29 ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz )
30 rm $tmp_dir/file_list
31 rm $tmp_dir/control_list
32--
332.43.0
34
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.3.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.7.0.bb
index e138bc24af..44958b442e 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.3.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.7.0.bb
@@ -9,9 +9,8 @@ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtu
9 9
10SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=https;branch=master \ 10SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=https;branch=master \
11 file://0001-update-alternatives-correctly-match-priority.patch \ 11 file://0001-update-alternatives-correctly-match-priority.patch \
12 file://0001-opkg-build-remove-numeric-owner-parameter-overzealou.patch \
13 " 12 "
14SRCREV = "589880d01969eb9af1e66120e731d43193504718" 13SRCREV = "68a969f0e867ace0d94faf8ebe7c7bb67f59d386"
15 14
16S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
17 16