From: Michal Ostrowski Subject: [PATCH] Linux build cleanup. Date: Tue, 4 Oct 2005 15:42:15 -0400 Message-ID: <20051004154215.0ea84793@brick.watson.ibm.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0221670380==" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Mime-version: 1.0 Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --===============0221670380== Content-Type: multipart/signed; boundary=Signature_Tue__4_Oct_2005_15_42_15_-0400_+91vKePBfcMusytu; protocol="application/pgp-signature"; micalg=pgp-sha1 --Signature_Tue__4_Oct_2005_15_42_15_-0400_+91vKePBfcMusytu Content-Type: multipart/mixed; boundary="Multipart_Tue__4_Oct_2005_15_42_15_-0400_mqBGB0IPaG5i/ZSK" --Multipart_Tue__4_Oct_2005_15_42_15_-0400_mqBGB0IPaG5i/ZSK Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline changeset: 7198:f2fce0c89fd9 tag: tip user: mostrows@heater.watson.ibm.com date: Tue Oct 4 14:16:56 2005 -0400 summary: Restructure the makefiles used to drive builds of linux 2.6 ke= rnels. =20 A common file eliminates duplication across makefiles. Use Linux's own facilities for building outside the source tree, this means that a single source tree is created from the sparse tree and linux builds occur in source-free build trees. Signed-off-by: Michal Ostrowski diff -r c092fbcc18c6 -r f2fce0c89fd9 buildconfigs/mk.linux-2.6-xen --- a/buildconfigs/mk.linux-2.6-xen Tue Oct 4 11:45:05 2005 -0400 +++ b/buildconfigs/mk.linux-2.6-xen Tue Oct 4 14:16:56 2005 -0400 @@ -1,51 +1,4 @@ - -OS =3D linux - -LINUX_SERIES =3D 2.6 -LINUX_VER =3D 2.6.12 - +BUILD_DIR ?=3D linux-2.6.12-xen0 EXTRAVERSION =3D xen =20 -LINUX_DIR =3D $(OS)-$(LINUX_VER)-$(EXTRAVERSION) - -include buildconfigs/Rules.mk - -.PHONY: build clean delete - -# The real action starts here! -build: $(LINUX_DIR)/include/linux/autoconf.h - if grep "^CONFIG_MODULES=3D" $(LINUX_DIR)/.config ; then \ - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) modules ; \ - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) INSTALL_MOD_PATH=3D$(DES= TDIR) modules_install ; \ - fi - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) INSTALL_PATH=3D$(DESTDIR) in= stall - -$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref - rm -rf $(LINUX_DIR) - cp -al $(Mk.tmp ; \ - rm -f Makefile ; mv Mk.tmp Makefile ) - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) oldconfig - -config: CONFIGMODE =3D menuconfig -config: $(LINUX_DIR)/include/linux/autoconf.h - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) $(CONFIGMODE) - -clean:: - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) clean - -delete:=20 - rm -rf tmp-$(OS)-$(LINUX_VER) $(LINUX_DIR)=20 +include buildconfigs/mk.linux-2.6.common diff -r c092fbcc18c6 -r f2fce0c89fd9 buildconfigs/mk.linux-2.6-xen0 --- a/buildconfigs/mk.linux-2.6-xen0 Tue Oct 4 11:45:05 2005 -0400 +++ b/buildconfigs/mk.linux-2.6-xen0 Tue Oct 4 14:16:56 2005 -0400 @@ -1,51 +1,4 @@ - -OS =3D linux - -LINUX_SERIES =3D 2.6 -LINUX_VER =3D 2.6.12 - +BUILD_DIR ?=3D linux-2.6.12-xen0 EXTRAVERSION =3D xen0 =20 -LINUX_DIR =3D $(OS)-$(LINUX_VER)-$(EXTRAVERSION) - -include buildconfigs/Rules.mk - -.PHONY: build clean delete - -# The real action starts here! -build: $(LINUX_DIR)/include/linux/autoconf.h - if grep "^CONFIG_MODULES=3D" $(LINUX_DIR)/.config ; then \ - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) modules ; \ - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) INSTALL_MOD_PATH=3D$(DES= TDIR) modules_install ; \ - fi - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) INSTALL_PATH=3D$(DESTDIR) in= stall - -$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref - rm -rf $(LINUX_DIR) - cp -al $(Mk.tmp ; \ - rm -f Makefile ; mv Mk.tmp Makefile ) - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) oldconfig - -config: CONFIGMODE =3D menuconfig -config: $(LINUX_DIR)/include/linux/autoconf.h - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) $(CONFIGMODE) - -clean:: - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) clean - -delete:=20 - rm -rf tmp-$(OS)-$(LINUX_VER) $(LINUX_DIR)=20 +include buildconfigs/mk.linux-2.6.common diff -r c092fbcc18c6 -r f2fce0c89fd9 buildconfigs/mk.linux-2.6-xenU --- a/buildconfigs/mk.linux-2.6-xenU Tue Oct 4 11:45:05 2005 -0400 +++ b/buildconfigs/mk.linux-2.6-xenU Tue Oct 4 14:16:56 2005 -0400 @@ -1,51 +1,4 @@ - -OS =3D linux - -LINUX_SERIES =3D 2.6 -LINUX_VER =3D 2.6.12 - +BUILD_DIR ?=3D linux-2.6.12-xenU EXTRAVERSION =3D xenU =20 -LINUX_DIR =3D $(OS)-$(LINUX_VER)-$(EXTRAVERSION) - -include buildconfigs/Rules.mk - -.PHONY: build clean delete - -# The real action starts here! -build: $(LINUX_DIR)/include/linux/autoconf.h - if grep "^CONFIG_MODULES=3D" $(LINUX_DIR)/.config ; then \ - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) modules ; \ - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) INSTALL_MOD_PATH=3D$(DES= TDIR) modules_install ; \ - fi - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) INSTALL_PATH=3D$(DESTDIR) in= stall - -$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref - rm -rf $(LINUX_DIR) - cp -al $(Mk.tmp ; \ - rm -f Makefile ; mv Mk.tmp Makefile ) - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) oldconfig - -config: CONFIGMODE =3D menuconfig -config: $(LINUX_DIR)/include/linux/autoconf.h - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) $(CONFIGMODE) - -clean:: - $(MAKE) -C $(LINUX_DIR) ARCH=3D$(LINUX_ARCH) clean - -delete:=20 - rm -rf tmp-$(OS)-$(LINUX_VER) $(LINUX_DIR)=20 +include buildconfigs/mk.linux-2.6.common diff -r c092fbcc18c6 -r f2fce0c89fd9 buildconfigs/mk.linux-2.6.common --- /dev/null Tue Oct 4 11:45:05 2005 -0400 +++ b/buildconfigs/mk.linux-2.6.common Tue Oct 4 14:16:56 2005 -0400 @@ -0,0 +1,64 @@ + +OS =3D linux + +LINUX_SERIES =3D 2.6 +LINUX_VER =3D 2.6.12 + +EXTRAVERSION ?=3D xen + +LINUX_DIR =3D $(OS)-$(LINUX_VER)-xen.src + +XEN_ROOT=3D ./ +include buildconfigs/Rules.mk + +BUILD_DIR ?=3D $(OS)-$(LINUX_VER)-$(EXTRAVERSION) + +BUILD_ARG=3D +ifneq ($(BUILD_DIR),$(LINUX_DIR)) +BUILD_ARG=3DO=3D$(shell pwd)/$(BUILD_DIR) +endif + +BUILD_ARG+=3DARCH=3Dxen=20 +BUILD_ARG+=3D-C $(LINUX_DIR) +.PHONY: build clean delete + +# The real action starts here! +build: $(BUILD_DIR)/include/linux/autoconf.h + if grep "^CONFIG_MODULES=3D" $(BUILD_DIR)/.config ; then \ + $(MAKE) $(BUILD_ARG) modules ; \ + $(MAKE) $(BUILD_ARG) INSTALL_MOD_PATH=3D$(DESTDIR) modules_install; \ + fi + $(MAKE) $(BUILD_ARG) INSTALL_PATH=3D$(DESTDIR) install=20 + + +$(LINUX_DIR): ref-$(OS)-$(LINUX_VER)/.valid-ref + cp -al $( Received: from sp1n294en1.watson.ibm.com (sp1n294en1.watson.ibm.com [129.34= MIME-Version: 1.0 by igw2.watson.ibm.com (8.13.1/8.13.1/8.13.1-2005-04-25 igw) with ESMTP id= j94JeJEt005512 for ; Tue, 4 Oct 2005 15:40:19 -0400 Received: from sp1n294en1.watson.ibm.com (localhost [127.0.0.1]) by sp1n294en1.watson.ibm.com (8.11.7-20030924/8.11.7/01-14-2004_2) with ES= MTP id j94JcWv76216 for ; Tue, 4 Oct 2005 15:38:32 -0400 Received: from mgsmtp00.watson.ibm.com (mgsmtp00.watson.ibm.com [9.2.40.58]) by sp1n294en1.watson.ibm.com (8.11.7-20030924/8.11.7/01-14-2004_1) with ES= MTP id j94JcV579838 for ; Tue, 4 Oct 2005 15:38:31 -0400 Received: from kitch0.watson.ibm.com (kitch0.watson.ibm.com [9.2.224.107]) by mgsmtp00.watson.ibm.com (8.12.11/8.12.11/2005/09/01) with ESMTP id j94J= b10r014551 for ; Tue, 4 Oct 2005 15:37:01 -0400 Received: from brick.watson.ibm.com (brick.watson.ibm.com [9.2.216.48]) by kitch0.watson.ibm.com (AIX5.1/8.11.6p2/8.11.0/03-06-2002) with ESMTP id= j94JcVl43368 for ; Tue, 4 Oct 2005 15:38:31 -0400 Date: Tue, 4 Oct 2005 15:38:55 -0400 From: Michal Ostrowski To: xen-devel@list.xensource.com Subject: [PATCH] Linux build cleanup. Message-ID: <20051004153855.708d7e8e@brick.watson.ibm.com> X-Mailer: Sylpheed-Claws 1.0.5 (GTK+ 1.2.10; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; boundary=3DSignature_Tue__4_Oct_2005_15_38_55_-0400_egxfdzywQgmVLLt8; protocol=3D"application/pgp-signature"; micalg=3Dpgp-sha1 --Signature_Tue__4_Oct_2005_15_38_55_-0400_egxfdzywQgmVLLt8 Content-Type: text/plain; charset=3DUS-ASCII Content-Transfer-Encoding: quoted-printable changeset: 7198:f2fce0c89fd9 tag: tip user: mostrows@heater.watson.ibm.com date: Tue Oct 4 14:16:56 2005 -0400 summary: Restructure the makefiles used to drive builds of linux 2.6 ke= =3D rnels. =3D20 A common file eliminates duplication across makefiles. Use Linux's own facilities for building outside the source tree, this means that a single source tree is created from the sparse tree and linux builds occur in source-free build trees. diff -r c092fbcc18c6 -r f2fce0c89fd9 buildconfigs/mk.linux-2.6-xen --- a/buildconfigs/mk.linux-2.6-xen Tue Oct 4 11:45:05 2005 -0400 +++ b/buildconfigs/mk.linux-2.6-xen Tue Oct 4 14:16:56 2005 -0400 @@ -1,51 +1,4 @@ - -OS =3D3D linux - -LINUX_SERIES =3D3D 2.6 -LINUX_VER =3D3D 2.6.12 - +BUILD_DIR ?=3D3D linux-2.6.12-xen0 EXTRAVERSION =3D3D xen =3D20 -LINUX_DIR =3D3D $(OS)-$(LINUX_VER)-$(EXTRAVERSION) - -include buildconfigs/Rules.mk - -.PHONY: build clean delete - -# The real action starts here! -build: $(LINUX_DIR)/include/linux/autoconf.h - if grep "^CONFIG_MODULES=3D3D" $(LINUX_DIR)/.config ; then \ - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) modules ; \ - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) INSTALL_MOD_PATH=3D3D$= (DES=3D TDIR) modules_install ; \ - fi - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) INSTALL_PATH=3D3D$(DESTDIR= ) in=3D stall - -$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref - rm -rf $(LINUX_DIR) - cp -al $(Mk.tmp ; \ - rm -f Makefile ; mv Mk.tmp Makefile ) - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) oldconfig - -config: CONFIGMODE =3D3D menuconfig -config: $(LINUX_DIR)/include/linux/autoconf.h - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) $(CONFIGMODE) - -clean:: - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) clean - -delete:=3D20 - rm -rf tmp-$(OS)-$(LINUX_VER) $(LINUX_DIR)=3D20 +include buildconfigs/mk.linux-2.6.common diff -r c092fbcc18c6 -r f2fce0c89fd9 buildconfigs/mk.linux-2.6-xen0 --- a/buildconfigs/mk.linux-2.6-xen0 Tue Oct 4 11:45:05 2005 -0400 +++ b/buildconfigs/mk.linux-2.6-xen0 Tue Oct 4 14:16:56 2005 -0400 @@ -1,51 +1,4 @@ - -OS =3D3D linux - -LINUX_SERIES =3D3D 2.6 -LINUX_VER =3D3D 2.6.12 - +BUILD_DIR ?=3D3D linux-2.6.12-xen0 EXTRAVERSION =3D3D xen0 =3D20 -LINUX_DIR =3D3D $(OS)-$(LINUX_VER)-$(EXTRAVERSION) - -include buildconfigs/Rules.mk - -.PHONY: build clean delete - -# The real action starts here! -build: $(LINUX_DIR)/include/linux/autoconf.h - if grep "^CONFIG_MODULES=3D3D" $(LINUX_DIR)/.config ; then \ - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) modules ; \ - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) INSTALL_MOD_PATH=3D3D$= (DES=3D TDIR) modules_install ; \ - fi - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) INSTALL_PATH=3D3D$(DESTDIR= ) in=3D stall - -$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref - rm -rf $(LINUX_DIR) - cp -al $(Mk.tmp ; \ - rm -f Makefile ; mv Mk.tmp Makefile ) - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) oldconfig - -config: CONFIGMODE =3D3D menuconfig -config: $(LINUX_DIR)/include/linux/autoconf.h - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) $(CONFIGMODE) - -clean:: - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) clean - -delete:=3D20 - rm -rf tmp-$(OS)-$(LINUX_VER) $(LINUX_DIR)=3D20 +include buildconfigs/mk.linux-2.6.common diff -r c092fbcc18c6 -r f2fce0c89fd9 buildconfigs/mk.linux-2.6-xenU --- a/buildconfigs/mk.linux-2.6-xenU Tue Oct 4 11:45:05 2005 -0400 +++ b/buildconfigs/mk.linux-2.6-xenU Tue Oct 4 14:16:56 2005 -0400 @@ -1,51 +1,4 @@ - -OS =3D3D linux - -LINUX_SERIES =3D3D 2.6 -LINUX_VER =3D3D 2.6.12 - +BUILD_DIR ?=3D3D linux-2.6.12-xenU EXTRAVERSION =3D3D xenU =3D20 -LINUX_DIR =3D3D $(OS)-$(LINUX_VER)-$(EXTRAVERSION) - -include buildconfigs/Rules.mk - -.PHONY: build clean delete - -# The real action starts here! -build: $(LINUX_DIR)/include/linux/autoconf.h - if grep "^CONFIG_MODULES=3D3D" $(LINUX_DIR)/.config ; then \ - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) modules ; \ - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) INSTALL_MOD_PATH=3D3D$= (DES=3D TDIR) modules_install ; \ - fi - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) INSTALL_PATH=3D3D$(DESTDIR= ) in=3D stall - -$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref - rm -rf $(LINUX_DIR) - cp -al $(Mk.tmp ; \ - rm -f Makefile ; mv Mk.tmp Makefile ) - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) oldconfig - -config: CONFIGMODE =3D3D menuconfig -config: $(LINUX_DIR)/include/linux/autoconf.h - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) $(CONFIGMODE) - -clean:: - $(MAKE) -C $(LINUX_DIR) ARCH=3D3D$(LINUX_ARCH) clean - -delete:=3D20 - rm -rf tmp-$(OS)-$(LINUX_VER) $(LINUX_DIR)=3D20 +include buildconfigs/mk.linux-2.6.common diff -r c092fbcc18c6 -r f2fce0c89fd9 buildconfigs/mk.linux-2.6.common --- /dev/null Tue Oct 4 11:45:05 2005 -0400 +++ b/buildconfigs/mk.linux-2.6.common Tue Oct 4 14:16:56 2005 -0400 @@ -0,0 +1,64 @@ + +OS =3D3D linux + +LINUX_SERIES =3D3D 2.6 +LINUX_VER =3D3D 2.6.12 + +EXTRAVERSION ?=3D3D xen + +LINUX_DIR =3D3D $(OS)-$(LINUX_VER)-xen.src + +XEN_ROOT=3D3D ./ +include buildconfigs/Rules.mk + +BUILD_DIR ?=3D3D $(OS)-$(LINUX_VER)-$(EXTRAVERSION) + +BUILD_ARG=3D3D +ifneq ($(BUILD_DIR),$(LINUX_DIR)) +BUILD_ARG=3D3DO=3D3D$(shell pwd)/$(BUILD_DIR) +endif + +BUILD_ARG+=3D3DARCH=3D3Dxen=3D20 +BUILD_ARG+=3D3D-C $(LINUX_DIR) +.PHONY: build clean delete + +# The real action starts here! +build: $(BUILD_DIR)/include/linux/autoconf.h + if grep "^CONFIG_MODULES=3D3D" $(BUILD_DIR)/.config ; then \ + $(MAKE) $(BUILD_ARG) modules ; \ + $(MAKE) $(BUILD_ARG) INSTALL_MOD_PATH=3D3D$(DESTDIR) modules_install;= \ + fi + $(MAKE) $(BUILD_ARG) INSTALL_PATH=3D3D$(DESTDIR) install=3D20 + + +$(LINUX_DIR): ref-$(OS)-$(LINUX_VER)/.valid-ref + cp -al $(