diff options
Diffstat (limited to 'meta/recipes-devtools/opkg-utils')
2 files changed, 0 insertions, 56 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch deleted file mode 100644 index 6259f0086f..0000000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From af4a6e4666264661769e32874e9654e02e5eb019 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alejandro del Castillo <alejandro.delcastillo@ni.com> | ||
3 | Date: Thu, 22 Dec 2016 16:15:56 -0600 | ||
4 | Subject: [opkg-utils PATCH] Makefile: use defined bindir and mandir as | ||
5 | installation dirs | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com> | ||
10 | --- | ||
11 | Makefile | 3 --- | ||
12 | 1 file changed, 3 deletions(-) | ||
13 | |||
14 | diff --git a/Makefile b/Makefile | ||
15 | index 92b45f1..9f0531c 100644 | ||
16 | --- a/Makefile | ||
17 | +++ b/Makefile | ||
18 | @@ -5,9 +5,6 @@ UTILS = opkg-build opkg-unbuild opkg-make-index opkg.py opkg-list-fields \ | ||
19 | MANPAGES = opkg-build.1 | ||
20 | |||
21 | DESTDIR= | ||
22 | -PREFIX=/usr/local | ||
23 | -bindir=$(PREFIX)/bin | ||
24 | -mandir=$(PREFIX)/man | ||
25 | |||
26 | .SUFFIXES: .1 | ||
27 | |||
28 | -- | ||
29 | 2.7.4 | ||
30 | |||
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch deleted file mode 100644 index afce1e1cc2..0000000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Subject: update-alternatives: warn when multiple providers have the same priority | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
6 | --- | ||
7 | update-alternatives | 3 +++ | ||
8 | 1 file changed, 3 insertions(+) | ||
9 | |||
10 | diff --git a/update-alternatives b/update-alternatives | ||
11 | index ca01d5d..ffad853 100644 | ||
12 | --- a/update-alternatives | ||
13 | +++ b/update-alternatives | ||
14 | @@ -90,6 +90,9 @@ add_alt() { | ||
15 | local path="$2" | ||
16 | local priority="$3" | ||
17 | remove_alt $name $path | ||
18 | + if grep -qw "$priority" $ad/$name; then | ||
19 | + echo "Warn: update-alternatives: $name has multiple providers with the same priority, please check $ad/$name for details" | ||
20 | + fi | ||
21 | echo "$path $priority" >> $ad/$name | ||
22 | } | ||
23 | |||
24 | -- | ||
25 | 2.8.3 | ||
26 | |||