opkg-utils: Remove unused patches
0001-update-alternatives-warn-when-multiple-providers-hav.patch was removed from SRC_URI without mention in commit 60c9a9704. 001-Makefile-use-defined-bindir-and-mandir-as-installati.patch was removed from SRC_URI in d6b04e121. Current opkg does not need either patch. (From OE-Core rev: 789ec510495ca6eab379ec829e3013c977236966) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
f3d8addbef
commit
f751a52a58
|
@ -1,30 +0,0 @@
|
||||||
From af4a6e4666264661769e32874e9654e02e5eb019 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
|
|
||||||
Date: Thu, 22 Dec 2016 16:15:56 -0600
|
|
||||||
Subject: [opkg-utils PATCH] Makefile: use defined bindir and mandir as
|
|
||||||
installation dirs
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
|
|
||||||
---
|
|
||||||
Makefile | 3 ---
|
|
||||||
1 file changed, 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index 92b45f1..9f0531c 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -5,9 +5,6 @@ UTILS = opkg-build opkg-unbuild opkg-make-index opkg.py opkg-list-fields \
|
|
||||||
MANPAGES = opkg-build.1
|
|
||||||
|
|
||||||
DESTDIR=
|
|
||||||
-PREFIX=/usr/local
|
|
||||||
-bindir=$(PREFIX)/bin
|
|
||||||
-mandir=$(PREFIX)/man
|
|
||||||
|
|
||||||
.SUFFIXES: .1
|
|
||||||
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
Subject: update-alternatives: warn when multiple providers have the same priority
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
|
||||||
---
|
|
||||||
update-alternatives | 3 +++
|
|
||||||
1 file changed, 3 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/update-alternatives b/update-alternatives
|
|
||||||
index ca01d5d..ffad853 100644
|
|
||||||
--- a/update-alternatives
|
|
||||||
+++ b/update-alternatives
|
|
||||||
@@ -90,6 +90,9 @@ add_alt() {
|
|
||||||
local path="$2"
|
|
||||||
local priority="$3"
|
|
||||||
remove_alt $name $path
|
|
||||||
+ if grep -qw "$priority" $ad/$name; then
|
|
||||||
+ echo "Warn: update-alternatives: $name has multiple providers with the same priority, please check $ad/$name for details"
|
|
||||||
+ fi
|
|
||||||
echo "$path $priority" >> $ad/$name
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.8.3
|
|
||||||
|
|
Loading…
Reference in New Issue