From mboxrd@z Thu Jan 1 00:00:00 1970 From: Doug Goldstein Subject: Re: [PATCH] Kconfig: fix environment variable handling Date: Wed, 13 Jan 2016 09:50:31 -0600 Message-ID: <56967247.408@cardoe.com> References: <5696393302000078000C636E@prv-mh.provo.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6585435577590390889==" Return-path: Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aJNh3-00042P-Ih for xen-devel@lists.xenproject.org; Wed, 13 Jan 2016 15:50:41 +0000 Received: by mail-yk0-f181.google.com with SMTP id x67so493979454ykd.2 for ; Wed, 13 Jan 2016 07:50:38 -0800 (PST) In-Reply-To: <5696393302000078000C636E@prv-mh.provo.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich , xen-devel Cc: Ian Campbell , Keir Fraser , Ian Jackson , Tim Deegan List-Id: xen-devel@lists.xenproject.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============6585435577590390889== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Xn5vpD3ViXXSF4KadU1TKEhHlwR9wRC8L" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Xn5vpD3ViXXSF4KadU1TKEhHlwR9wRC8L Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 1/13/16 4:46 AM, Jan Beulich wrote: > With xen/Makefile including include/config/auto.conf.cmd, environment > variables checked in the latter must be available at the time of > inclusion of that file, and hence must be populated in xen/Makefile > rather than by passing to or inside xen/tools/kconfig/Makefile.kconfig.= > Otherwise incremental re-builds will always be full re-builds, which is= > not only annoying but actively problematic when building as non-root > and only running "install-xen" as root. >=20 > Also take the opportunity and remove stray $(Q) uses. >=20 > Signed-off-by: Jan Beulich >=20 > --- a/xen/Makefile > +++ b/xen/Makefile > @@ -20,6 +20,9 @@ MAKEFLAGS +=3D -rR > =20 > EFI_MOUNTPOINT ?=3D $(BOOT_DIR)/efi > =20 > +ARCH=3D$(XEN_TARGET_ARCH) > +SRCARCH=3D$(shell echo $(ARCH) | sed -e 's/x86.*/x86/' -e s'/arm\(32\|= 64\)/arm/g') > + > # Don't break if the build process wasn't called from the top level > # we need XEN_TARGET_ARCH to generate the proper config > include $(XEN_ROOT)/Config.mk > @@ -101,7 +104,7 @@ _clean: delete-unfresh-files > $(MAKE) -f $(BASEDIR)/Rules.mk -C xsm clean > $(MAKE) -f $(BASEDIR)/Rules.mk -C crypto clean > $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) clean > - $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig clean > + $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=3D$(ARCH) S= RCARCH=3D$(SRCARCH) clean > find . \( -name "*.o" -o -name ".*.d" \) -exec rm -f {} \; > rm -f include/asm $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET)-syms= *~ core > rm -f include/asm-*/asm-offsets.h > @@ -236,14 +239,14 @@ kconfig :=3D silentoldconfig oldconfig con > nconfig xconfig gconfig savedefconfig listnewconfig olddefconfig > .PHONY: $(kconfig) > $(kconfig): > - $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=3D$(XEN_TAR= GET_ARCH) $@ > + $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=3D$(ARCH) S= RCARCH=3D$(SRCARCH) $@ > =20 > include/config/%.conf: include/config/auto.conf.cmd $(KCONFIG_CONFIG) > - $(Q)$(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=3D$(XEN= _TARGET_ARCH) silentoldconfig > + $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=3D$(ARCH) S= RCARCH=3D$(SRCARCH) silentoldconfig > =20 > # Allow people to just run `make` as before and not force them to conf= igure > $(KCONFIG_CONFIG): > - $(Q)$(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=3D$(XEN= _TARGET_ARCH) defconfig > + $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=3D$(ARCH) S= RCARCH=3D$(SRCARCH) defconfig > =20 > # Break the dependency chain for the first run > include/config/auto.conf.cmd: ; > --- a/xen/tools/kconfig/Makefile.kconfig > +++ b/xen/tools/kconfig/Makefile.kconfig > @@ -44,10 +44,6 @@ PHONY +=3D FORCE > =20 > FORCE: > =20 > -SRCARCH =3D $(shell echo $(ARCH) | \ > - sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g') > -export SRCARCH > - > # include the original Makefile and Makefile.host from Linux > include $(src)/Makefile > include $(src)/Makefile.host >=20 >=20 >=20 Reviewed-by: Doug Goldstein --=20 Doug Goldstein --Xn5vpD3ViXXSF4KadU1TKEhHlwR9wRC8L Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWlnJKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNTM5MEQ2RTNFMTkyNzlCNzVDMzIwOTVB MkJDMDNEQzg3RUQxQkQ0AAoJEKK8A9yH7RvUaBIQAIqBr+PDHoi846b17onOW/MN wOBR4l4KQPUOQu3ZGTq2WKmBprFV9//aatsUCkbfUD86JF/QAFFVlcgdskbGepLU OaVGxV/ylg87v/uzCrBTbD4iWDlzSK4DpLuPH1wF3IHAzYzTWFnxoFbEMJL/aDN4 HTwveaEvZQ+wFhkW8Bvm9qNdtNvmMBf7mbBqJADzaJdF9DT66aTVQ/fXrj06b/rt 2GNfIYlCO+Zb5VuRdQXppoEdQGunKFLE3sWQmyzPdDOjNg8cB/T3CfZRoPnacmCZ pH+4ZKIItmL7l0ddJambyhIyQhVR5aDD3rjxb/oLiR5zTOXs21JPVHcmd66oum45 NVp6AfSAy64Wsnd1OU7+KhWWmnD6RHV5UPdATNPnquNMWpz+UCc0OMv+vUn9uopD sNZwwmuskbdiq2pbRGmhx46UfsvOmN4kTjsM+zJ0uO1ur+lUlXgEZ2GvkUQ6ZdvM Vd/5HHQxZQ6MwvmYePR4QBeiwwfG5dGxFgByDPrrNSAjkMgRgcGFEqty3H6FQgUk 2AqnPJl6ulsAr8BPtnJzXoJWWkAGBwVv1WrsfaoH9Rpmy0e6U6vFho2IDmwbO+DZ zlft+d05+ZY6zlSjtY9I5rZAbKXKkqVMiSoyM2Ekd6hkYK2POfTQzdecX4oG7CIe mprPJWvUKw9rjb2f78Vh =4zBc -----END PGP SIGNATURE----- --Xn5vpD3ViXXSF4KadU1TKEhHlwR9wRC8L-- --===============6585435577590390889== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============6585435577590390889==--