[oe-commits] [openembedded-core] 08/20: opkg-utils: Remove unused patches
git at git.openembedded.org
git at git.openembedded.org
Thu Mar 16 10:35:14 UTC 2017
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 859cff4dc0b6426c8524b2136e4dc30044f075b4
Author: Jussi Kukkonen <jussi.kukkonen at intel.com>
AuthorDate: Thu Mar 16 11:15:36 2017 +0200
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.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
...e-defined-bindir-and-mandir-as-installati.patch | 30 ----------------------
...rnatives-warn-when-multiple-providers-hav.patch | 26 -------------------
2 files changed, 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 6259f00..0000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From af4a6e4666264661769e32874e9654e02e5eb019 Mon Sep 17 00:00:00 2001
-From: Alejandro del Castillo <alejandro.delcastillo at 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 at 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
index afce1e1..0000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-warn-when-multiple-providers-hav.patch
+++ /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 at 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
-
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list