Allow the user's config to live outside of git

Move the default config to "defconfig" and add config to .gitignore.
If config doesn't exist, then copy defconfig to it in common_init.

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

diff --git a/.gitignore b/.gitignore
index 47e9874b55d3dca1d96972b3f082d5020be99881..35a46c667ac468d846ca4c05393dfee414ac635a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ cscope.in.out
 cscope.out
 cscope.po.out
 .config
+config
 
 xen-dir
 xen-dir-remote

diff --git a/config b/config
deleted file mode 100644 (file)
index 2b37acc..0000000
--- a/config
+++ /dev/null
@@ -1,25 +0,0 @@
-# Config variables for raisin
-
-# Build config
-## Make command to run
-MAKE="make -j2"
-## Installation prefix (configure --prefix)
-PREFIX="/usr"
-## Install everything under DESTDIR
-## If you want to install under / run raise.sh -i
-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"
-GRUB_UPSTREAM_URL="git://git.savannah.gnu.org/grub.git"
-LIBVIRT_UPSTREAM_URL="git://libvirt.org/libvirt.git"
-
-# Software versions. Leave blank if you want to avoid the build, like
-# this: GRUB_UPSTREAM_REVISION=
-# Grub and Libvirt needs Xen to build and run.
-XEN_UPSTREAM_REVISION="master"
-GRUB_UPSTREAM_REVISION="master"
-LIBVIRT_UPSTREAM_REVISION="master"

diff --git a/defconfig b/defconfig
new file mode 100644 (file)
index 0000000..2b37acc
--- /dev/null
+++ b/defconfig
@@ -0,0 +1,25 @@
+# Config variables for raisin
+
+# Build config
+## Make command to run
+MAKE="make -j2"
+## Installation prefix (configure --prefix)
+PREFIX="/usr"
+## Install everything under DESTDIR
+## If you want to install under / run raise.sh -i
+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"
+GRUB_UPSTREAM_URL="git://git.savannah.gnu.org/grub.git"
+LIBVIRT_UPSTREAM_URL="git://libvirt.org/libvirt.git"
+
+# Software versions. Leave blank if you want to avoid the build, like
+# this: GRUB_UPSTREAM_REVISION=
+# Grub and Libvirt needs Xen to build and run.
+XEN_UPSTREAM_REVISION="master"
+GRUB_UPSTREAM_REVISION="master"
+LIBVIRT_UPSTREAM_REVISION="master"

diff --git a/raise b/raise
index 37d18984452120f47b87916ab9a9f87b88effb80..45c0c252f19d6072761758e91e73cd35b9083a68 100755 (executable)
--- a/raise
+++ b/raise
@@ -28,6 +28,14 @@ source ${RAISIN_PATH}/common-functions.sh
 source ${RAISIN_PATH}/git-checkout.sh
 source ${RAISIN_PATH}/commands.sh
 
+# Include your defaults
+if [[ ! -e "./config" ]] ; then
+   echo "No config file found, copying default config"
+   cp defconfig config
+fi
+
+source ./config
+
 # Set up basic functionality
 common_init
 

diff --git a/scripts/mkdeb b/scripts/mkdeb
index 44a4f7d5143121747a6a8cc704b46e64e98979bc..2a4e3876dadfadf11dc23d239720ec876c164ba3 100755 (executable)
--- a/scripts/mkdeb
+++ b/scripts/mkdeb
@@ -36,7 +36,7 @@ cp -r data deb/opt/raisin
 cp -r components deb/opt/raisin
 cp -r scripts deb/opt/raisin
 cp -r lib deb/opt/raisin
-cp config raise deb/opt/raisin
+cp defconfig raise deb/opt/raisin
 
 
 # Debian doesn't use /usr/lib64 for 64-bit libraries

diff --git a/scripts/mkrpm b/scripts/mkrpm
index 8de4508338ecdac98f3e284c22c8255a2708fcbb..98b630c47a28036728d9bcb2c3885cab3075bd8e 100755 (executable)
--- a/scripts/mkrpm
+++ b/scripts/mkrpm
@@ -48,7 +48,7 @@ cp -r "$BASEDIR"/data \$RPM_BUILD_ROOT/opt/raisin
 cp -r "$BASEDIR"/components \$RPM_BUILD_ROOT/opt/raisin
 cp -r "$BASEDIR"/scripts \$RPM_BUILD_ROOT/opt/raisin
 cp -r "$BASEDIR"/lib \$RPM_BUILD_ROOT/opt/raisin
-cp "$BASEDIR"/config \$RPM_BUILD_ROOT/opt/raisin
+cp "$BASEDIR"/defconfig \$RPM_BUILD_ROOT/opt/raisin
 cp "$BASEDIR"/raise \$RPM_BUILD_ROOT/opt/raisin
 
 %clean