From ad2bdf06344a036587d453df53c93cc0a8568097 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Tue, 12 Mar 2013 16:50:14 +0100 Subject: [PATCH] Rename 'version_dom0' -> 'version' This repository contains only dom0 files now. --- Makefile | 12 ++++++------ rpm_spec/core-dom0.spec | 2 +- version_dom0 => version | 0 3 files changed, 7 insertions(+), 7 deletions(-) rename version_dom0 => version (100%) diff --git a/Makefile b/Makefile index 4c76c423..3607c0ed 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ RPMS_DIR=rpm/ -VERSION_DOM0 := $(shell cat version_dom0) +VERSION := $(shell cat version) VERSION_VAIO_FIXES := $(shell cat version_vaio_fixes) DIST_DOM0 ?= fc18 @@ -22,26 +22,26 @@ rpms-vm: rpms-dom0: rpms-vaio-fixes rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-dom0.spec rpm --addsign \ - $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*.rpm + $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION)*.rpm rpms-vaio-fixes: rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-dom0-vaio-fixes.spec rpm --addsign $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*.rpm update-repo-current: - ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*$(DIST_DOM0)*.rpm ../yum/current-release/current/dom0/rpm/ + ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION)*$(DIST_DOM0)*.rpm ../yum/current-release/current/dom0/rpm/ ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*$(DIST_DOM0)*.rpm ../yum/current-release/current/dom0/rpm/ update-repo-current-testing: - ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*$(DIST_DOM0)*.rpm ../yum/current-release/current-testing/dom0/rpm/ + ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION)*$(DIST_DOM0)*.rpm ../yum/current-release/current-testing/dom0/rpm/ ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*$(DIST_DOM0)*.rpm ../yum/current-release/current-testing/dom0/rpm/ update-repo-unstable: - ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*$(DIST_DOM0)*.rpm ../yum/current-release/unstable/dom0/rpm/ + ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION)*$(DIST_DOM0)*.rpm ../yum/current-release/unstable/dom0/rpm/ ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*$(DIST_DOM0)*.rpm ../yum/current-release/unstable/dom0/rpm/ update-repo-installer: - ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-*$(VERSION_DOM0)*$(DIST_DOM0)*.rpm ../installer/yum/qubes-dom0/rpm/ + ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-*$(VERSION)*$(DIST_DOM0)*.rpm ../installer/yum/qubes-dom0/rpm/ clean: make -C misc clean diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec index 17d280b9..94d82317 100644 --- a/rpm_spec/core-dom0.spec +++ b/rpm_spec/core-dom0.spec @@ -25,7 +25,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%{!?version: %define version %(cat version_dom0)} +%{!?version: %define version %(cat version)} %if %{fedora} >= 15 %{!?use_systemd: %define use_systemd 1} diff --git a/version_dom0 b/version similarity index 100% rename from version_dom0 rename to version