[oe-commits] Martin Jansa : Revert "opkg: don't install update-alternatives script"

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 097142518dc85dcf5619502e71aa530199b40e1a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=097142518dc85dcf5619502e71aa530199b40e1a

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Dec  6 18:43:20 2009 +0100

Revert "opkg: don't install update-alternatives script"

* cworth patch applied upstream
* setting u-a provider to opkg will block 2 u-a scripts installed in
  image

This reverts commit 416f6e5f5cfa23f0b3ae731af5c2a1dcd1e27189.

---

 recipes/opkg/opkg.inc                              |    3 +--
 .../opkg/dont-install-update-alternatives.patch    |    6 ------
 2 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc
index d31733d..c973174 100644
--- a/recipes/opkg/opkg.inc
+++ b/recipes/opkg/opkg.inc
@@ -4,14 +4,13 @@ SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "curl gpgme"
 PV = "0.1.6+svnr${SRCPV}"
-INC_PR = "r17"
+INC_PR = "r16"
 
 FILESPATHPKG =. "opkg:"
 
 SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
 	file://opkg_unarchive.patch;patch=1;maxrev=201 \
 	file://opkg-intercept-cleanup.patch;patch=1;maxrev=241 \
-	file://dont-install-update-alternatives.patch;patch=1 \
 "
 
 SRC_URI += "file://configure"
diff --git a/recipes/opkg/opkg/dont-install-update-alternatives.patch b/recipes/opkg/opkg/dont-install-update-alternatives.patch
deleted file mode 100644
index 4ab7707..0000000
--- a/recipes/opkg/opkg/dont-install-update-alternatives.patch
+++ /dev/null
@@ -1,6 +0,0 @@
-diff -uNr trunk.orig/utils/Makefile.am trunk/utils/Makefile.am
---- trunk.orig/utils/Makefile.am	2009-10-24 00:55:25.000000000 +0200
-+++ trunk/utils/Makefile.am	2009-11-11 16:56:00.000000000 +0100
-@@ -1 +1 @@
--bin_SCRIPTS = update-alternatives opkg-key
-+bin_SCRIPTS = opkg-key