From mboxrd@z Thu Jan 1 00:00:00 1970 From: Horms Subject: Re: [PATCH 11/11] build: Don't assume that mkbuildtree is executable Date: Tue, 11 Apr 2006 17:50:33 +0900 Message-ID: <20060411085031.GJ17513@verge.net.au> References: <20060410022914.15477.13677.sendpatchset@tabatha.lab.ultramonkey.org> <20060410023009.15477.66080.sendpatchset@tabatha.lab.ultramonkey.org> <20060411012324.GA5979@verge.net.au> <006d95f04460cc89da1845d12d8a16f7@cl.cam.ac.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <006d95f04460cc89da1845d12d8a16f7@cl.cam.ac.uk> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Keir Fraser Cc: Magnus Damm , xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org On Tue, Apr 11, 2006 at 09:26:29AM +0100, Keir Fraser wrote: > > On 11 Apr 2006, at 02:23, Horms wrote: > > >>>I couldn't decide btween chmoding mkbuildtree, which changes > >>>the tree, and running sh mkbuildtree, which assumes its a shell > >>>script. I settled on the latter. > >> > >>The scripts need bash and sh may not be bash? > > > >Would you like me to look through the scripts for bashisms, > >and perhaps change sh to bash, or just go with the chmod u+x approach? > > I think all the scripts currently specify /bin/bash. You could define > SHELL or SH in Config.mk, default to /bin/bash, and use that variable > in place of 'sh'. Understood, if they are indeed all using /bin/bash at the moment. It seems as well to just specify bash. It can be made more flexible if the need arises. Here is an updated patch. -- Horms # HG changeset patch # User Horms # Node ID f69f52013d13de62aa66bebfbab511ccebbfe222 # Parent 491d06219ffdc9e9b99a483fe948970b75d52e06 build: Don't assume that mkbuildtree is executable In some cases, say for instance for some bizzare reason the tree was checked out of CVS, which doens't neccessarily store file permissions, mkbuildtree may not be executable. I couldn't decide btween chmoding mkbuildtree, which changes the tree, and running sh mkbuildtree, which assumes its a shell script. I settled on the latter. Amendum: All the scripts currently specify /bin/bash, so use bash rather than sh which was in the original version of this patch. Signed-Off-By: Horms diff -r 491d06219ffd -r f69f52013d13 buildconfigs/Rules.mk --- a/buildconfigs/Rules.mk Thu Mar 30 15:16:40 2006 +0900 +++ b/buildconfigs/Rules.mk Thu Mar 30 15:21:11 2006 +0900 @@ -121,14 +121,14 @@ linux-2.6-xen.patch: ref-linux-$(LINUX_V linux-2.6-xen.patch: ref-linux-$(LINUX_VER)/.valid-ref rm -rf tmp-$@ cp -al $( $@ || true rm -rf tmp-$@ %-xen.patch: ref-%/.valid-ref rm -rf tmp-$@ cp -al $( $@ || true rm -rf tmp-$@ diff -r 491d06219ffd -r f69f52013d13 buildconfigs/mk.linux-2.6-xen --- a/buildconfigs/mk.linux-2.6-xen Thu Mar 30 15:16:40 2006 +0900 +++ b/buildconfigs/mk.linux-2.6-xen Thu Mar 30 15:21:11 2006 +0900 @@ -23,8 +23,8 @@ build: $(LINUX_DIR)/include/linux/autoco rm -rf $(LINUX_DIR) cp -al $(