diff options
| author | George Dunlap <george.dunlap@eu.citrix.com> | 2012-04-13 17:13:01 +0100 |
|---|---|---|
| committer | George Dunlap <george.dunlap@eu.citrix.com> | 2012-04-13 17:13:01 +0100 |
| commit | 0bf9ce40626117fa21559547b751dcb67e1acf2d (patch) | |
| tree | 4f8d6b4820b2511203315c7f421f722d7de55afd /tools/libfsimage | |
| parent | 2f9fd22f509da9ab5135c602892712bec07d8631 (diff) | |
| download | xen-0bf9ce40626117fa21559547b751dcb67e1acf2d.tar.gz xen-0bf9ce40626117fa21559547b751dcb67e1acf2d.tar.bz2 xen-0bf9ce40626117fa21559547b751dcb67e1acf2d.zip | |
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@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/libfsimage')
| -rw-r--r-- | tools/libfsimage/ext2fs-lib/Makefile | 3 | ||||
| -rw-r--r-- | tools/libfsimage/ext2fs/Makefile | 3 | ||||
| -rw-r--r-- | tools/libfsimage/fat/Makefile | 3 | ||||
| -rw-r--r-- | tools/libfsimage/iso9660/Makefile | 3 | ||||
| -rw-r--r-- | tools/libfsimage/reiserfs/Makefile | 3 | ||||
| -rw-r--r-- | tools/libfsimage/ufs/Makefile | 3 | ||||
| -rw-r--r-- | tools/libfsimage/xfs/Makefile | 3 | ||||
| -rw-r--r-- | tools/libfsimage/zfs/Makefile | 3 |
8 files changed, 16 insertions, 8 deletions
diff --git a/tools/libfsimage/ext2fs-lib/Makefile b/tools/libfsimage/ext2fs-lib/Makefile index 957279db6a..142207f63b 100644 --- a/tools/libfsimage/ext2fs-lib/Makefile +++ b/tools/libfsimage/ext2fs-lib/Makefile @@ -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 --git a/tools/libfsimage/ext2fs/Makefile b/tools/libfsimage/ext2fs/Makefile index 714651eccd..8ff4c71a1c 100644 --- a/tools/libfsimage/ext2fs/Makefile +++ b/tools/libfsimage/ext2fs/Makefile @@ -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 --git a/tools/libfsimage/fat/Makefile b/tools/libfsimage/fat/Makefile index 950181b403..2911a0e0e7 100644 --- a/tools/libfsimage/fat/Makefile +++ b/tools/libfsimage/fat/Makefile @@ -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 --git a/tools/libfsimage/iso9660/Makefile b/tools/libfsimage/iso9660/Makefile index c07183ba3e..4096cafa0c 100644 --- a/tools/libfsimage/iso9660/Makefile +++ b/tools/libfsimage/iso9660/Makefile @@ -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 --git a/tools/libfsimage/reiserfs/Makefile b/tools/libfsimage/reiserfs/Makefile index 6f01e06a28..57f286b256 100644 --- a/tools/libfsimage/reiserfs/Makefile +++ b/tools/libfsimage/reiserfs/Makefile @@ -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 --git a/tools/libfsimage/ufs/Makefile b/tools/libfsimage/ufs/Makefile index 116edd6b16..c1371080f5 100644 --- a/tools/libfsimage/ufs/Makefile +++ b/tools/libfsimage/ufs/Makefile @@ -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 --git a/tools/libfsimage/xfs/Makefile b/tools/libfsimage/xfs/Makefile index ce39ce5b24..6580007404 100644 --- a/tools/libfsimage/xfs/Makefile +++ b/tools/libfsimage/xfs/Makefile @@ -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 --git a/tools/libfsimage/zfs/Makefile b/tools/libfsimage/zfs/Makefile index 89a5e6e024..9fb0aabe78 100644 --- a/tools/libfsimage/zfs/Makefile +++ b/tools/libfsimage/zfs/Makefile @@ -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 |