Hi, As Ian Jackson asked I am sending build system fixes based on patches applied a few weeks ago to Xen unstable. Earlier patches which did not required any changes were applied to Xen 4.1.6. This patch series contains only applicable patches which must be modified to be applied. List of patches: - stubdom: Clean extras/mini-os directory during make clean, - stubdom: Do not create dangling links, - Silently ignore include errors during make distclean. Daniel
Daniel Kiper
2013-Jul-24 14:06 UTC
[PATCH 1/3] stubdom: Clean extras/mini-os directory during make clean
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> (based on commit 2bf87074e17e77ca761e3490e5f054175e082e5b) --- stubdom/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/stubdom/Makefile b/stubdom/Makefile index 938fc0a..e7db7b5 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -390,6 +390,7 @@ clean: rm -fr mini-os-$(XEN_TARGET_ARCH)-c rm -fr mini-os-$(XEN_TARGET_ARCH)-caml rm -fr mini-os-$(XEN_TARGET_ARCH)-grub + $(MAKE) DESTDIR= -C $(MINI_OS) clean $(CROSS_MAKE) -C caml clean $(CROSS_MAKE) -C c clean rm -fr grub-$(XEN_TARGET_ARCH) -- 1.7.10.4
There is not architecture dependent files in libxc hence do not create dangling links. Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> (based on commit c2eea87c43d1617b2c15c57fce9a64a436679fca) --- stubdom/Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index e7db7b5..303416e 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -257,11 +257,6 @@ mk-headers-$(XEN_TARGET_ARCH): ioemu/linkfarm.stamp ln -sf $(XEN_ROOT)/tools/libxc/*.h . && \ ln -sf $(XEN_ROOT)/tools/libxc/*.c . && \ ln -sf $(XEN_ROOT)/tools/libxc/Makefile . ) - mkdir -p libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH) - [ -h libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH) ] || ( cd libxc-$(XEN_TARGET_ARCH)/$(XEN_TARGET_ARCH) && \ - ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.c . && \ - ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/*.h . && \ - ln -sf $(XEN_ROOT)/tools/libxc/$(XEN_TARGET_ARCH)/Makefile . ) $(CROSS_MAKE) -C $(MINI_OS) links touch mk-headers-$(XEN_TARGET_ARCH) -- 1.7.10.4
Daniel Kiper
2013-Jul-24 14:06 UTC
[PATCH 3/3] Silently ignore include errors during make distclean
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> (based on commit 38aabce5424710badc080decca23628442d80673) --- buildconfigs/mk.linux-2.6-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildconfigs/mk.linux-2.6-common b/buildconfigs/mk.linux-2.6-common index f3680f0..e8e97fb 100644 --- a/buildconfigs/mk.linux-2.6-common +++ b/buildconfigs/mk.linux-2.6-common @@ -29,7 +29,7 @@ LINUX_VER3 := $(LINUX_SERIES).$(word 3, $(subst ., ,$(LINUX_VER))) .PHONY: _build _build: build -include buildconfigs/src.$(XEN_LINUX_SOURCE) +-include buildconfigs/src.$(XEN_LINUX_SOURCE) LINUX_ARCH = $$(sh buildconfigs/select-linux-arch $(LINUX_SRCDIR)) IMAGE_PATH = $$(sh buildconfigs/select-linux-image $(LINUX_DIR) $(LINUX_ARCH) $(IMAGE_TARGET)) -- 1.7.10.4