ChangeSet 1.1442, 2005/05/12 20:09:17+01:00, cl349@xxxxxxxxxxxxxxxxxxxx
Merge Makefile changes.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>
Makefile | 10 ++++++----
buildconfigs/Rules.mk | 6 ++++++
buildconfigs/mk.linux-2.4-xen0 | 5 +++++
buildconfigs/mk.linux-2.4-xenU | 5 +++++
buildconfigs/mk.linux-2.6-xen0 | 6 +++++-
buildconfigs/mk.linux-2.6-xenU | 6 +++++-
6 files changed, 32 insertions(+), 6 deletions(-)
diff -Nru a/Makefile b/Makefile
--- a/Makefile 2005-05-12 19:04:21 -04:00
+++ b/Makefile 2005-05-12 19:04:21 -04:00
@@ -20,11 +20,12 @@
export DESTDIR
# Export target architecture overrides to Xen and Linux sub-trees.
-ifneq ($(TARGET_ARCH),)
-SUBARCH := $(subst x86_32,i386,$(TARGET_ARCH))
-export TARGET_ARCH SUBARCH
+ifneq ($(XEN_TARGET_ARCH),)
+SUBARCH := $(subst x86_32,i386,$(XEN_TARGET_ARCH))
+export XEN_TARGET_ARCH SUBARCH
endif
+include Config.mk
include buildconfigs/Rules.mk
.PHONY: all dist install xen tools kernels docs world clean mkpatches
mrproper
@@ -159,7 +160,7 @@
uninstall:
[ ! -d $(D)/etc/xen ] || mv -f $(D)/etc/xen $(D)/etc/xen.old
rm -rf $(D)/etc/init.d/xend*
- rm -rf $(D)/usr/lib/libxc* $(D)/usr/lib/libxutil*
+ rm -rf $(D)/usr/$(LIBDIR)/libxc* $(D)/usr/$(LIBDIR)/libxutil*
rm -rf $(D)/usr/lib/python/xen $(D)/usr/include/xen
rm -rf $(D)/usr/include/xcs_proto.h $(D)/usr/include/xc.h
rm -rf $(D)/usr/sbin/xcs $(D)/usr/sbin/xcsdump $(D)/usr/sbin/xen*
@@ -168,6 +169,7 @@
rm -rf $(D)/usr/share/doc/xen $(D)/usr/man/man*/xentrace*
rm -rf $(D)/usr/bin/xen* $(D)/usr/bin/miniterm
rm -rf $(D)/boot/*xen*
+ rm -rf $(D)/lib/modules/*xen*
# Legacy targets for compatibility
linux24:
diff -Nru a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
--- a/buildconfigs/Rules.mk 2005-05-12 19:04:21 -04:00
+++ b/buildconfigs/Rules.mk 2005-05-12 19:04:21 -04:00
@@ -1,4 +1,6 @@
+include Config.mk
+
# We expect these two to already be set if people
# are using the top-level Makefile
DISTDIR ?= $(CURDIR)/dist
@@ -53,6 +55,7 @@
$(patsubst %,pristine-%/.valid-pristine,$(ALLSPARSETREES)) :
pristine-%/.valid-pristine: %.tar.bz2
rm -rf tmp-pristine-$* $(@D)
mkdir -p tmp-pristine-$*
+ touch $@/.bk_skip
tar -C tmp-pristine-$* -jxf $<
mv tmp-pristine-$*/* $(@D)
@rm -rf tmp-pristine-$*
@@ -83,6 +86,9 @@
%-clean:
$(MAKE) -f buildconfigs/mk.$* clean
+
+%-config:
+ $(MAKE) -f buildconfigs/mk.$* config
%-xen.patch: ref-%/.valid-ref
rm -rf tmp-$@
diff -Nru a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0
--- a/buildconfigs/mk.linux-2.4-xen0 2005-05-12 19:04:21 -04:00
+++ b/buildconfigs/mk.linux-2.4-xen0 2005-05-12 19:04:21 -04:00
@@ -45,6 +45,11 @@
make -C $(LINUX_DIR) ARCH=xen oldconfig
make -C $(LINUX_DIR) ARCH=xen dep
+config: CONFIGMODE = menuconfig
+config: $(LINUX_DIR)/include/linux/autoconf.h
+ $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
+ $(MAKE) -C $(LINUX_DIR) ARCH=xen dep
+
clean::
$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
diff -Nru a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU
--- a/buildconfigs/mk.linux-2.4-xenU 2005-05-12 19:04:21 -04:00
+++ b/buildconfigs/mk.linux-2.4-xenU 2005-05-12 19:04:21 -04:00
@@ -38,6 +38,11 @@
make -C $(LINUX_DIR) ARCH=xen oldconfig
make -C $(LINUX_DIR) ARCH=xen dep
+config: CONFIGMODE = menuconfig
+config: $(LINUX_DIR)/include/linux/autoconf.h
+ $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
+ $(MAKE) -C $(LINUX_DIR) ARCH=xen dep
+
clean::
$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
diff -Nru a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
--- a/buildconfigs/mk.linux-2.6-xen0 2005-05-12 19:04:21 -04:00
+++ b/buildconfigs/mk.linux-2.6-xen0 2005-05-12 19:04:21 -04:00
@@ -33,9 +33,13 @@
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p'
$(LINUX_DIR)/Makefile); \
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION
$(LINUX_DIR)/.config \
- || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
+ || cp
$(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
$(LINUX_DIR)/.config
$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
+
+config: CONFIGMODE = menuconfig
+config: $(LINUX_DIR)/include/linux/autoconf.h
+ $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
clean::
$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
diff -Nru a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
--- a/buildconfigs/mk.linux-2.6-xenU 2005-05-12 19:04:21 -04:00
+++ b/buildconfigs/mk.linux-2.6-xenU 2005-05-12 19:04:21 -04:00
@@ -33,9 +33,13 @@
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p'
$(LINUX_DIR)/Makefile); \
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION
$(LINUX_DIR)/.config \
- || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
+ || cp
$(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
$(LINUX_DIR)/.config
$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
+
+config: CONFIGMODE = menuconfig
+config: $(LINUX_DIR)/include/linux/autoconf.h
+ $(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
clean::
$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home