From: George Dunlap <george.dunlap@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: george.dunlap@eu.citrix.com
Subject: [PATCH] Revert c/s 25150:b490ef93bad7 tools/libfsimage: include Rules.mk first
Date: Fri, 13 Apr 2012 14:21:41 +0100 [thread overview]
Message-ID: <686ba604624db0796ce7.1334323301@kodo2> (raw)
tools/libfsimage/Rules.mk relies on having certain variables set already; if
they're not set, the definitions dont' work right. The result was a bunch
of empty files and pygrub failing with an uninformative error message.
It's likely that this didn't cause anyone problems becasue changing the
Makefiles didn't cause a re-build; building from a fresh repo results in
completely empty filesystem plugin binaries.
Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
diff -r cbd10b2ee64f -r 686ba604624d tools/libfsimage/ext2fs-lib/Makefile
--- a/tools/libfsimage/ext2fs-lib/Makefile Fri Apr 13 13:35:25 2012 +0100
+++ b/tools/libfsimage/ext2fs-lib/Makefile Fri Apr 13 14:21:25 2012 +0100
@@ -1,5 +1,4 @@
XEN_ROOT = $(CURDIR)/../../..
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk
LIB_SRCS-y = ext2fs-lib.c
@@ -12,3 +11,5 @@ all: fs-all
.PHONY: install
install: fs-install
+
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
diff -r cbd10b2ee64f -r 686ba604624d tools/libfsimage/ext2fs/Makefile
--- a/tools/libfsimage/ext2fs/Makefile Fri Apr 13 13:35:25 2012 +0100
+++ b/tools/libfsimage/ext2fs/Makefile Fri Apr 13 14:21:25 2012 +0100
@@ -1,5 +1,4 @@
XEN_ROOT = $(CURDIR)/../../..
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk
LIB_SRCS-y = fsys_ext2fs.c
@@ -10,3 +9,5 @@ all: fs-all
.PHONY: install
install: fs-install
+
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
diff -r cbd10b2ee64f -r 686ba604624d tools/libfsimage/fat/Makefile
--- a/tools/libfsimage/fat/Makefile Fri Apr 13 13:35:25 2012 +0100
+++ b/tools/libfsimage/fat/Makefile Fri Apr 13 14:21:25 2012 +0100
@@ -1,5 +1,4 @@
XEN_ROOT = $(CURDIR)/../../..
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk
LIB_SRCS-y = fsys_fat.c
@@ -10,3 +9,5 @@ all: fs-all
.PHONY: install
install: fs-install
+
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
diff -r cbd10b2ee64f -r 686ba604624d tools/libfsimage/iso9660/Makefile
--- a/tools/libfsimage/iso9660/Makefile Fri Apr 13 13:35:25 2012 +0100
+++ b/tools/libfsimage/iso9660/Makefile Fri Apr 13 14:21:25 2012 +0100
@@ -1,5 +1,4 @@
XEN_ROOT = $(CURDIR)/../../..
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk
LIB_SRCS-y = fsys_iso9660.c
@@ -12,3 +11,5 @@ all: fs-all
install: fs-install
fsys_iso9660.c: iso9660.h
+
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
diff -r cbd10b2ee64f -r 686ba604624d tools/libfsimage/reiserfs/Makefile
--- a/tools/libfsimage/reiserfs/Makefile Fri Apr 13 13:35:25 2012 +0100
+++ b/tools/libfsimage/reiserfs/Makefile Fri Apr 13 14:21:25 2012 +0100
@@ -1,5 +1,4 @@
XEN_ROOT = $(CURDIR)/../../..
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk
LIB_SRCS-y = fsys_reiserfs.c
@@ -10,3 +9,5 @@ all: fs-all
.PHONY: install
install: fs-install
+
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
diff -r cbd10b2ee64f -r 686ba604624d tools/libfsimage/ufs/Makefile
--- a/tools/libfsimage/ufs/Makefile Fri Apr 13 13:35:25 2012 +0100
+++ b/tools/libfsimage/ufs/Makefile Fri Apr 13 14:21:25 2012 +0100
@@ -1,5 +1,4 @@
XEN_ROOT = $(CURDIR)/../../..
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk
LIB_SRCS-y = fsys_ufs.c
@@ -10,3 +9,5 @@ all: fs-all
.PHONY: install
install: fs-install
+
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
diff -r cbd10b2ee64f -r 686ba604624d tools/libfsimage/xfs/Makefile
--- a/tools/libfsimage/xfs/Makefile Fri Apr 13 13:35:25 2012 +0100
+++ b/tools/libfsimage/xfs/Makefile Fri Apr 13 14:21:25 2012 +0100
@@ -1,5 +1,4 @@
XEN_ROOT = $(CURDIR)/../../..
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk
LIB_SRCS-y = fsys_xfs.c
@@ -10,3 +9,5 @@ all: fs-all
.PHONY: install
install: fs-install
+
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
diff -r cbd10b2ee64f -r 686ba604624d tools/libfsimage/zfs/Makefile
--- a/tools/libfsimage/zfs/Makefile Fri Apr 13 13:35:25 2012 +0100
+++ b/tools/libfsimage/zfs/Makefile Fri Apr 13 14:21:25 2012 +0100
@@ -23,7 +23,6 @@
#
XEN_ROOT = $(CURDIR)/../../..
-include $(XEN_ROOT)/tools/libfsimage/Rules.mk
CFLAGS += -DFSYS_ZFS -DFSIMAGE -I$(XEN_ROOT)/tools/libfsimage/zfs
LIB_SRCS-y = zfs_lzjb.c zfs_sha256.c zfs_fletcher.c fsi_zfs.c fsys_zfs.c
@@ -35,3 +34,5 @@ all: fs-all
.PHONY: install
install: fs-install
+
+include $(XEN_ROOT)/tools/libfsimage/Rules.mk
next reply other threads:[~2012-04-13 13:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-13 13:21 George Dunlap [this message]
2012-04-13 18:27 ` [PATCH] Revert c/s 25150:b490ef93bad7 tools/libfsimage: include Rules.mk first Ian Jackson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=686ba604624db0796ce7.1334323301@kodo2 \
--to=george.dunlap@eu.citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).