Initial commit
This commit is contained in:
Your Name
@@ -0,0 +1,45 @@
|
||||
From 8dfbcf02e424ba1fdef587d81c9e08a37ab8c1b6 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
|
||||
|
||||
Fixes the following compilation errors with musl that does not have
|
||||
FNM_EXTMATCH defined:
|
||||
|
||||
| main.c: In function 'expand_matches':
|
||||
| main.c:700:40: error: 'FNM_EXTMATCH' undeclared (first use in this
|
||||
function); did you mean 'FNM_NOMATCH'?
|
||||
| 700 | if(fnmatch(pattern, ifa->ifa_name, FNM_EXTMATCH))
|
||||
| | ^~~~~~~~~~~~
|
||||
| | FNM_NOMATCH
|
||||
|
||||
and
|
||||
|
||||
| archlinux.c:40:28: error: 'FNM_EXTMATCH' undeclared (first use in this
|
||||
function); did you mean 'FNM_NOMATCH'?
|
||||
| 40 | if(fnmatch(pattern, buf, FNM_EXTMATCH) == 0) {
|
||||
| | ^~~~~~~~~~~~
|
||||
| | 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/archcommon.h b/archcommon.h
|
||||
index 818b0b6..ad9cd1a 100644
|
||||
--- a/archcommon.h
|
||||
+++ b/archcommon.h
|
||||
@@ -1,5 +1,9 @@
|
||||
#include "header.h"
|
||||
|
||||
+#if !defined(FNM_EXTMATCH)
|
||||
+#define FNM_EXTMATCH 0
|
||||
+#endif
|
||||
+
|
||||
bool execable(const char *);
|
||||
|
||||
#define iface_is_link() (!_iface_has(ifd->real_iface, ":."))
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
From 7fe516cbaf9fda09d99dcb54d4645367cffc8a4d 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
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
VERSION ?= 0.8
|
||||
CFLAGS ?= -Wall -W -Wno-unused-parameter -g -O2
|
||||
-ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
|
||||
+ARCH := linux
|
||||
|
||||
BASEDIR ?= $(DESTDIR)
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From 782d8a869c266820d0f34974436f244f67afaea7 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
|
||||
|
||||
The test parameters of testcase(12-15) file is not right,
|
||||
it triggers a test failure, these test items are invalid
|
||||
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/tests/testbuild-linux b/tests/testbuild-linux
|
||||
index 2fa1b8b..2c69856 100755
|
||||
--- a/tests/testbuild-linux
|
||||
+++ b/tests/testbuild-linux
|
||||
@@ -3,7 +3,7 @@
|
||||
dir=tests/linux
|
||||
|
||||
result=true
|
||||
-for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do
|
||||
+for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
|
||||
if [ -e $dir/testcase.$test ]; then
|
||||
args="$(cat $dir/testcase.$test | sed -n 's/^# RUN: //p')"
|
||||
else
|
||||
@@ -0,0 +1 @@
|
||||
d root root 0755 /run/network none
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
From fc8e8d4cb19ff30e69aa1855332544f1017f974c 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
|
||||
|
||||
In yocto we'll always be cross compiling, and we'll always
|
||||
be building on linux for linux (vs. *BSD, hurd, etc.)
|
||||
|
||||
Without this the arch is not detected, but it doesn't error
|
||||
out, and hence you get useless binaries that don't know any
|
||||
arch specific methods, and the end result will be strangeness
|
||||
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 +++---
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/defn2c.pl b/defn2c.pl
|
||||
index fa7a02e..bb4987d 100755
|
||||
--- a/defn2c.pl
|
||||
+++ b/defn2c.pl
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
use strict;
|
||||
|
||||
-my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`;
|
||||
-
|
||||
-$DEB_HOST_ARCH_OS =~ s/\n//;
|
||||
+#my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`;
|
||||
+#$DEB_HOST_ARCH_OS =~ s/\n//;
|
||||
+my $DEB_HOST_ARCH_OS ="linux";
|
||||
|
||||
# declarations
|
||||
my $address_family = "";
|
||||
diff --git a/defn2man.pl b/defn2man.pl
|
||||
index 6ddcfdd..c9c4dd0 100755
|
||||
--- a/defn2man.pl
|
||||
+++ b/defn2man.pl
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
use strict;
|
||||
|
||||
-my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`;
|
||||
-
|
||||
-$DEB_HOST_ARCH_OS =~ s/\n//;
|
||||
+#my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`;
|
||||
+#$DEB_HOST_ARCH_OS =~ s/\n//;
|
||||
+my $DEB_HOST_ARCH_OS = "linux";
|
||||
|
||||
# declarations
|
||||
my $line;
|
||||
@@ -0,0 +1,4 @@
|
||||
#!/bin/sh
|
||||
|
||||
CURDIR=$(dirname `readlink -f $0`)
|
||||
cd $CURDIR/tests && ./testbuild-linux
|
||||
@@ -0,0 +1,57 @@
|
||||
From a6bb2ac5f521c678abbbdb1960d28f750f4357a6 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
|
||||
framework.
|
||||
|
||||
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/tests/testbuild-linux b/tests/testbuild-linux
|
||||
index 2c69856..05f0703 100755
|
||||
--- a/tests/testbuild-linux
|
||||
+++ b/tests/testbuild-linux
|
||||
@@ -1,6 +1,7 @@
|
||||
#!/bin/sh -e
|
||||
|
||||
-dir=tests/linux
|
||||
+curdir=$(dirname `readlink -f $0`)
|
||||
+dir=$curdir/linux
|
||||
|
||||
result=true
|
||||
for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
|
||||
@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
|
||||
echo "Testcase $test: $args"
|
||||
|
||||
exitcode=0
|
||||
- ./ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \
|
||||
+ ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \
|
||||
>$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$?
|
||||
|
||||
(echo "exit code: $exitcode";
|
||||
@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
|
||||
echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test
|
||||
|
||||
exitcode=0
|
||||
- ./ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \
|
||||
+ ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \
|
||||
>$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$?
|
||||
|
||||
(echo "exit code: $exitcode";
|
||||
@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
|
||||
echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test
|
||||
|
||||
if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then
|
||||
- echo "(okay)"
|
||||
+ echo "PASS: $test"
|
||||
else
|
||||
- echo "(failed)"
|
||||
+ echo "FAIL: $test"
|
||||
result=false
|
||||
fi
|
||||
echo "=========="
|
||||
Reference in New Issue
Block a user