[oe] [PATCH 06/51] opkg: don't install update-alternatives script

[Martin Jansa]

* it is copy of update-alternatives-cworth
* it's not what distribution specifies with
  virtual/update-alternatives(-native)
* make sure that update-alternatives-native is available for image
  creation (added to task-boot)
---
 recipes/opkg/opkg.inc                              |    5 +++--
 .../opkg/dont-install-update-alternatives.patch    |    6 ++++++
 recipes/tasks/task-boot.bb                         |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 recipes/opkg/opkg/dont-install-update-alternatives.patch

diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc
index d744e72..3b4cc35 100644
--- a/recipes/opkg/opkg.inc
+++ b/recipes/opkg/opkg.inc
@@ -4,14 +4,15 @@ SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "curl gpgme"
 PV = "0.1.6+svnr${SRCPV}"
-INC_PR = "r16"
+INC_PR = "r17"
 
 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 \
-	file://isatty.patch;patch=1"
+	file://isatty.patch;patch=1 \
+	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
new file mode 100644
index 0000000..4ab7707
--- /dev/null
+++ b/recipes/opkg/opkg/dont-install-update-alternatives.patch
@@ -0,0 +1,6 @@
+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
diff --git a/recipes/tasks/task-boot.bb b/recipes/tasks/task-boot.bb
index 1a1b9f2..bdba970 100644
--- a/recipes/tasks/task-boot.bb
+++ b/recipes/tasks/task-boot.bb
@@ -14,7 +14,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 
 # Make sure we build the kernel
-DEPENDS = "virtual/kernel"
+DEPENDS = "virtual/kernel virtual/update-alternatives-native"
 
 #
 # minimal set of packages - needed to boot
-- 
1.6.5.3