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/zfs | |
| 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/zfs')
| -rw-r--r-- | tools/libfsimage/zfs/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
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 |