]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
opkg-utils: Remove unused patches
authorJussi Kukkonen <jussi.kukkonen@intel.com>
Thu, 16 Mar 2017 09:15:36 +0000 (11:15 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 16 Mar 2017 22:11:14 +0000 (22:11 +0000)
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.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch [deleted file]
meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch [deleted file]

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 (file)
index 6259f00..0000000
+++ /dev/null
@@ -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
-
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 (file)
index afce1e1..0000000
+++ /dev/null
@@ -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
-