From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Egger <chegger@amazon.de>
Subject: [PATCH] tools/pygrub: do not override pygrub with a
	symbolic link
Date: Mon, 22 Apr 2013 13:50:18 +0200
Message-ID: <517523FA.7050303@amazon.de>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------080408030805020308010300"
Return-path: <xen-devel-bounces@lists.xen.org>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: xen-devel <xen-devel@lists.xen.org>, Ian Campbell <Ian.Campbell@citrix.com>
List-Id: xen-devel@lists.xenproject.org

--------------080408030805020308010300
Content-Type: text/plain; charset="ISO-8859-1"
Content-Transfer-Encoding: 7bit

tools/pygrub: Do not override pygrub with a symbolic link if $(BINDIR) and $(PRIVATE_BINDIR) are the same.

Signed-off-by: Christoph Egger <chegger@amazon.de>
diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index 039f7f7..c3b34d7 100644
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -15,8 +15,8 @@ install: all
 		--install-scripts=$(PRIVATE_BINDIR) --force
 	$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
 	set -e; if [ "`readlink -f $(DESTDIR)/$(BINDIR)`" != \
-	             "`readlink -f $(PRIVATE_BINDIR)`" ]; then \
-	    ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
+	             "`readlink -f $(DESTDIR)/$(PRIVATE_BINDIR)`" ]; then \
+	    ln -sf $(DESTDIR)/$(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
 	fi
 
 .PHONY: clean

--------------080408030805020308010300
Content-Type: text/plain; charset="UTF-8"; name="patch_pygrub.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="patch_pygrub.diff"

commit 78128508937af187889806b9be3de0d49b8915fa
Author: Christoph Egger <chegger@amazon.de>
Date:   Fri Feb 8 12:44:12 2013 +0000

    tools/pygrub: Do not override pygrub with a symbolic link if $(BINDIR)
    and $(PRIVATE_BINDIR) are the same.
    
    Signed-off-by: Christoph Egger <chegger@amazon.de>

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index 039f7f7..c3b34d7 100644
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -15,8 +15,8 @@ install: all
 		--install-scripts=$(PRIVATE_BINDIR) --force
 	$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
 	set -e; if [ "`readlink -f $(DESTDIR)/$(BINDIR)`" != \
-	             "`readlink -f $(PRIVATE_BINDIR)`" ]; then \
-	    ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
+	             "`readlink -f $(DESTDIR)/$(PRIVATE_BINDIR)`" ]; then \
+	    ln -sf $(DESTDIR)/$(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
 	fi
 
 .PHONY: clean

--------------080408030805020308010300
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

--------------080408030805020308010300--