aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2010-09-24 23:34:18 -0700
committerKhem Raj <raj.khem@gmail.com>2010-09-25 10:33:52 -0700
commit190f46585ff733088ddf3bd23e60855c92cab116 (patch)
tree22d961106d55d98056a88a138552d4f4b89a3a41
parentfd24b00618769373deacc8bb1c6032f88822e80d (diff)
downloadopenembedded-190f46585ff733088ddf3bd23e60855c92cab116.tar.gz
openembedded-190f46585ff733088ddf3bd23e60855c92cab116.tar.bz2
openembedded-190f46585ff733088ddf3bd23e60855c92cab116.zip
quilt-0.48: Check if file is a symlink before deleting.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes/quilt/quilt-0.48/no_rm_symlinks.patch31
-rw-r--r--recipes/quilt/quilt.inc2
2 files changed, 15 insertions, 18 deletions
diff --git a/recipes/quilt/quilt-0.48/no_rm_symlinks.patch b/recipes/quilt/quilt-0.48/no_rm_symlinks.patch
index 6c8415acad..7b36d28980 100644
--- a/recipes/quilt/quilt-0.48/no_rm_symlinks.patch
+++ b/recipes/quilt/quilt-0.48/no_rm_symlinks.patch
@@ -3,23 +3,6 @@
#the symlink to be preserved (resulting in the file the link is pointing to
#to be refreshed).
---- quilt-0.48.orig/quilt/scripts/patchfns.in.org 2010-07-09 11:35:07.992300000 -0700
-+++ quilt-0.48/quilt/scripts/patchfns.in 2010-07-09 11:41:01.312300001 -0700
-@@ -783,7 +783,13 @@ cat_to_new_file()
- {
- local filename="$1"
-
-- [ -e "$filename" ] && rm -f "$filename"
-+ if [ -e "$filename" ]
-+ then
-+ if [ "$QUILT_NO_RM_SYMLINKS" != "yes" ]
-+ then
-+ rm -f "$filename"
-+ fi
-+ fi
-
- case "$filename" in
- *.gz)
--- quilt-0.48.orig/quilt.quiltrc.org 2010-07-09 11:45:07.582300001 -0700
+++ quilt-0.48/quilt.quiltrc 2010-07-09 11:46:35.222300001 -0700
@@ -29,3 +29,9 @@ QUILT_PATCHES_PREFIX=yes
@@ -32,3 +15,17 @@
+#to be refreshed).
+QUILT_NO_RM_SYMLINKS=yes
+
+--- quilt-0.48/quilt/scripts/patchfns.in.org 2010-09-24 23:18:14.055834001 -0700
++++ quilt-0.48/quilt/scripts/patchfns.in 2010-09-24 23:20:07.365834001 -0700
+@@ -783,7 +783,10 @@ cat_to_new_file()
+ {
+ local filename="$1"
+
+- [ -e "$filename" ] && rm -f "$filename"
++ if [ -L "$filename" -a "$QUILT_NO_RM_SYMLINKS" != "yes" ]
++ then
++ rm -f "$filename"
++ fi
+
+ case "$filename" in
+ *.gz)
diff --git a/recipes/quilt/quilt.inc b/recipes/quilt/quilt.inc
index ac657fb433..f214f79323 100644
--- a/recipes/quilt/quilt.inc
+++ b/recipes/quilt/quilt.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Tool to work with series of patches."
HOMEPAGE = "http://savannah.nongnu.org/projects/quilt/"
SECTION = "devel"
LICENSE = "GPL"
-INC_PR = "r5"
+INC_PR = "r6"
SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \
file://install.patch \