diff options
Diffstat (limited to 'meta/recipes-core/ifupdown')
-rw-r--r-- | meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch | 8 | ||||
-rw-r--r-- | meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch | 3 | ||||
-rw-r--r-- | meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch | 30 | ||||
-rw-r--r-- | meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch | 10 | ||||
-rw-r--r-- | meta/recipes-core/ifupdown/files/tweak-ptest-script.patch | 20 | ||||
-rw-r--r-- | meta/recipes-core/ifupdown/ifupdown_0.8.41.bb (renamed from meta/recipes-core/ifupdown/ifupdown_0.8.36.bb) | 22 |
6 files changed, 67 insertions, 26 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 7bf02ea536..6c4ed526bf 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 @@ | |||
1 | From ff714d6461569d69b253089110ec659e4ebec248 Mon Sep 17 00:00:00 2001 | 1 | From 8dfbcf02e424ba1fdef587d81c9e08a37ab8c1b6 Mon Sep 17 00:00:00 2001 |
2 | From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2 | From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> |
3 | Date: Tue, 2 Jul 2019 20:10:42 +0200 | 3 | Date: Tue, 2 Jul 2019 20:10:42 +0200 |
4 | Subject: [PATCH] Define FNM_EXTMATCH for musl | 4 | Subject: [PATCH] Define FNM_EXTMATCH for musl |
@@ -24,12 +24,13 @@ function); did you mean 'FNM_NOMATCH'? | |||
24 | Upstream-Status: Submitted [https://salsa.debian.org/debian/ifupdown/merge_requests/5] | 24 | Upstream-Status: Submitted [https://salsa.debian.org/debian/ifupdown/merge_requests/5] |
25 | 25 | ||
26 | Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 26 | Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> |
27 | |||
27 | --- | 28 | --- |
28 | archcommon.h | 4 ++++ | 29 | archcommon.h | 4 ++++ |
29 | 1 file changed, 4 insertions(+) | 30 | 1 file changed, 4 insertions(+) |
30 | 31 | ||
31 | diff --git a/archcommon.h b/archcommon.h | 32 | diff --git a/archcommon.h b/archcommon.h |
32 | index fe99950..f257f9d 100644 | 33 | index 818b0b6..ad9cd1a 100644 |
33 | --- a/archcommon.h | 34 | --- a/archcommon.h |
34 | +++ b/archcommon.h | 35 | +++ b/archcommon.h |
35 | @@ -1,5 +1,9 @@ | 36 | @@ -1,5 +1,9 @@ |
@@ -42,6 +43,3 @@ index fe99950..f257f9d 100644 | |||
42 | bool execable(const char *); | 43 | bool execable(const char *); |
43 | 44 | ||
44 | #define iface_is_link() (!_iface_has(ifd->real_iface, ":.")) | 45 | #define iface_is_link() (!_iface_has(ifd->real_iface, ":.")) |
45 | -- | ||
46 | 2.17.1 | ||
47 | |||
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..6e15a25224 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 @@ | |||
1 | From 7ace0656bd325f9e7749f2cde641eddc057bc98a Mon Sep 17 00:00:00 2001 | 1 | From 7fe516cbaf9fda09d99dcb54d4645367cffc8a4d Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 9 Jan 2020 15:38:06 +0100 | 3 | Date: Thu, 9 Jan 2020 15:38:06 +0100 |
4 | Subject: [PATCH] Makefile: do not use dpkg for determining OS type | 4 | Subject: [PATCH] Makefile: do not use dpkg for determining OS type |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
8 | --- | 9 | --- |
9 | Makefile | 2 +- | 10 | Makefile | 2 +- |
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 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 new file mode 100644 index 0000000000..9ae24da51e --- /dev/null +++ b/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 782d8a869c266820d0f34974436f244f67afaea7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zqiang <qiang.zhang@windriver.com> | ||
3 | Date: Mon, 19 Apr 2021 14:15:45 +0800 | ||
4 | Subject: [PATCH] ifupdown: skip wrong test case | ||
5 | |||
6 | The test parameters of testcase(12-15) file is not right, | ||
7 | it triggers a test failure, these test items are invalid | ||
8 | and are skipped directly. | ||
9 | |||
10 | Upstream-Status: Inappropriate [oe-core specific] | ||
11 | |||
12 | Signed-off-by: Zqiang <qiang.zhang@windriver.com> | ||
13 | |||
14 | --- | ||
15 | tests/testbuild-linux | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/tests/testbuild-linux b/tests/testbuild-linux | ||
19 | index 2fa1b8b..2c69856 100755 | ||
20 | --- a/tests/testbuild-linux | ||
21 | +++ b/tests/testbuild-linux | ||
22 | @@ -3,7 +3,7 @@ | ||
23 | dir=tests/linux | ||
24 | |||
25 | result=true | ||
26 | -for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do | ||
27 | +for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do | ||
28 | if [ -e $dir/testcase.$test ]; then | ||
29 | args="$(cat $dir/testcase.$test | sed -n 's/^# RUN: //p')" | ||
30 | else | ||
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..7b4b761e6a 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 @@ | |||
1 | From 40257d65b338b6e2ed9d89d6fa7c7b8701a4c311 Mon Sep 17 00:00:00 2001 | 1 | From fc8e8d4cb19ff30e69aa1855332544f1017f974c Mon Sep 17 00:00:00 2001 |
2 | From: Paul Gortmaker <paul.gortmaker@windriver.com> | 2 | From: Paul Gortmaker <paul.gortmaker@windriver.com> |
3 | Date: Wed, 6 Aug 2014 14:54:12 -0400 | 3 | Date: Wed, 6 Aug 2014 14:54:12 -0400 |
4 | Subject: [PATCH 1/2] defn2[c|man]: don't rely on dpkg-architecture to set arch | 4 | Subject: [PATCH] defn2[c|man]: don't rely on dpkg-architecture to set arch |
5 | 5 | ||
6 | In yocto we'll always be cross compiling, and we'll always | 6 | In yocto we'll always be cross compiling, and we'll always |
7 | be building on linux for linux (vs. *BSD, hurd, etc.) | 7 | be building on linux for linux (vs. *BSD, hurd, etc.) |
@@ -13,13 +13,14 @@ like the loopback device not being configured/enabled. | |||
13 | 13 | ||
14 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> | 14 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
15 | Upstream-Status: Pending | 15 | Upstream-Status: Pending |
16 | |||
16 | --- | 17 | --- |
17 | defn2c.pl | 6 +++--- | 18 | defn2c.pl | 6 +++--- |
18 | defn2man.pl | 6 +++--- | 19 | defn2man.pl | 6 +++--- |
19 | 2 files changed, 6 insertions(+), 6 deletions(-) | 20 | 2 files changed, 6 insertions(+), 6 deletions(-) |
20 | 21 | ||
21 | diff --git a/defn2c.pl b/defn2c.pl | 22 | diff --git a/defn2c.pl b/defn2c.pl |
22 | index 8798dc2..f2551c7 100755 | 23 | index fa7a02e..bb4987d 100755 |
23 | --- a/defn2c.pl | 24 | --- a/defn2c.pl |
24 | +++ b/defn2c.pl | 25 | +++ b/defn2c.pl |
25 | @@ -2,9 +2,9 @@ | 26 | @@ -2,9 +2,9 @@ |
@@ -52,6 +53,3 @@ index 6ddcfdd..c9c4dd0 100755 | |||
52 | 53 | ||
53 | # declarations | 54 | # declarations |
54 | my $line; | 55 | my $line; |
55 | -- | ||
56 | 2.17.1 | ||
57 | |||
diff --git a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch index d7600cf243..fa6bb84df3 100644 --- a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch +++ b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch | |||
@@ -1,11 +1,19 @@ | |||
1 | Tweak tests of ifupdown to make it work with oe-core ptest framework. | 1 | From a6bb2ac5f521c678abbbdb1960d28f750f4357a6 Mon Sep 17 00:00:00 2001 |
2 | From: Kai Kang <kai.kang@windriver.com> | ||
3 | Date: Mon, 3 Feb 2020 17:33:11 +0800 | ||
4 | Subject: [PATCH] Tweak tests of ifupdown to make it work with oe-core ptest | ||
5 | framework. | ||
2 | 6 | ||
3 | Upstream-Status: Inappropriate [oe-core specific] | 7 | Upstream-Status: Inappropriate [oe-core specific] |
4 | 8 | ||
5 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 9 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
6 | 10 | ||
11 | --- | ||
12 | tests/testbuild-linux | 11 ++++++----- | ||
13 | 1 file changed, 6 insertions(+), 5 deletions(-) | ||
14 | |||
7 | diff --git a/tests/testbuild-linux b/tests/testbuild-linux | 15 | diff --git a/tests/testbuild-linux b/tests/testbuild-linux |
8 | index 1181ea0..d5c1814 100755 | 16 | index 2c69856..05f0703 100755 |
9 | --- a/tests/testbuild-linux | 17 | --- a/tests/testbuild-linux |
10 | +++ b/tests/testbuild-linux | 18 | +++ b/tests/testbuild-linux |
11 | @@ -1,6 +1,7 @@ | 19 | @@ -1,6 +1,7 @@ |
@@ -16,8 +24,8 @@ index 1181ea0..d5c1814 100755 | |||
16 | +dir=$curdir/linux | 24 | +dir=$curdir/linux |
17 | 25 | ||
18 | result=true | 26 | result=true |
19 | for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do | 27 | for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do |
20 | @@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do | 28 | @@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do |
21 | echo "Testcase $test: $args" | 29 | echo "Testcase $test: $args" |
22 | 30 | ||
23 | exitcode=0 | 31 | exitcode=0 |
@@ -26,7 +34,7 @@ index 1181ea0..d5c1814 100755 | |||
26 | >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$? | 34 | >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$? |
27 | 35 | ||
28 | (echo "exit code: $exitcode"; | 36 | (echo "exit code: $exitcode"; |
29 | @@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do | 37 | @@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do |
30 | echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test | 38 | echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test |
31 | 39 | ||
32 | exitcode=0 | 40 | exitcode=0 |
@@ -35,7 +43,7 @@ index 1181ea0..d5c1814 100755 | |||
35 | >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$? | 43 | >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$? |
36 | 44 | ||
37 | (echo "exit code: $exitcode"; | 45 | (echo "exit code: $exitcode"; |
38 | @@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do | 46 | @@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do |
39 | echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test | 47 | echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test |
40 | 48 | ||
41 | if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then | 49 | if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then |
diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb index c0a90a3972..c7004ab41d 100644 --- a/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb | |||
@@ -4,18 +4,19 @@ DESCRIPTION = "High level tools to configure network interfaces \ | |||
4 | This package provides the tools ifup and ifdown which may be used to \ | 4 | This package provides the tools ifup and ifdown which may be used to \ |
5 | configure (or, respectively, deconfigure) network interfaces, based on \ | 5 | configure (or, respectively, deconfigure) network interfaces, based on \ |
6 | the file /etc/network/interfaces." | 6 | the file /etc/network/interfaces." |
7 | LICENSE = "GPLv2" | 7 | LICENSE = "GPL-2.0-only" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
9 | 9 | ||
10 | SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \ | 10 | SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https;branch=master \ |
11 | file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \ | ||
12 | file://99_network \ | 11 | file://99_network \ |
12 | file://run-ptest \ | ||
13 | file://0001-Define-FNM_EXTMATCH-for-musl.patch \ | 13 | file://0001-Define-FNM_EXTMATCH-for-musl.patch \ |
14 | file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \ | 14 | file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \ |
15 | file://run-ptest \ | 15 | file://0001-ifupdown-skip-wrong-test-case.patch \ |
16 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \ | 16 | file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \ |
17 | file://tweak-ptest-script.patch \ | ||
17 | " | 18 | " |
18 | SRCREV = "c73226073e2b13970ca613b20a13b9c0253bf9da" | 19 | SRCREV = "369d9d3c13a0c56ad09fd4f13b4a80eb9a94e270" |
19 | 20 | ||
20 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
21 | 22 | ||
@@ -34,13 +35,18 @@ do_install () { | |||
34 | 35 | ||
35 | # If volatiles are used, then we'll also need /run/network there too. | 36 | # If volatiles are used, then we'll also need /run/network there too. |
36 | install -d ${D}/etc/default/volatiles | 37 | install -d ${D}/etc/default/volatiles |
37 | install -m 0644 ${WORKDIR}/99_network ${D}/etc/default/volatiles | 38 | install -m 0644 ${UNPACKDIR}/99_network ${D}/etc/default/volatiles |
38 | 39 | ||
39 | install -m 0755 ifup ${D}${base_sbindir}/ | 40 | install -m 0755 ifup ${D}${base_sbindir}/ |
40 | ln ${D}${base_sbindir}/ifup ${D}${base_sbindir}/ifdown | 41 | ln ${D}${base_sbindir}/ifup ${D}${base_sbindir}/ifdown |
41 | install -m 0644 ifup.8 ${D}${mandir}/man8 | 42 | install -m 0644 ifup.8 ${D}${mandir}/man8 |
42 | install -m 0644 interfaces.5 ${D}${mandir}/man5 | 43 | install -m 0644 interfaces.5 ${D}${mandir}/man5 |
43 | cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8 | 44 | cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8 |
45 | |||
46 | install -d ${D}${sysconfdir}/network/if-pre-up.d | ||
47 | install -d ${D}${sysconfdir}/network/if-up.d | ||
48 | install -d ${D}${sysconfdir}/network/if-down.d | ||
49 | install -d ${D}${sysconfdir}/network/if-post-down.d | ||
44 | } | 50 | } |
45 | 51 | ||
46 | do_install_ptest () { | 52 | do_install_ptest () { |
@@ -50,7 +56,7 @@ do_install_ptest () { | |||
50 | } | 56 | } |
51 | 57 | ||
52 | ALTERNATIVE_PRIORITY = "100" | 58 | ALTERNATIVE_PRIORITY = "100" |
53 | ALTERNATIVE_${PN} = "ifup ifdown" | 59 | ALTERNATIVE:${PN} = "ifup ifdown" |
54 | 60 | ||
55 | ALTERNATIVE_LINK_NAME[ifup] = "${base_sbindir}/ifup" | 61 | ALTERNATIVE_LINK_NAME[ifup] = "${base_sbindir}/ifup" |
56 | ALTERNATIVE_LINK_NAME[ifdown] = "${base_sbindir}/ifdown" | 62 | ALTERNATIVE_LINK_NAME[ifdown] = "${base_sbindir}/ifdown" |