patchbot at xen
Apr 14, 2012, 1:44 PM
Post #1 of 1
(43 views)
Permalink
|
|
[xen-unstable] tools: Revert c/s 25150:b490ef93bad7 tools/libfsimage: include Rules.mk first
|
|
# HG changeset patch
# User George Dunlap <george.dunlap [at] eu>
# Date 1334333581 -3600
# Node ID 6b72eb3b40cf2b3d5a6c75d68fa7093c57fc0d1f
# Parent c6bde42c8845439183336602a78bc07869f3651b
tools: 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 [at] eu>
Committed-by: Ian Jackson <ian.jackson [at] eu>
---
diff -r c6bde42c8845 -r 6b72eb3b40cf tools/libfsimage/ext2fs-lib/Makefile
--- a/tools/libfsimage/ext2fs-lib/Makefile Thu Apr 12 14:01:27 2012 +0100
+++ b/tools/libfsimage/ext2fs-lib/Makefile Fri Apr 13 17:13:01 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 c6bde42c8845 -r 6b72eb3b40cf tools/libfsimage/ext2fs/Makefile
--- a/tools/libfsimage/ext2fs/Makefile Thu Apr 12 14:01:27 2012 +0100
+++ b/tools/libfsimage/ext2fs/Makefile Fri Apr 13 17:13:01 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 c6bde42c8845 -r 6b72eb3b40cf tools/libfsimage/fat/Makefile
--- a/tools/libfsimage/fat/Makefile Thu Apr 12 14:01:27 2012 +0100
+++ b/tools/libfsimage/fat/Makefile Fri Apr 13 17:13:01 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 c6bde42c8845 -r 6b72eb3b40cf tools/libfsimage/iso9660/Makefile
--- a/tools/libfsimage/iso9660/Makefile Thu Apr 12 14:01:27 2012 +0100
+++ b/tools/libfsimage/iso9660/Makefile Fri Apr 13 17:13:01 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 c6bde42c8845 -r 6b72eb3b40cf tools/libfsimage/reiserfs/Makefile
--- a/tools/libfsimage/reiserfs/Makefile Thu Apr 12 14:01:27 2012 +0100
+++ b/tools/libfsimage/reiserfs/Makefile Fri Apr 13 17:13:01 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 c6bde42c8845 -r 6b72eb3b40cf tools/libfsimage/ufs/Makefile
--- a/tools/libfsimage/ufs/Makefile Thu Apr 12 14:01:27 2012 +0100
+++ b/tools/libfsimage/ufs/Makefile Fri Apr 13 17:13:01 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 c6bde42c8845 -r 6b72eb3b40cf tools/libfsimage/xfs/Makefile
--- a/tools/libfsimage/xfs/Makefile Thu Apr 12 14:01:27 2012 +0100
+++ b/tools/libfsimage/xfs/Makefile Fri Apr 13 17:13:01 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 c6bde42c8845 -r 6b72eb3b40cf tools/libfsimage/zfs/Makefile
--- a/tools/libfsimage/zfs/Makefile Thu Apr 12 14:01:27 2012 +0100
+++ b/tools/libfsimage/zfs/Makefile Fri Apr 13 17:13:01 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
_______________________________________________
Xen-changelog mailing list
Xen-changelog [at] lists
http://lists.xensource.com/xen-changelog
|
