From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH 8/9] raisin: rename MAKE to RAISIN_MAKE Date: Wed, 15 Apr 2015 16:14:59 +0100 Message-ID: <1429110900-8286-8-git-send-email-stefano.stabellini@eu.citrix.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: george.dunlap@eu.citrix.com, stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org The MAKE environmental variable is used by make for its own purposes. Do not export it, use RAISIN_MAKE instead. Signed-off-by: Stefano Stabellini --- README | 2 +- components/grub | 8 ++++---- components/libvirt | 8 ++++---- components/qemu | 6 +++--- components/qemu_traditional | 6 +++--- components/xen | 6 +++--- lib/common-functions.sh | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README b/README index 20cde32..e9a2413 100644 --- a/README +++ b/README @@ -77,7 +77,7 @@ You can/should rely on the following global variables in your component script file: GIT: git command to run, but prefer the git-checkout.sh script -MAKE: make command to run +RAISIN_MAKE: make command to run SUDO: sudo command to run DISTRO: which Linux distribution we are running on, Debian, Fedora, etc ARCH: which architecture we are running on, x86_64, arm32, etc. diff --git a/components/grub b/components/grub index 6c3fde4..563a28c 100644 --- a/components/grub +++ b/components/grub @@ -32,16 +32,16 @@ function grub_build() { ./autogen.sh ## GRUB32 ./configure --target=i386 --with-platform=xen - $MAKE CPPFLAGS="-I$INST_DIR/$PREFIX/include" + $RAISIN_MAKE CPPFLAGS="-I$INST_DIR/$PREFIX/include" ./grub-mkimage -d grub-core -O i386-xen -c "$BASEDIR"/data/grub-bootstrap.cfg \ -m ../memdisk.tar -o grub-i386-xen grub-core/*mod cp grub-i386-xen "$INST_DIR"/$PREFIX/lib/xen/boot ## GRUB64 if [[ $ARCH = "x86_64" ]] then - $MAKE clean + $RAISIN_MAKE clean ./configure --target=amd64 --with-platform=xen - $MAKE CPPFLAGS="-I$INST_DIR/$PREFIX/include" + $RAISIN_MAKE CPPFLAGS="-I$INST_DIR/$PREFIX/include" ./grub-mkimage -d grub-core -O x86_64-xen -c "$BASEDIR"/data/grub-bootstrap.cfg \ -m ../memdisk.tar -o grub-x86_64-xen grub-core/*mod cp grub-x86_64-xen "$INST_DIR"/$PREFIX/lib/xen/boot @@ -55,7 +55,7 @@ function grub_clean() { if [[ -d grub-dir ]] then cd grub-dir - $MAKE distclean + $RAISIN_MAKE distclean cd .. rm -rf grub-dir fi diff --git a/components/libvirt b/components/libvirt index 1cc7811..1702fb9 100644 --- a/components/libvirt +++ b/components/libvirt @@ -33,8 +33,8 @@ function libvirt_build() { --without-vbox --without-lxc --without-esx --without-hyperv \ --without-parallels --without-test --with-libvirtd --without-sasl \ --with-yajl --without-macvtap --without-avahi --prefix=$PREFIX - $MAKE - $MAKE --ignore-errors install DESTDIR="$INST_DIR" || true + $RAISIN_MAKE + $RAISIN_MAKE --ignore-errors install DESTDIR="$INST_DIR" || true if [[ $DISTRO = "Debian" ]] then mkdir -p "$INST_DIR"/etc/init.d @@ -42,7 +42,7 @@ function libvirt_build() { chmod +x "$INST_DIR"/etc/init.d/libvirtd elif [[ $DISTRO = "Fedora" || $DISTRO = "CentOS" ]] then - $MAKE -C daemon libvirtd.init + $RAISIN_MAKE -C daemon libvirtd.init mkdir -p "$INST_DIR"/etc/rc.d/init.d cp daemon/libvirtd.init "$INST_DIR"/etc/rc.d/init.d/libvirtd chmod +x "$INST_DIR"/etc/rc.d/init.d/libvirtd @@ -57,7 +57,7 @@ function libvirt_clean() { if [[ -d libvirt-dir ]] then cd libvirt-dir - $MAKE distclean + $RAISIN_MAKE distclean cd .. rm -rf libvirt-dir fi diff --git a/components/qemu b/components/qemu index e2f6be2..8689a18 100644 --- a/components/qemu +++ b/components/qemu @@ -25,8 +25,8 @@ function qemu_build() { --disable-kvm \ --disable-docs \ --disable-guest-agent - $MAKE all - $MAKE install DESTDIR="$INST_DIR" + $RAISIN_MAKE all + $RAISIN_MAKE install DESTDIR="$INST_DIR" cd "$BASEDIR" } @@ -35,7 +35,7 @@ function qemu_clean() { if [[ -d qemu-dir ]] then cd qemu-dir - $MAKE distclean + $RAISIN_MAKE distclean cd .. rm -rf qemu-dir fi diff --git a/components/qemu_traditional b/components/qemu_traditional index 473538a..d27bb89 100644 --- a/components/qemu_traditional +++ b/components/qemu_traditional @@ -24,8 +24,8 @@ function qemu_traditional_build() { export CONFIG_BLKTAP1=n export XEN_ROOT="$BASEDIR"/xen-dir ./xen-setup - $MAKE all - $MAKE install DESTDIR="$INST_DIR" + $RAISIN_MAKE all + $RAISIN_MAKE install DESTDIR="$INST_DIR" cd "$BASEDIR" } @@ -34,7 +34,7 @@ function qemu_traditional_clean() { if [[ -d qemu_traditional-dir ]] then cd qemu_traditional-dir - $MAKE distclean + $RAISIN_MAKE distclean cd .. rm -rf qemu_traditional-dir fi diff --git a/components/xen b/components/xen index 83fb77c..e68e3bf 100644 --- a/components/xen +++ b/components/xen @@ -25,8 +25,8 @@ function xen_build() { cd xen-dir ./configure --prefix=$PREFIX --with-system-qemu=/usr/bin/qemu-system-i386 \ --disable-qemu-traditional - $MAKE - $MAKE install DESTDIR="$INST_DIR" + $RAISIN_MAKE + $RAISIN_MAKE install DESTDIR="$INST_DIR" cd "$BASEDIR" } @@ -35,7 +35,7 @@ function xen_clean() { if [[ -d xen-dir ]] then cd xen-dir - $MAKE distclean + $RAISIN_MAKE distclean cd "$BASEDIR" rm -rf xen-dir fi diff --git a/lib/common-functions.sh b/lib/common-functions.sh index c72856a..36e1766 100644 --- a/lib/common-functions.sh +++ b/lib/common-functions.sh @@ -5,7 +5,7 @@ function common_init() { export BASEDIR=`pwd` export GIT=${GIT-git} export SUDO=${SUDO-sudo} - export MAKE=${MAKE-make} + export RAISIN_MAKE=${MAKE-make} export PREFIX=${PREFIX-/usr} export INST_DIR=${DESTDIR-dist} -- 1.7.10.4