[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] add XEN_LOCALVERSION to the dist building process
# HG changeset patch # User vh249@xxxxxxxxxxxxxxxxxxxxxx # Node ID 5721657e8130ac601eec7ae192e67f45e37f1125 # Parent 21cbdb20ff4cd1a6b051129b91776a2f42f6fff6 add XEN_LOCALVERSION to the dist building process Signed-off-by: Vincent Hanquez <vincent@xxxxxxxxxxxxx> diff -r 21cbdb20ff4c -r 5721657e8130 Makefile --- a/Makefile Sun Sep 11 09:28:21 2005 +++ b/Makefile Sun Sep 11 16:34:38 2005 @@ -10,6 +10,7 @@ INSTALL_DIR := $(INSTALL) -d -m0755 INSTALL_DATA := $(INSTALL) -m0644 INSTALL_PROG := $(INSTALL) -m0755 +XEN_LOCALVERSION:= KERNELS ?= linux-2.6-xen0 linux-2.6-xenU # linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU @@ -18,6 +19,7 @@ XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) ) export DESTDIR +export XEN_LOCALVERSION # Export target architecture overrides to Xen and Linux sub-trees. ifneq ($(XEN_TARGET_ARCH),) diff -r 21cbdb20ff4c -r 5721657e8130 buildconfigs/mk.linux-2.6-xen --- a/buildconfigs/mk.linux-2.6-xen Sun Sep 11 09:28:21 2005 +++ b/buildconfigs/mk.linux-2.6-xen Sun Sep 11 16:34:38 2005 @@ -7,6 +7,7 @@ EXTRAVERSION = xen LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION) +LOCALSTR = CONFIG_LOCALVERSION=$(XEN_LOCALVERSION) include buildconfigs/Rules.mk @@ -15,10 +16,10 @@ # The real action starts here! build: $(LINUX_DIR)/include/linux/autoconf.h if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \ - $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \ - $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \ + $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen modules ; \ + $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \ fi - $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install + $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref rm -rf $(LINUX_DIR) diff -r 21cbdb20ff4c -r 5721657e8130 buildconfigs/mk.linux-2.6-xen0 --- a/buildconfigs/mk.linux-2.6-xen0 Sun Sep 11 09:28:21 2005 +++ b/buildconfigs/mk.linux-2.6-xen0 Sun Sep 11 16:34:38 2005 @@ -7,6 +7,7 @@ EXTRAVERSION = xen0 LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION) +LOCALSTR = CONFIG_LOCALVERSION=$(XEN_LOCALVERSION) include buildconfigs/Rules.mk @@ -15,10 +16,10 @@ # The real action starts here! build: $(LINUX_DIR)/include/linux/autoconf.h if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \ - $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \ - $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \ + $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen modules ; \ + $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \ fi - $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install + $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref rm -rf $(LINUX_DIR) diff -r 21cbdb20ff4c -r 5721657e8130 buildconfigs/mk.linux-2.6-xenU --- a/buildconfigs/mk.linux-2.6-xenU Sun Sep 11 09:28:21 2005 +++ b/buildconfigs/mk.linux-2.6-xenU Sun Sep 11 16:34:38 2005 @@ -7,6 +7,7 @@ EXTRAVERSION = xenU LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION) +LOCALSTR = CONFIG_LOCALVERSION=$(XEN_LOCALVERSION) include buildconfigs/Rules.mk @@ -15,10 +16,10 @@ # The real action starts here! build: $(LINUX_DIR)/include/linux/autoconf.h if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \ - $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \ - $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \ + $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen modules ; \ + $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \ fi - $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install + $(MAKE) $(LOCALSTR) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref rm -rf $(LINUX_DIR) diff -r 21cbdb20ff4c -r 5721657e8130 xen/Makefile --- a/xen/Makefile Sun Sep 11 09:28:21 2005 +++ b/xen/Makefile Sun Sep 11 16:34:38 2005 @@ -11,7 +11,8 @@ export XEN_VERSION = 3 export XEN_SUBVERSION = 0 export XEN_EXTRAVERSION = -devel -export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) +export XEN_LOCALVERSION = +export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)$(XEN_LOCALVERSION) export BASEDIR := $(CURDIR) @@ -32,6 +33,7 @@ install: $(TARGET).gz [ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot $(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_FULLVERSION).gz + ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_LOCALVERSION).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET)).gz _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |