From 179c6583486415fad0b99853cc79f1f5bd33aec7 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Sat, 24 Sep 2011 11:58:14 +0200
Subject: [PATCH] Easy switch of base distro for template ($DIST env var)

---
 base_rpms                                           |   1 +
 .../fedora-release-14-1.noarch.rpm                  | Bin
 .../filesystem-2.4.35-1.fc14.x86_64.rpm             | Bin
 .../setup-2.8.23-1.fc14.noarch.rpm                  | Bin
 create_symlinks_in_rpms_to_install_dir.sh           |   6 ++++--
 fedorize_image                                      |  11 ++++++++---
 keys                                                |   1 +
 {keys => keys_fc14}/RPM-GPG-KEY-fedora-14-primary   |   0
 {keys => keys_fc14}/qubes-release-1-signing-key.asc |   0
 version_core                                        |   2 +-
 version_gui                                         |   2 +-
 11 files changed, 16 insertions(+), 7 deletions(-)
 create mode 120000 base_rpms
 rename {base_rpms => base_rpms_fc14}/fedora-release-14-1.noarch.rpm (100%)
 rename {base_rpms => base_rpms_fc14}/filesystem-2.4.35-1.fc14.x86_64.rpm (100%)
 rename {base_rpms => base_rpms_fc14}/setup-2.8.23-1.fc14.noarch.rpm (100%)
 create mode 120000 keys
 rename {keys => keys_fc14}/RPM-GPG-KEY-fedora-14-primary (100%)
 rename {keys => keys_fc14}/qubes-release-1-signing-key.asc (100%)

diff --git a/base_rpms b/base_rpms
new file mode 120000
index 0000000..01897e0
--- /dev/null
+++ b/base_rpms
@@ -0,0 +1 @@
+base_rpms_fc14
\ No newline at end of file
diff --git a/base_rpms/fedora-release-14-1.noarch.rpm b/base_rpms_fc14/fedora-release-14-1.noarch.rpm
similarity index 100%
rename from base_rpms/fedora-release-14-1.noarch.rpm
rename to base_rpms_fc14/fedora-release-14-1.noarch.rpm
diff --git a/base_rpms/filesystem-2.4.35-1.fc14.x86_64.rpm b/base_rpms_fc14/filesystem-2.4.35-1.fc14.x86_64.rpm
similarity index 100%
rename from base_rpms/filesystem-2.4.35-1.fc14.x86_64.rpm
rename to base_rpms_fc14/filesystem-2.4.35-1.fc14.x86_64.rpm
diff --git a/base_rpms/setup-2.8.23-1.fc14.noarch.rpm b/base_rpms_fc14/setup-2.8.23-1.fc14.noarch.rpm
similarity index 100%
rename from base_rpms/setup-2.8.23-1.fc14.noarch.rpm
rename to base_rpms_fc14/setup-2.8.23-1.fc14.noarch.rpm
diff --git a/create_symlinks_in_rpms_to_install_dir.sh b/create_symlinks_in_rpms_to_install_dir.sh
index 72ac024..0796238 100755
--- a/create_symlinks_in_rpms_to_install_dir.sh
+++ b/create_symlinks_in_rpms_to_install_dir.sh
@@ -3,15 +3,17 @@
 SRC_ROOT=../..
 [ -n "$1" ] && SRC_ROOT=$1
 
+: DIST=fc14
+
 rm -fr rpms_to_install/*
-VERSION_CORE=$(cat version_core)
+VERSION_CORE=$(cat version_core | sed "s/DIST/$DIST/")
 ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-appvm-$VERSION_CORE.rpm rpms_to_install/qubes-core-appvm
 ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-appvm-libs-$VERSION_CORE.rpm rpms_to_install/qubes-core-appvm-libs
 ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-commonvm-$VERSION_CORE.rpm rpms_to_install/qubes-core-commonvm
 ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-netvm-$VERSION_CORE.rpm rpms_to_install/qubes-core-netvm
 ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-proxyvm-$VERSION_CORE.rpm rpms_to_install/qubes-core-proxyvm
 
-VERSION_GUI=$(cat version_gui)
+VERSION_GUI=$(cat version_gui | sed "s/DIST/$DIST/")
 ln -s $SRC_ROOT/gui/rpm/x86_64/qubes-gui-vm-$VERSION_GUI.rpm rpms_to_install/qubes-gui-vm
 
 VERSION_XEN=$(cat version_xen)
diff --git a/fedorize_image b/fedorize_image
index f8c723f..119fbeb 100755
--- a/fedorize_image
+++ b/fedorize_image
@@ -3,6 +3,8 @@
 IMG=$1
 PKGLISTFILE=$2
 
+: ${DIST=fc14}
+
 if ! [ $# -eq 2 ]; then
 echo "usage $0 <img_file_name> <package_list>"
 exit
@@ -15,6 +17,11 @@ if [ -f $IMG ]; then
         INSTALLDIR=`pwd`/mnt/
 else
 
+        echo "-> Preparing instalation of $DIST template..."
+        rm -f keys base_rpms
+        ln -sf keys_$DIST keys
+        ln -sf base_rpms_$DIST base_rpms
+
         echo "-> Initializing empty image..."
         truncate -s 10G $IMG || exit 1
 
@@ -31,9 +38,7 @@ else
         rpm --import --root=$INSTALLDIR keys/*
 
         echo "-> Installing core RPM packages..."
-        rpm -i --root=$INSTALLDIR base_rpms/setup-*.rpm
-        rpm -i --root=$INSTALLDIR base_rpms/filesystem-*.rpm
-        rpm -i --root=$INSTALLDIR base_rpms/fedora-release-*.rpm
+        rpm -i --root=$INSTALLDIR base_rpms/*.rpm
 
         cp clean_images/network $INSTALLDIR/etc/sysconfig
         cp clean_images/resolv.conf $INSTALLDIR/etc
diff --git a/keys b/keys
new file mode 120000
index 0000000..4abf358
--- /dev/null
+++ b/keys
@@ -0,0 +1 @@
+keys_fc14
\ No newline at end of file
diff --git a/keys/RPM-GPG-KEY-fedora-14-primary b/keys_fc14/RPM-GPG-KEY-fedora-14-primary
similarity index 100%
rename from keys/RPM-GPG-KEY-fedora-14-primary
rename to keys_fc14/RPM-GPG-KEY-fedora-14-primary
diff --git a/keys/qubes-release-1-signing-key.asc b/keys_fc14/qubes-release-1-signing-key.asc
similarity index 100%
rename from keys/qubes-release-1-signing-key.asc
rename to keys_fc14/qubes-release-1-signing-key.asc
diff --git a/version_core b/version_core
index affe5a6..6e3a920 100644
--- a/version_core
+++ b/version_core
@@ -1 +1 @@
-1.6.29-1.fc14.x86_64
+1.6.29-1.DIST.x86_64
diff --git a/version_gui b/version_gui
index 8fb17cd..627e722 100644
--- a/version_gui
+++ b/version_gui
@@ -1 +1 @@
-1.3.6-1.fc14.x86_64
+1.3.6-1.DIST.x86_64