aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-04-13 11:24:00 +0100
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2006-04-13 11:24:00 +0100
commitba4a95bee14a8101f839df32453014856b6ff511 (patch)
tree2903840cf5988058a67a4775781655238c2b8952
parent9d35d99a033659d07c48b485578b0f20592744e7 (diff)
downloadxen-ba4a95bee14a8101f839df32453014856b6ff511.tar.gz
xen-ba4a95bee14a8101f839df32453014856b6ff511.tar.bz2
xen-ba4a95bee14a8101f839df32453014856b6ff511.zip
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. So run them explicitly via bash. Signed-Off-By: Horms <horms@verge.net.au>
-rw-r--r--buildconfigs/Rules.mk4
-rw-r--r--buildconfigs/mk.linux-2.6-xen4
-rwxr-xr-xlinux-2.6-xen-sparse/mkbuildtree8
-rwxr-xr-xtools/debugger/gdb/gdbbuild2
-rwxr-xr-xtools/misc/xen-clone2
5 files changed, 10 insertions, 10 deletions
diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index fde2980bc8..a889c32ea0 100644
--- a/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@ -99,14 +99,14 @@ endif
linux-2.6-xen.patch: ref-linux-$(LINUX_VER)/.valid-ref
rm -rf tmp-$@
cp -al $(<D) tmp-$@
- ( cd linux-2.6-xen-sparse && ./mkbuildtree ../tmp-$@ )
+ ( cd linux-2.6-xen-sparse && bash ./mkbuildtree ../tmp-$@ )
diff -Nurp $(patsubst ref%,pristine%,$(<D)) tmp-$@ > $@ || true
rm -rf tmp-$@
%-xen.patch: ref-%/.valid-ref
rm -rf tmp-$@
cp -al $(<D) tmp-$@
- ( cd $*-xen-sparse && ./mkbuildtree ../tmp-$@ )
+ ( cd $*-xen-sparse && bash ./mkbuildtree ../tmp-$@ )
diff -Nurp $(patsubst ref%,pristine%,$(<D)) tmp-$@ > $@ || true
rm -rf tmp-$@
diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen
index 64bb3e93f3..46ebbc7eab 100644
--- a/buildconfigs/mk.linux-2.6-xen
+++ b/buildconfigs/mk.linux-2.6-xen
@@ -22,8 +22,8 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)/.valid-ref
rm -rf $(LINUX_DIR)
cp -al $(<D) $(LINUX_DIR)
# Apply arch-xen patches
- ( cd linux-$(LINUX_SERIES)-xen-sparse ; \
- LINUX_ARCH=$(LINUX_ARCH) ./mkbuildtree ../$(LINUX_DIR) )
+ ( cd linux-$(LINUX_SERIES)-xen-sparse && \
+ LINUX_ARCH=$(LINUX_ARCH) bash ./mkbuildtree ../$(LINUX_DIR) )
# Re-use config from install dir if one exits else use default config
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
diff --git a/linux-2.6-xen-sparse/mkbuildtree b/linux-2.6-xen-sparse/mkbuildtree
index 5c70db12a4..37d43f728e 100755
--- a/linux-2.6-xen-sparse/mkbuildtree
+++ b/linux-2.6-xen-sparse/mkbuildtree
@@ -90,8 +90,8 @@ abs_to_rel ${AD} ${AS}
RS=$DESTPATH
# Arch-specific pre-processing
-if [ -x arch/${LINUX_ARCH}/xen-mkbuildtree-pre ]; then
- arch/${LINUX_ARCH}/xen-mkbuildtree-pre
+if [ -e arch/${LINUX_ARCH}/xen-mkbuildtree-pre ]; then
+ bash arch/${LINUX_ARCH}/xen-mkbuildtree-pre
fi
# Remove old copies of files and directories at the destination
@@ -115,6 +115,6 @@ relative_lndir ../../../${RS}/../xen/include/public
# Arch-specific post-processing
cd ${AD}
-if [ -x arch/${LINUX_ARCH}/xen-mkbuildtree-post ]; then
- arch/${LINUX_ARCH}/xen-mkbuildtree-post
+if [ -e arch/${LINUX_ARCH}/xen-mkbuildtree-post ]; then
+ bash arch/${LINUX_ARCH}/xen-mkbuildtree-post
fi
diff --git a/tools/debugger/gdb/gdbbuild b/tools/debugger/gdb/gdbbuild
index fbd225a0c0..419adab61d 100755
--- a/tools/debugger/gdb/gdbbuild
+++ b/tools/debugger/gdb/gdbbuild
@@ -7,7 +7,7 @@ rm -rf gdb-6.2.1 gdb-6.2.1-linux-i386-xen
tar xjf gdb-6.2.1.tar.bz2
cd gdb-6.2.1-xen-sparse
-./mkbuildtree ../gdb-6.2.1
+bash ./mkbuildtree ../gdb-6.2.1
cd ..
mkdir gdb-6.2.1-linux-i386-xen
diff --git a/tools/misc/xen-clone b/tools/misc/xen-clone
index 2d0bea66ae..1c852b106c 100755
--- a/tools/misc/xen-clone
+++ b/tools/misc/xen-clone
@@ -113,7 +113,7 @@ else
# Turn linux into xenolinux then build it
cd xenolinux-${LINUX_VER}-sparse
- ./mkbuildtree ../../linux-${LINUX_VER}
+ bash ./mkbuildtree ../../linux-${LINUX_VER}
cd ../..
mv linux-${LINUX_VER} xenolinux-${LINUX_VER}
cd xenolinux-${LINUX_VER}