[oe-commits] Martin Jansa : update-alternatives-cworth: fix link&directory check, add virtual to task-boot to build it before any image

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Nov 13 19:22:46 2009 +0100

update-alternatives-cworth: fix link&directory check, add virtual to task-boot to build it before any image

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/tasks/task-boot.bb                         |    2 +-
 .../update-alternatives-cworth.inc                 |    2 +-
 .../update-alternatives.use.last.patch             |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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
diff --git a/recipes/update-alternatives/update-alternatives-cworth.inc b/recipes/update-alternatives/update-alternatives-cworth.inc
index 3c1b2e6..e53e9dd 100644
--- a/recipes/update-alternatives/update-alternatives-cworth.inc
+++ b/recipes/update-alternatives/update-alternatives-cworth.inc
@@ -5,4 +5,4 @@ SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVa
 S = "${WORKDIR}/ipkg/C"
 PACKAGE_ARCH = "all"
 
-PR = "r1"
+PR = "r2"
diff --git a/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch b/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch
index c23c4f8..7bd5bd2 100644
--- a/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch
+++ b/recipes/update-alternatives/update-alternatives-cworth/update-alternatives.use.last.patch
@@ -24,7 +24,7 @@ diff -uNr C.orig/update-alternatives C/update-alternatives
  		if [ ! -d $link_dir ]; then
  			mkdir -p $link_dir
  		fi
-+		if [ -h $link ]; then
++		if [ -h $link -a -d $link ]; then
 +			# if $link exists and the target is directory, than ln -sf $path $link, doesn't replace link to that directory, but creates new link inside
 +			echo "update-alternatives: Removing $link"
 +			rm -f $link