diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2010-09-28 15:09:45 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2010-09-28 15:09:45 -0700 |
| commit | ee4a70a8d3832f0c4bae3c002692136e9ff6587f (patch) | |
| tree | 68eb721eb02e40135f34678e1a09a61d79ae3c92 /recipes/quilt | |
| parent | 02634fb85a22a615f969eb918dcec0e03a176c5d (diff) | |
| download | openembedded-ee4a70a8d3832f0c4bae3c002692136e9ff6587f.tar.gz | |
quilt-0.48: Use cp instead of mv for backing up patches.
* mv would not preserve symlinks but cp -a would.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/quilt')
| -rw-r--r-- | recipes/quilt/quilt-0.48/use-cp-for-patch-backup.patch | 22 | ||||
| -rw-r--r-- | recipes/quilt/quilt.inc | 3 |
2 files changed, 24 insertions, 1 deletions
diff --git a/recipes/quilt/quilt-0.48/use-cp-for-patch-backup.patch b/recipes/quilt/quilt-0.48/use-cp-for-patch-backup.patch new file mode 100644 index 0000000000..efd7fd0e20 --- /dev/null +++ b/recipes/quilt/quilt-0.48/use-cp-for-patch-backup.patch @@ -0,0 +1,22 @@ +--- quilt-0.48/quilt.quiltrc.org 2010-09-28 15:00:34.552922490 -0700 ++++ quilt-0.48/quilt.quiltrc 2010-09-28 15:00:52.582375166 -0700 +@@ -24,7 +24,7 @@ QUILT_REFRESH_ARGS="--no-timestamps --ba + #QUILT_PATCHES=patches + + # Prefix all patch names with the relative path to the patch? +-QUILT_PATCHES_PREFIX=yes ++#QUILT_PATCHES_PREFIX=yes + + # Use a specific editor for quilt (defaults to the value of $EDITOR before + # sourcing this configuration file, or vi if $EDITOR wasn't set). +--- quilt-0.48/quilt/refresh.in.org 2010-09-28 14:58:31.844417642 -0700 ++++ quilt-0.48/quilt/refresh.in 2010-09-28 14:59:19.944017265 -0700 +@@ -317,7 +317,7 @@ if [ -e $patch_file ] && \ + then + printf $"Patch %s is unchanged\n" "$(print_patch $patch)" + elif ( [ -z "$QUILT_BACKUP" -o ! -e $patch_file ] || \ +- mv $patch_file $patch_file~ ) && \ ++ cp -a $patch_file $patch_file~ ) && \ + cat_to_new_file $patch_file < $tmp_result + then + if [ -n "$opt_fork" ] diff --git a/recipes/quilt/quilt.inc b/recipes/quilt/quilt.inc index f214f79323..7fd9eac14c 100644 --- a/recipes/quilt/quilt.inc +++ b/recipes/quilt/quilt.inc @@ -2,11 +2,12 @@ DESCRIPTION = "Tool to work with series of patches." HOMEPAGE = "http://savannah.nongnu.org/projects/quilt/" SECTION = "devel" LICENSE = "GPL" -INC_PR = "r6" +INC_PR = "r7" SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \ file://install.patch \ file://no_rm_symlinks.patch \ + file://use-cp-for-patch-backup.patch \ " S = "${WORKDIR}/quilt-${PV}" |