From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH 5/9] raisin: remove UPSTREAM_ for URL and REVISION variables Date: Wed, 15 Apr 2015 16:14:56 +0100 Message-ID: <1429110900-8286-5-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 It doesn't add any info and just makes the variable names longer. Signed-off-by: Stefano Stabellini --- README | 4 ++-- components/grub | 2 +- components/libvirt | 2 +- components/qemu | 2 +- components/qemu_traditional | 4 ++-- components/xen | 2 +- defconfig | 28 ++++++++++++++-------------- lib/common-functions.sh | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README b/README index 7c46660..20cde32 100644 --- a/README +++ b/README @@ -84,8 +84,8 @@ ARCH: which architecture we are running on, x86_64, arm32, etc. BASEDIR: absolute path of the raisin directory PREFIX: installation PREFIX INST_DIR: absolute path of the installation directory -COMPONENT_UPSTREAM_URL: git url to clone, set by config -COMPONENT_UPSTREAM_REVISION: branch or tag to checkout, set by config +COMPONENT_URL: git url to clone, set by config +COMPONENT_REVISION: branch or tag to checkout, set by config You can also rely on any utility functions in common-functions.sh, in particular: diff --git a/components/grub b/components/grub index b538fb1..6c3fde4 100644 --- a/components/grub +++ b/components/grub @@ -27,7 +27,7 @@ function grub_build() { cd "$BASEDIR" rm -f memdisk.tar tar cf memdisk.tar -C data grub.cfg - git-checkout $GRUB_UPSTREAM_URL $GRUB_UPSTREAM_REVISION grub-dir + git-checkout $GRUB_URL $GRUB_REVISION grub-dir cd grub-dir ./autogen.sh ## GRUB32 diff --git a/components/libvirt b/components/libvirt index 430d651..1cc7811 100644 --- a/components/libvirt +++ b/components/libvirt @@ -24,7 +24,7 @@ function libvirt_check_package() { function libvirt_build() { cd "$BASEDIR" - git-checkout $LIBVIRT_UPSTREAM_URL $LIBVIRT_UPSTREAM_REVISION libvirt-dir + git-checkout $LIBVIRT_URL $LIBVIRT_REVISION libvirt-dir cd libvirt-dir CFLAGS="-I$INST_DIR/$PREFIX/include" \ LDFLAGS="-L$INST_DIR/$PREFIX/lib -Wl,-rpath-link=$INST_DIR/$PREFIX/lib" \ diff --git a/components/qemu b/components/qemu index 3633417..e2f6be2 100644 --- a/components/qemu +++ b/components/qemu @@ -17,7 +17,7 @@ function qemu_check_package() { function qemu_build() { cd "$BASEDIR" - git-checkout $QEMU_UPSTREAM_URL $QEMU_UPSTREAM_REVISION qemu-dir + git-checkout $QEMU_URL $QEMU_REVISION qemu-dir cd qemu-dir ./configure --enable-xen --target-list=i386-softmmu,x86_64-softmmu --prefix=$PREFIX \ --extra-cflags="-I$INST_DIR/$PREFIX/include" \ diff --git a/components/qemu_traditional b/components/qemu_traditional index cb71c94..473538a 100644 --- a/components/qemu_traditional +++ b/components/qemu_traditional @@ -12,13 +12,13 @@ function qemu_traditional_check_package() { local DEP_Fedora_x86_32="$DEP_Fedora_common" local DEP_Fedora_x86_64="$DEP_Fedora_common" - echo Checking QEMU dependencies + echo Checking qemu-traditional dependencies eval check-package \$DEP_"$DISTRO"_"$ARCH" } function qemu_traditional_build() { cd "$BASEDIR" - git-checkout $QEMU_TRADITIONAL_UPSTREAM_URL $QEMU_TRADITIONAL_UPSTREAM_REVISION qemu_traditional-dir + git-checkout $QEMU_TRADITIONAL_URL $QEMU_TRADITIONAL_REVISION qemu_traditional-dir cd qemu_traditional-dir export CONFIG_BLKTAP1=n diff --git a/components/xen b/components/xen index 9fdf37f..e283688 100644 --- a/components/xen +++ b/components/xen @@ -21,7 +21,7 @@ function xen_check_package() { function xen_build() { cd "$BASEDIR" - git-checkout $XEN_UPSTREAM_URL $XEN_UPSTREAM_REVISION xen-dir + git-checkout $XEN_URL $XEN_REVISION xen-dir cd xen-dir ./configure --prefix=$PREFIX --with-system-qemu=/usr/bin/qemu-system-i386 \ --disable-qemu-traditional diff --git a/defconfig b/defconfig index 5fd4e54..d45e2df 100644 --- a/defconfig +++ b/defconfig @@ -10,20 +10,20 @@ PREFIX="/usr" DESTDIR=dist # Git urls. Use the http urls if you are behind a firewall. -#XEN_UPSTREAM_URL="http://xenbits.xen.org/git-http/xen.git" -#GRUB_UPSTREAM_URL="http://git.savannah.gnu.org/r/grub.git" -#LIBVIRT_UPSTREAM_URL="https://gitorious.org/libvirt/libvirt.git" -XEN_UPSTREAM_URL="git://xenbits.xen.org/xen.git" -QEMU_UPSTREAM_URL="git://git.qemu.org/qemu.git" -QEMU_TRADITIONAL_UPSTREAM_URL="git://xenbits.xen.org/qemu-xen-unstable.git" -GRUB_UPSTREAM_URL="git://git.savannah.gnu.org/grub.git" -LIBVIRT_UPSTREAM_URL="git://libvirt.org/libvirt.git" +#XEN_URL="http://xenbits.xen.org/git-http/xen.git" +#GRUB_URL="http://git.savannah.gnu.org/r/grub.git" +#LIBVIRT_URL="https://gitorious.org/libvirt/libvirt.git" +XEN_URL="git://xenbits.xen.org/xen.git" +QEMU_URL="git://git.qemu.org/qemu.git" +QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-unstable.git" +GRUB_URL="git://git.savannah.gnu.org/grub.git" +LIBVIRT_URL="git://libvirt.org/libvirt.git" # Software versions. Leave blank if you want to avoid the build, like -# this: GRUB_UPSTREAM_REVISION= +# this: GRUB_REVISION= # Grub and Libvirt needs Xen to build and run. -XEN_UPSTREAM_REVISION="master" -QEMU_UPSTREAM_REVISION="master" -QEMU_TRADITIONAL_UPSTREAM_REVISION="master" -GRUB_UPSTREAM_REVISION="master" -LIBVIRT_UPSTREAM_REVISION="master" +XEN_REVISION="master" +QEMU_REVISION="master" +QEMU_TRADITIONAL_REVISION="master" +GRUB_REVISION="master" +LIBVIRT_REVISION="master" diff --git a/lib/common-functions.sh b/lib/common-functions.sh index a523f5d..31eec73 100644 --- a/lib/common-functions.sh +++ b/lib/common-functions.sh @@ -225,7 +225,7 @@ function for_each_component () { for component in `cat "$BASEDIR"/components/series` do capital=`echo $component | tr '[:lower:]' '[:upper:]'` - if eval [[ ! -z \$"$capital"_UPSTREAM_REVISION ]] + if eval [[ ! -z \$"$capital"_REVISION ]] then "$component"_"$1" fi -- 1.7.10.4