mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
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>
This commit is contained in:
George Dunlap committed
1 parent
2f9fd22f50
commit
0bf9ce4062
8 files changed
+16
-8
No files matched your search
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||