diff mbox series

[20/30] opkg-utils: upgrade 0.6.3 -> 0.7.0

Message ID 1720604634-23406-20-git-send-email-wangmy@fujitsu.com
State Accepted, archived
Commit 66b8bb37242c0c1038b9d92a4120ba50ed3ea6af
Headers show
Series [01/30] base-passwd: upgrade 3.6.3 -> 3.6.4 | expand

Commit Message

Mingyu Wang (Fujitsu) July 10, 2024, 9:43 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-opkg-build-remove-numeric-owner-parameter-overzealou.patch
removed since it's included in 0.7.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...e-numeric-owner-parameter-overzealou.patch | 34 -------------------
 ...pkg-utils_0.6.3.bb => opkg-utils_0.7.0.bb} |  3 +-
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-build-remove-numeric-owner-parameter-overzealou.patch
 rename meta/recipes-devtools/opkg-utils/{opkg-utils_0.6.3.bb => opkg-utils_0.7.0.bb} (94%)
diff mbox series

Patch

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 @@ 
-From 19c2c6a14c8760c3595f5dc6cc89cde85fbdbac1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20=C5=81obacz?= <p.lobacz@welotec.com>
-Date: Tue, 9 Jan 2024 09:20:55 +0100
-Subject: [PATCH] opkg-build: remove `--numeric-owner` parameter overzealously
- added
-
-In some corner cases this parameter has been added overzealously.
-All discussion on this topic can be read in here:
-https://bugzilla.yoctoproject.org/show_bug.cgi?id=15334
-
-Upstream-Status: Backport [https://git.yoctoproject.org/opkg-utils/commit/?id=68a969f0e867ace0d94faf8ebe7c7bb67f59d386]
-
-Signed-off-by: Alex Stewart <alex.stewart@ni.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- opkg-build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/opkg-build b/opkg-build
-index 6edd938..0582958 100755
---- a/opkg-build
-+++ b/opkg-build
-@@ -337,7 +337,7 @@ export LANG=C
- export LC_ALL=C
- ( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list )
- ( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print  | sort > $tmp_dir/file_list )
--( 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 )
-+( 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 )
- ( 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 )
- rm $tmp_dir/file_list
- rm $tmp_dir/control_list
--- 
-2.43.0
-
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
similarity index 94%
rename from meta/recipes-devtools/opkg-utils/opkg-utils_0.6.3.bb
rename to 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
 
 SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=https;branch=master \
            file://0001-update-alternatives-correctly-match-priority.patch \
-           file://0001-opkg-build-remove-numeric-owner-parameter-overzealou.patch \
            "
-SRCREV = "589880d01969eb9af1e66120e731d43193504718"
+SRCREV = "68a969f0e867ace0d94faf8ebe7c7bb67f59d386"
 
 S = "${WORKDIR}/git"