From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: george.dunlap@eu.citrix.com, stefano.stabellini@eu.citrix.com
Subject: [PATCH 8/9] raisin: rename MAKE to RAISIN_MAKE
Date: Wed, 15 Apr 2015 16:14:59 +0100 [thread overview]
Message-ID: <1429110900-8286-8-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1504151602460.7690@kaball.uk.xensource.com>
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 <stefano.stabellini@eu.citrix.com>
---
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
next prev parent reply other threads:[~2015-04-15 15:14 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-15 15:14 [PATCH 0/9] raisin: introduce qemu and qemu-traditional Stefano Stabellini
2015-04-15 15:14 ` [PATCH 1/9] raisin: do not clean before build Stefano Stabellini
2015-04-15 15:26 ` George Dunlap
2015-04-15 15:14 ` [PATCH 2/9] raisin: use timestamps for dpkg Version to avoid versions that start with letters Stefano Stabellini
2015-04-15 15:34 ` Olaf Hering
2015-04-15 15:40 ` Stefano Stabellini
2015-04-15 15:14 ` [PATCH 3/9] raisin: add QEMU upstream component Stefano Stabellini
2015-04-15 19:05 ` Julien Grall
2015-04-16 9:51 ` Stefano Stabellini
2015-04-16 9:54 ` George Dunlap
2015-04-16 10:29 ` Stefano Stabellini
2015-04-16 10:49 ` Julien Grall
2015-04-15 15:14 ` [PATCH 4/9] raisin: add a component to build qemu_traditional Stefano Stabellini
2015-04-15 15:26 ` Andrew Cooper
2015-04-15 15:44 ` Stefano Stabellini
2015-04-15 15:49 ` Andrew Cooper
2015-04-15 15:51 ` George Dunlap
2015-04-15 15:58 ` Ian Campbell
2015-04-15 16:11 ` Stefano Stabellini
2015-04-15 16:15 ` Ian Jackson
2015-04-15 16:26 ` Ian Campbell
2015-04-15 17:41 ` Stefano Stabellini
2015-04-16 8:45 ` Ian Campbell
2015-04-16 9:54 ` Stefano Stabellini
2015-04-16 10:10 ` Ian Campbell
2015-04-16 10:25 ` Stefano Stabellini
2015-04-16 10:39 ` George Dunlap
2015-04-16 10:48 ` Ian Campbell
2015-04-16 10:55 ` Stefano Stabellini
2015-04-16 10:59 ` George Dunlap
2015-04-16 11:15 ` Ian Jackson
2015-04-15 16:21 ` George Dunlap
2015-04-15 17:42 ` Stefano Stabellini
2015-04-16 8:47 ` Ian Campbell
2015-04-16 9:53 ` Stefano Stabellini
2015-04-16 10:09 ` Ian Campbell
2015-04-15 16:24 ` Ian Campbell
2015-04-16 16:03 ` Stefano Stabellini
2015-04-17 8:41 ` Ian Campbell
2015-04-15 15:14 ` [PATCH 5/9] raisin: remove UPSTREAM_ for URL and REVISION variables Stefano Stabellini
2015-04-15 15:14 ` [PATCH 6/9] raisin: add some debugging output for VERBOSE=1 Stefano Stabellini
2015-04-15 15:14 ` [PATCH 7/9] raisin: remove unneeded chmod +x xencommons xendomains xen-watchdog Stefano Stabellini
2015-04-15 15:31 ` George Dunlap
2015-04-15 15:14 ` Stefano Stabellini [this message]
2015-04-15 15:15 ` [PATCH 9/9] raisin: add $INST_DIR/usr/lib64 to LDFLAGS for QEMU and Libvirt Stefano Stabellini
2015-04-15 15:42 ` George Dunlap
2015-04-15 15:43 ` [PATCH 0/9] raisin: introduce qemu and qemu-traditional George Dunlap
2015-04-15 15:57 ` Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1429110900-8286-8-git-send-email-stefano.stabellini@eu.citrix.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=george.dunlap@eu.citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.