* [PATCH] Revert c/s 25150:b490ef93bad7 tools/libfsimage: include Rules.mk first
@ 2012-04-13 13:21 George Dunlap
2012-04-13 18:27 ` Ian Jackson
0 siblings, 1 reply; 2+ messages in thread
From: George Dunlap @ 2012-04-13 13:21 UTC (permalink / raw)
To: xen-devel; +Cc: george.dunlap
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Revert c/s 25150:b490ef93bad7 tools/libfsimage: include Rules.mk first
2012-04-13 13:21 [PATCH] Revert c/s 25150:b490ef93bad7 tools/libfsimage: include Rules.mk first George Dunlap
@ 2012-04-13 18:27 ` Ian Jackson
0 siblings, 0 replies; 2+ messages in thread
From: Ian Jackson @ 2012-04-13 18:27 UTC (permalink / raw)
To: George Dunlap; +Cc: Olaf Hering, xen-devel
George Dunlap writes ("[Xen-devel] [PATCH] Revert c/s 25150:b490ef93bad7 tools/libfsimage: include Rules.mk first"):
> 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>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
CCing Olaf, as he's the author of 25150.
Ian.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-04-13 18:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-13 13:21 [PATCH] Revert c/s 25150:b490ef93bad7 tools/libfsimage: include Rules.mk first George Dunlap
2012-04-13 18:27 ` Ian Jackson
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).