From dad1f5daa715f962a21e940845ed3eb3d89e60334fdd2053095807595ab2924a Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 9 Mar 2015 13:59:16 +0000 Subject: [PATCH] - Workaround bug in patch(1) which does not follow symlinks anymore OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=334 --- libguestfs.changes | 5 +++++ libguestfs.spec | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libguestfs.changes b/libguestfs.changes index af9b0ae..5ab0c17 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 9 13:58:47 UTC 2015 - ohering@suse.de + +- Workaround bug in patch(1) which does not follow symlinks anymore + ------------------------------------------------------------------- Tue Feb 24 09:43:58 UTC 2015 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 0a728cc..3fc09c3 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -731,6 +731,7 @@ a \ ' mkinitrd/scripts/boot-guestfs.sh diff -u mkinitrd/scripts/boot-guestfs.sh~ mkinitrd/scripts/boot-guestfs.sh || : # +pushd mkinitrd patched= for p in \ %{S:1310} \ @@ -742,17 +743,18 @@ for p in \ %{S:1110} \ ; do - if patch --dry-run -p1 < $p + if patch --dry-run -p2 < $p then - patch -p1 < $p + patch -p2 < $p patched=$p break - elif patch --dry-run -R -p1 < $p + elif patch --dry-run -R -p2 < $p then patched=$p break fi done +popd test -n "$patched" ./mkinitrd_setup.sh \