From 3bff27460e9ee40d229b711d30dd506c8870cc02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 26 Jun 2016 10:48:00 +0200 Subject: [PATCH] upgrade: package for simplify upgrade from R3.1 to R3.2 --- Makefile.builder | 4 +++ misc/RPM-GPG-KEY-upgrade-qubes-3-primary | 40 +++++++++++++++++++++++ misc/RPM-GPG-KEY-upgrade-qubes-3-unstable | 29 ++++++++++++++++ misc/qubes-upgrade.repo | 20 ++++++++++++ rpm_spec/upgrade-vm.spec | 28 ++++++++++++++++ 5 files changed, 121 insertions(+) create mode 100644 misc/RPM-GPG-KEY-upgrade-qubes-3-primary create mode 100644 misc/RPM-GPG-KEY-upgrade-qubes-3-unstable create mode 100644 misc/qubes-upgrade.repo create mode 100644 rpm_spec/upgrade-vm.spec diff --git a/Makefile.builder b/Makefile.builder index 9324e0d..2364f45 100644 --- a/Makefile.builder +++ b/Makefile.builder @@ -1,6 +1,10 @@ ifeq ($(PACKAGE_SET),vm) + ifeq ($(UPGRADE_PKG_ONLY),yes) + RPM_SPEC_FILES := rpm_spec/upgrade-vm.spec + else RPM_SPEC_FILES := rpm_spec/core-vm.spec \ rpm_spec/core-vm-doc.spec + endif ifneq ($(filter $(DISTRIBUTION), debian qubuntu),) DEBIAN_BUILD_DIRS := debian diff --git a/misc/RPM-GPG-KEY-upgrade-qubes-3-primary b/misc/RPM-GPG-KEY-upgrade-qubes-3-primary new file mode 100644 index 0000000..66751ab --- /dev/null +++ b/misc/RPM-GPG-KEY-upgrade-qubes-3-primary @@ -0,0 +1,40 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +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 +=idYC +-----END PGP PUBLIC KEY BLOCK----- diff --git a/misc/RPM-GPG-KEY-upgrade-qubes-3-unstable b/misc/RPM-GPG-KEY-upgrade-qubes-3-unstable new file mode 100644 index 0000000..622dd4f --- /dev/null +++ b/misc/RPM-GPG-KEY-upgrade-qubes-3-unstable @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBFRuA2sBEACjOSNmDK6g6vpirgy0mRbRORP44eI0R45JN3oSGgsmCD5jJSTo +RRUE1RknbK26+bjnsKAKwpP67CA3So/5sa4l7i7G4xJdgVZooM3ZTK7ubQCqkMYB +h4yYTBAtt7vi6olhKvEkCvhzozcUa4/qW/NuIuTCpF0G0kBUWyqqYQzwtWD5QimE +6NjbxjuKf0P0KtzUvF2SdNYh87kXUj+6+RcA6VxjsLY3gSWnl+786L4yKUekRjB7 +JvD9yMd1V+U/P1MUamJFyn68Aih6dRi17/ZvHKHY0gj6k6acE34Oy6SDmbwuWWeZ +jMpSACAHHhWJID0wwrig3ZsxV4lGWoND/n+OSmEyWg4J8dB1thZpoBgjL05prBgC +oygzwyHlyewVqdtdjMJOSSk34pehQ35lPQ9XqASnF1igQaVTKFxUIg1eoaQMZibd +dSJzEcwuFUeJ1S22lyUdtaC/WdGb5vvHSEDiOA/3Ll0gpaHm2tor08J0s9C6CD2Q +irF/FwUu52yO/bNtOkXunX5G2Ua+c49o3D6bvc+mfBY4EVKN5k6URW+vy47gJDbH +4CVcxgBRoFy8SdAogqf/H/4+UOAR5jo5QLzsRq0mRHRbleLHwyH5PQxF9M73UVgL +J5OohzOoThyiWbIesjyFw9aiC1Dk9l6ugprPTAS6LPNpxNaByNlpbX/eJQARAQAB +tCdRdWJlcyBPUyBSZWxlYXNlIDMgVW5zdGFibGUgU2lnbmluZyBLZXmJAjgEEwEC +ACIFAlRuA2sCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEJP+RAmjx3Ot +WFMP/1y98l3kXaIUIXZFjdtCmiZvFZKETP5S/81Rn32PISSs5TklxWbt6B3rNY67 +ovtK10qJXxarLeu0+IR+UM+AV1R/OvT3qtrJuvbbr0vIyy0RONaapoPIdI2eD2FC +E/7JTv7KibKSE4nI9W9ZdRboJB1MPigffBR7qAC2ReCGtyKVUWRCKh57aQqbSDkZ +AruTV1gXbFDusuKh1kQ2zVXFMn9KU98Qv0nKewjndNwnfOk7UFdsTkRCEyHr19wx +KOuoLH4bfCyV8dEfriM5d6ABjmpv0Olp9XFT5YznoxrsXAjO0aUIBiNYYTk5vRLG +ixBJGRjruDUzCZ8gIObIEwfAJsJ4LsFZ5LI0csF2uNueeogmNm0LfejyrWBlyRfW +XdM5WP9vAbWectxNfaW84pPkvAEaer2W+x9ddO+FirTPNgU0M55JxcjKve8XsbuK +iOA80h8eiMuukn2CDENVG9g7hiui9YzcenQKzmZIYYARWPzSKRyRrMFWrhDjOZ+R +sG2PKzuJVIatGqhzqjD4CmoMPkVDli9p1ADOJLMJu062D53aWjgVi6DFHt5cZmFx +rvDPiLqy/uuWWSDaDgX36KEenvwzQLjlEdTrN8a3qiBMxeceLWFLQqAknQnmU19/ +HcyP+lX0FzFFm1yIB/aEQpcXsfJcil0Dg6zAeFbXxdQYWlVm +=7CDU +-----END PGP PUBLIC KEY BLOCK----- diff --git a/misc/qubes-upgrade.repo b/misc/qubes-upgrade.repo new file mode 100644 index 0000000..92baca1 --- /dev/null +++ b/misc/qubes-upgrade.repo @@ -0,0 +1,20 @@ +[qubes-upgrade-vm-current] +name = Qubes OS Repository for VM (updates) +baseurl = http://yum.qubes-os.org/r3.2/current/vm/fc$releasever +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-upgrade-qubes-3-primary +gpgcheck = 1 + +[qubes-upgrade-vm-current-testing] +name = Qubes OS Repository for VM (updates-testing) +baseurl = http://yum.qubes-os.org/r3.2/current-testing/vm/fc$releasever +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-upgrade-qubes-3-primary +gpgcheck = 1 +enabled=0 + +[qubes-upgrade-vm-unstable] +name = Qubes OS Repository for VM (unstable) +baseurl = http://yum.qubes-os.org/r3.2/unstable/vm/fc$releasever +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-upgrade-qubes-3-unstable +gpgcheck = 1 +enabled=0 + diff --git a/rpm_spec/upgrade-vm.spec b/rpm_spec/upgrade-vm.spec new file mode 100644 index 0000000..8098d68 --- /dev/null +++ b/rpm_spec/upgrade-vm.spec @@ -0,0 +1,28 @@ +Name: qubes-upgrade-vm +Version: 3.1 +Release: 1%{?dist} +Summary: Qubes upgrade VM package + +Group: Qubes +Vendor: Invisible Things Lab +License: GPL +URL: http://www.qubes-os.org + +%define _builddir %(pwd) + +%description +Upgrade package for Qubes VM. + +This package contains only minimal file set required to upgrade Qubes VM +template to next Qubes release. + +%install +mkdir -p $RPM_BUILD_ROOT/etc/pki/rpm-gpg +install -m 644 misc/RPM-GPG-KEY-upgrade-qubes-* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ + +mkdir -p $RPM_BUILD_ROOT/etc/yum.repos.d +install -m 644 misc/qubes-upgrade.repo $RPM_BUILD_ROOT/etc/yum.repos.d/ + +%files +/etc/yum.repos.d/qubes-upgrade.repo +/etc/pki/rpm-gpg/RPM-GPG-KEY-upgrade-qubes*