From 03a4742c0e1bd8b5e0a7456c97dbea9d0af689a3 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sat, 15 Oct 2022 07:26:43 +0000 Subject: [PATCH] ifupdown: upgrade 0.8.37 -> 0.8.39 --- .../files/0001-Define-FNM_EXTMATCH-for-musl.patch | 6 ++---- ...efile-do-not-use-dpkg-for-determining-OS-type.patch | 3 ++- .../files/0001-ifupdown-skip-wrong-test-case.patch | 6 ++---- ...-man-don-t-rely-on-dpkg-architecture-to-set-a.patch | 10 ++++------ .../ifupdown/files/tweak-ptest-script.patch | 9 ++++++--- .../{ifupdown_0.8.37.bb => ifupdown_0.8.39.bb} | 8 ++++---- 6 files changed, 20 insertions(+), 22 deletions(-) rename meta/recipes-core/ifupdown/{ifupdown_0.8.37.bb => ifupdown_0.8.39.bb} (92%) diff --git a/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch b/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch index 7bf02ea536..2382000c95 100644 --- a/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch +++ b/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch @@ -1,4 +1,4 @@ -From ff714d6461569d69b253089110ec659e4ebec248 Mon Sep 17 00:00:00 2001 +From 9c42515107a0d46557de1e8ad28a246dd55c1cf5 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Tue, 2 Jul 2019 20:10:42 +0200 Subject: [PATCH] Define FNM_EXTMATCH for musl @@ -24,6 +24,7 @@ function); did you mean 'FNM_NOMATCH'? Upstream-Status: Submitted [https://salsa.debian.org/debian/ifupdown/merge_requests/5] Signed-off-by: Oleksandr Kravchuk + --- archcommon.h | 4 ++++ 1 file changed, 4 insertions(+) @@ -42,6 +43,3 @@ index fe99950..f257f9d 100644 bool execable(const char *); #define iface_is_link() (!_iface_has(ifd->real_iface, ":.")) --- -2.17.1 - diff --git a/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch b/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch index 57c8d04fd7..99a058b280 100644 --- a/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch +++ b/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch @@ -1,10 +1,11 @@ -From 7ace0656bd325f9e7749f2cde641eddc057bc98a Mon Sep 17 00:00:00 2001 +From 19ac0609a815612fbad5871ba66ef139d4866ade Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 9 Jan 2020 15:38:06 +0100 Subject: [PATCH] Makefile: do not use dpkg for determining OS type Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch b/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch index c751e4fab0..da94b219f9 100644 --- a/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch +++ b/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch @@ -1,4 +1,4 @@ -From 98243deface88614e3f332c4a85d04a9abce55ff Mon Sep 17 00:00:00 2001 +From ddb28b96bef52677b016ed61d84d42423a94c79b Mon Sep 17 00:00:00 2001 From: Zqiang Date: Mon, 19 Apr 2021 14:15:45 +0800 Subject: [PATCH] ifupdown: skip wrong test case @@ -10,6 +10,7 @@ and are skipped directly. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Zqiang + --- tests/testbuild-linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -27,6 +28,3 @@ index 1181ea0..5f148eb 100755 if [ -e $dir/testcase.$test ]; then args="$(cat $dir/testcase.$test | sed -n 's/^# RUN: //p')" else --- -2.17.1 - diff --git a/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch b/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch index d1c3d260ed..be68d51a39 100644 --- a/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch +++ b/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch @@ -1,7 +1,7 @@ -From 40257d65b338b6e2ed9d89d6fa7c7b8701a4c311 Mon Sep 17 00:00:00 2001 +From 96c24808ac2af9353a40b7bba4243c3126e1a926 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Wed, 6 Aug 2014 14:54:12 -0400 -Subject: [PATCH 1/2] defn2[c|man]: don't rely on dpkg-architecture to set arch +Subject: [PATCH] defn2[c|man]: don't rely on dpkg-architecture to set arch In yocto we'll always be cross compiling, and we'll always be building on linux for linux (vs. *BSD, hurd, etc.) @@ -13,13 +13,14 @@ like the loopback device not being configured/enabled. Signed-off-by: Paul Gortmaker Upstream-Status: Pending + --- defn2c.pl | 6 +++--- defn2man.pl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/defn2c.pl b/defn2c.pl -index 8798dc2..f2551c7 100755 +index fa7a02e..bb4987d 100755 --- a/defn2c.pl +++ b/defn2c.pl @@ -2,9 +2,9 @@ @@ -52,6 +53,3 @@ index 6ddcfdd..c9c4dd0 100755 # declarations my $line; --- -2.17.1 - diff --git a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch index ea88a9086a..6ff40b7e77 100644 --- a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch +++ b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch @@ -1,8 +1,13 @@ -Tweak tests of ifupdown to make it work with oe-core ptest framework. +From da10ee29f4170dc3881998bdd65e0e50d76e8a10 Mon Sep 17 00:00:00 2001 +From: Kai Kang +Date: Mon, 3 Feb 2020 17:33:11 +0800 +Subject: [PATCH] Tweak tests of ifupdown to make it work with oe-core ptest + framework. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Kai Kang + --- tests/testbuild-linux | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) @@ -50,5 +55,3 @@ index 5f148eb..d9b1698 100755 result=false fi echo "==========" --- -2.17.1 diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.37.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.39.bb similarity index 92% rename from meta/recipes-core/ifupdown/ifupdown_0.8.37.bb rename to meta/recipes-core/ifupdown/ifupdown_0.8.39.bb index 57d4152a39..c599a161ab 100644 --- a/meta/recipes-core/ifupdown/ifupdown_0.8.37.bb +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.39.bb @@ -8,15 +8,15 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https;branch=master \ - file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \ + file://run-ptest \ file://99_network \ file://0001-Define-FNM_EXTMATCH-for-musl.patch \ file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \ - file://run-ptest \ file://0001-ifupdown-skip-wrong-test-case.patch \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \ + file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \ + file://tweak-ptest-script.patch \ " -SRCREV = "2b4138f36ce3ba37186aa01b502273e0c39ab518" +SRCREV = "be91dd267b4a8db502a6bbf5758563f7048b8078" S = "${WORKDIR}/git" -- 2.31.1