raisin: remove UPSTREAM_ for URL and REVISION variables

It doesn't add any info and just makes the variable names longer.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>

diff --git a/README b/README
index 7c466602e4f5a71113c16d88a97f6008b468c837..20cde321e8135a98b95610695849f80a8195aa8e 100644 (file)
--- 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 b538fb15d77a140f7d026c5a86de4f505aba0b15..6c3fde469421527331076a6f482ed5a11ca36548 100644 (file)
--- 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 430d651e2b0e1ce8c2f26fa4e11ce9e43e747c37..1cc78113027d013ff9410ff46dba095988273f14 100644 (file)
--- 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 3633417797f69b595a0aa105b9871d59e563299e..e2f6be2750d7a332f57b95126806b3aadcdcc985 100644 (file)
--- 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/xen b/components/xen
index dcf2f928b9b0d060896a3de7ecea5c99c501240a..7e6ae57e9354a3d8ee916df76109f240eabf70be 100644 (file)
--- 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
     $MAKE

diff --git a/defconfig b/defconfig
index b409fea4e3f3cf7c2effc4189085079c9a8a6a2a..23c76eb094be4b2c391c123a42a069f0ffe231ec 100644 (file)
--- a/defconfig
+++ b/defconfig
@@ -10,18 +10,18 @@ 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"
-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"
+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"
-GRUB_UPSTREAM_REVISION="master"
-LIBVIRT_UPSTREAM_REVISION="master"
+XEN_REVISION="master"
+QEMU_REVISION="master"
+GRUB_REVISION="master"
+LIBVIRT_REVISION="master"

diff --git a/lib/common-functions.sh b/lib/common-functions.sh
index a523f5dc7a8714125091260a6bb95891ac77209b..31eec7327c0133c7005722525151d72a431c9040 100644 (file)
--- 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