diff options
author | 2024-08-27 07:23:44 +0200 | |
---|---|---|
committer | 2024-08-27 12:01:04 +0100 | |
commit | 092ac58c7914142db397544b1a8e18f61423deba (patch) | |
tree | 7df1553adcbc583da3e9f45737272068f8ebf970 | |
parent | ab979c8cbb698eb1638dd9de562dffff798acad7 (diff) | |
download | openembedded-core-092ac58c7914142db397544b1a8e18f61423deba.tar.gz |
ifupdown: upgrade 0.8.41 -> 0.8.43
Do not force CFLAGS (no longer necessary).
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch | 3 | ||||
-rw-r--r-- | meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch | 7 | ||||
-rw-r--r-- | meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch | 3 | ||||
-rw-r--r-- | meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch | 3 | ||||
-rw-r--r-- | meta/recipes-core/ifupdown/files/tweak-ptest-script.patch | 3 | ||||
-rw-r--r-- | meta/recipes-core/ifupdown/ifupdown_0.8.43.bb (renamed from meta/recipes-core/ifupdown/ifupdown_0.8.41.bb) | 4 |
6 files changed, 9 insertions, 14 deletions
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 6c4ed526bf..83fb706be0 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 8dfbcf02e424ba1fdef587d81c9e08a37ab8c1b6 Mon Sep 17 00:00:00 2001 +From 97b196efe9671d0185d22710371acb52bb7130e2 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Date: Tue, 2 Jul 2019 20:10:42 +0200 Subject: [PATCH] Define FNM_EXTMATCH for musl @@ -24,7 +24,6 @@ function); did you mean 'FNM_NOMATCH'? Upstream-Status: Submitted [https://salsa.debian.org/debian/ifupdown/merge_requests/5] Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> - --- archcommon.h | 4 ++++ 1 file changed, 4 insertions(+) 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 6e15a25224..f84a0a1311 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,17 +1,16 @@ -From 7fe516cbaf9fda09d99dcb54d4645367cffc8a4d Mon Sep 17 00:00:00 2001 +From 4922e2011a0132c122df4f0cf4d66d565c749060 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> 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 <alex.kanavin@gmail.com> - --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 0ce2fa3..739aef2 100644 +index 9cd758b..58b4173 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ @@ -21,4 +20,4 @@ index 0ce2fa3..739aef2 100644 +ARCH := linux BASEDIR ?= $(DESTDIR) - + PKGLIBDIR ?= /lib/ifupdown 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 9ae24da51e..8aa227c8ec 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 782d8a869c266820d0f34974436f244f67afaea7 Mon Sep 17 00:00:00 2001 +From ea48a9816643482d438e4bb276c90cd6f02847e4 Mon Sep 17 00:00:00 2001 From: Zqiang <qiang.zhang@windriver.com> Date: Mon, 19 Apr 2021 14:15:45 +0800 Subject: [PATCH] ifupdown: skip wrong test case @@ -10,7 +10,6 @@ and are skipped directly. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Zqiang <qiang.zhang@windriver.com> - --- tests/testbuild-linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7b4b761e6a..24e3ba0d9d 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,4 +1,4 @@ -From fc8e8d4cb19ff30e69aa1855332544f1017f974c Mon Sep 17 00:00:00 2001 +From 68b64a5c9d466352b0c161019bd7255e31db9a4c Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Wed, 6 Aug 2014 14:54:12 -0400 Subject: [PATCH] defn2[c|man]: don't rely on dpkg-architecture to set arch @@ -13,7 +13,6 @@ like the loopback device not being configured/enabled. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Upstream-Status: Pending - --- defn2c.pl | 6 +++--- defn2man.pl | 6 +++--- diff --git a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch index fa6bb84df3..c1953f0691 100644 --- a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch +++ b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch @@ -1,4 +1,4 @@ -From a6bb2ac5f521c678abbbdb1960d28f750f4357a6 Mon Sep 17 00:00:00 2001 +From 5eede8950e35404b109cc3cf6a53bf3c84b31cfb Mon Sep 17 00:00:00 2001 From: Kai Kang <kai.kang@windriver.com> Date: Mon, 3 Feb 2020 17:33:11 +0800 Subject: [PATCH] Tweak tests of ifupdown to make it work with oe-core ptest @@ -7,7 +7,6 @@ Subject: [PATCH] Tweak tests of ifupdown to make it work with oe-core ptest Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Kai Kang <kai.kang@windriver.com> - --- tests/testbuild-linux | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.43.bb index c7004ab41d..1557551d45 100644 --- a/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.43.bb @@ -16,7 +16,7 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https;branch=mast file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \ file://tweak-ptest-script.patch \ " -SRCREV = "369d9d3c13a0c56ad09fd4f13b4a80eb9a94e270" +SRCREV = "cf86ad5819aba8f9b020a95257c9a8c4911b1c85" S = "${WORKDIR}/git" @@ -25,7 +25,7 @@ inherit ptest update-alternatives do_compile () { chmod a+rx *.pl *.sh - oe_runmake 'CC=${CC}' "CFLAGS=${CFLAGS} -Wall -W -D'IFUPDOWN_VERSION=\"${PV}\"'" + oe_runmake 'CC=${CC}' "-Wall -W -D'IFUPDOWN_VERSION=\"${PV}\"'" } do_install () { |