From: Rene Wagner <rw@handhelds.org>
Date: Wed, 16 Aug 2006 12:51:09 +0000 (+0200)
Subject: ipkg-utils-native: allow dangling symlinks as conffile (/etc/resolv.conf)
X-Git-Tag: familiar-v0.8.4~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=eaaf68a14ff9d8d7e6f481bd64ff93e7d4651a2d;p=familiar-h63xx-build.git

ipkg-utils-native: allow dangling symlinks as conffile (/etc/resolv.conf)

Signed-off-by: Rene Wagner <rw@handhelds.org>
---

diff --git a/org.handhelds.familiar/packages/ipkg-utils/files/dangling-symlinks.patch b/org.handhelds.familiar/packages/ipkg-utils/files/dangling-symlinks.patch
new file mode 100644
index 0000000..a73c6ea
--- /dev/null
+++ b/org.handhelds.familiar/packages/ipkg-utils/files/dangling-symlinks.patch
@@ -0,0 +1,11 @@
+--- bin/ipkg-build.orig	2006-08-16 13:08:22.000000000 +0200
++++ bin/ipkg-build	2006-08-16 13:08:25.000000000 +0200
+@@ -141,7 +141,7 @@
+ 
+ 	if [ -f $CONTROL/conffiles ]; then
+ 		for cf in `cat $CONTROL/conffiles`; do
+-			if [ ! -f ./$cf ]; then
++			if [ ! -L ./$cf -a ! -f ./$cf ]; then
+ 				echo "*** Error: $CONTROL/conffiles mentions conffile $cf which does not exist" >&2
+ 				PKG_ERROR=1
+ 			fi
diff --git a/org.handhelds.familiar/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb b/org.handhelds.familiar/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb
index 2506dba..42857db 100644
--- a/org.handhelds.familiar/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb
+++ b/org.handhelds.familiar/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb
@@ -1,9 +1,11 @@
 SECTION = "base"
 include ipkg-utils_${PV}.bb
-PR = "r4"
+PR = "r5"
 inherit native
 DEPENDS = ""
 
+SRC_URI += "file://dangling-symlinks.patch;patch=1"
+
 do_stage() {
         for i in ${INSTALL}; do
                 install -m 0755 $i ${STAGING_BINDIR}