Use %DIST% keyword instead of plain DIST

13 years ago · 5c7bc90c46
parent 504dfc2356
commit 5c7bc90c46
3 changed files with 4 additions and 4 deletions
--- a/create_symlinks_in_rpms_to_install_dir.sh
+++ b/create_symlinks_in_rpms_to_install_dir.sh
@ -6,14 +6,14 @@ SRC_ROOT=../..
 : DIST=fc14

 rm -fr rpms_to_install/*
-VERSION_CORE=$(cat version_core | sed "s/DIST/$DIST/")
+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 | sed "s/DIST/$DIST/")
+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)
--- a/2
+++ b/2
@ -1 +1 @@
-1.6.30-1.DIST.x86_64
+1.6.30-1.%DIST%.x86_64
--- a/2
+++ b/2
@ -1 +1 @@
-1.3.6-1.DIST.x86_64
+1.3.6-1.%DIST%.x86_64