From 84c9ae4bf16c8f10c61f0203d0d6e0cdf30c19c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sat, 30 Jan 2016 11:18:33 +0100 Subject: [PATCH 1/5] rpm: preparation for src.rpm building QubesOS/qubes-issues#1508 --- Makefile.builder | 1 + ...upport.spec => qubes-kernel-vm-support.spec.in} | 14 +++++--------- rpm_spec/{qubes-utils.spec => qubes-utils.spec.in} | 13 ++++--------- 3 files changed, 10 insertions(+), 18 deletions(-) rename rpm_spec/{qubes-kernel-vm-support.spec => qubes-kernel-vm-support.spec.in} (88%) rename rpm_spec/{qubes-utils.spec => qubes-utils.spec.in} (93%) diff --git a/Makefile.builder b/Makefile.builder index c19f19c..abaf768 100644 --- a/Makefile.builder +++ b/Makefile.builder @@ -1,3 +1,4 @@ RPM_SPEC_FILES := rpm_spec/qubes-utils.spec rpm_spec/qubes-kernel-vm-support.spec +RPM_USE_MOCKBUILD := 1 ARCH_BUILD_DIRS := archlinux DEBIAN_BUILD_DIRS := debian diff --git a/rpm_spec/qubes-kernel-vm-support.spec b/rpm_spec/qubes-kernel-vm-support.spec.in similarity index 88% rename from rpm_spec/qubes-kernel-vm-support.spec rename to rpm_spec/qubes-kernel-vm-support.spec.in index 1e4527f..e70a9e5 100644 --- a/rpm_spec/qubes-kernel-vm-support.spec +++ b/rpm_spec/qubes-kernel-vm-support.spec.in @@ -19,16 +19,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # - -%{!?version: %define version %(cat version)} - # Package contains /usr/lib, but not binary files, which confuses find-debuginfo.sh script. %global debug_package %{nil} Name: qubes-kernel-vm-support -Version: %{version} +Version: @VERSION@ Release: 1%{?dist} Summary: Qubes VM kernel and initramfs modules +Source0: qubes-utils-%{version}.tar.gz Group: Qubes Vendor: Invisible Things Lab @@ -38,7 +36,9 @@ URL: http://www.qubes-os.org Requires: dracut Requires: dkms +%if 0%{?qubes_builder} %define _builddir %(pwd) +%endif %description This package contains: @@ -50,11 +50,7 @@ initrd is provided by dom0. libvchan library. %prep -# we operate on the current directory, so no need to unpack anything -# symlink is to generate useful debuginfo packages -rm -f %{name}-%{version} -ln -sf . %{name}-%{version} -%setup -T -D +%setup -q -n qubes-utils-%{version} %build diff --git a/rpm_spec/qubes-utils.spec b/rpm_spec/qubes-utils.spec.in similarity index 93% rename from rpm_spec/qubes-utils.spec rename to rpm_spec/qubes-utils.spec.in index 05a5f45..d733b52 100644 --- a/rpm_spec/qubes-utils.spec +++ b/rpm_spec/qubes-utils.spec.in @@ -1,12 +1,12 @@ -%define version %(cat version) %if 0%{?qubes_builder} %define _builddir %(pwd) %endif Name: qubes-utils -Version: %{version} +Version: @VERSION@ Release: 1%{?dist} Summary: Common Linux files for Qubes Dom0 and VM +Source0: %{name}-%{version}.tar.gz Group: Qubes License: GPL @@ -88,15 +88,10 @@ Release: 1%{?dist} Libraries for qubes-utils %prep -# we operate on the current directory, so no need to unpack anything -# symlink is to generate useful debuginfo packages -rm -f %{name}-%{version} -ln -sf . %{name}-%{version} -%setup -T -D - +%setup -q %build -make all +make all BACKEND_VMM=@BACKEND_VMM@ %install make install DESTDIR=%{buildroot} PYTHON=%{__python2} From 0630c17588954fd64f193b77e8b5190955a67b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Wed, 24 Jan 2018 12:19:08 +0100 Subject: [PATCH 2/5] Makefile.builder: currently disable Mock --- Makefile.builder | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.builder b/Makefile.builder index abaf768..c19f19c 100644 --- a/Makefile.builder +++ b/Makefile.builder @@ -1,4 +1,3 @@ RPM_SPEC_FILES := rpm_spec/qubes-utils.spec rpm_spec/qubes-kernel-vm-support.spec -RPM_USE_MOCKBUILD := 1 ARCH_BUILD_DIRS := archlinux DEBIAN_BUILD_DIRS := debian From a716102a0829b5554f0936219ed91f328f69c859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Sun, 28 Jan 2018 11:12:19 +0100 Subject: [PATCH 3/5] Remove _builddir --- rpm_spec/qubes-kernel-vm-support.spec.in | 4 ---- rpm_spec/qubes-utils.spec.in | 4 ---- 2 files changed, 8 deletions(-) diff --git a/rpm_spec/qubes-kernel-vm-support.spec.in b/rpm_spec/qubes-kernel-vm-support.spec.in index e70a9e5..b77b840 100644 --- a/rpm_spec/qubes-kernel-vm-support.spec.in +++ b/rpm_spec/qubes-kernel-vm-support.spec.in @@ -36,10 +36,6 @@ URL: http://www.qubes-os.org Requires: dracut Requires: dkms -%if 0%{?qubes_builder} -%define _builddir %(pwd) -%endif - %description This package contains: 1. Dracut module required to setup Qubes VM root filesystem. This package is diff --git a/rpm_spec/qubes-utils.spec.in b/rpm_spec/qubes-utils.spec.in index d733b52..1ff5951 100644 --- a/rpm_spec/qubes-utils.spec.in +++ b/rpm_spec/qubes-utils.spec.in @@ -1,7 +1,3 @@ -%if 0%{?qubes_builder} -%define _builddir %(pwd) -%endif - Name: qubes-utils Version: @VERSION@ Release: 1%{?dist} From 2b3b6841079c62e6b5e675eee86f6c3b22610f85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Sun, 28 Jan 2018 16:22:41 +0100 Subject: [PATCH 4/5] Fix debug symbols --- rpm_spec/qubes-kernel-vm-support.spec.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rpm_spec/qubes-kernel-vm-support.spec.in b/rpm_spec/qubes-kernel-vm-support.spec.in index b77b840..dd3e259 100644 --- a/rpm_spec/qubes-kernel-vm-support.spec.in +++ b/rpm_spec/qubes-kernel-vm-support.spec.in @@ -19,9 +19,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# Package contains /usr/lib, but not binary files, which confuses find-debuginfo.sh script. -%global debug_package %{nil} - Name: qubes-kernel-vm-support Version: @VERSION@ Release: 1%{?dist} @@ -48,8 +45,6 @@ libvchan library. %prep %setup -q -n qubes-utils-%{version} -%build - %install make install-fedora-kernel-support DESTDIR=%{buildroot} From f049d635710083cebb395a28ba740c2a9f4f9640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Tue, 3 Apr 2018 21:29:52 +0200 Subject: [PATCH 5/5] spec.in: add changelog placeholder --- rpm_spec/qubes-kernel-vm-support.spec.in | 2 +- rpm_spec/qubes-utils.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm_spec/qubes-kernel-vm-support.spec.in b/rpm_spec/qubes-kernel-vm-support.spec.in index dd3e259..8ccad23 100644 --- a/rpm_spec/qubes-kernel-vm-support.spec.in +++ b/rpm_spec/qubes-kernel-vm-support.spec.in @@ -62,4 +62,4 @@ dkms add -m u2mfn -v %{version} --rpm_safe_upgrade dkms remove -m u2mfn -v %{version} --all --rpm_safe_upgrade %changelog - +@CHANGELOG@ diff --git a/rpm_spec/qubes-utils.spec.in b/rpm_spec/qubes-utils.spec.in index 1ff5951..32d20da 100644 --- a/rpm_spec/qubes-utils.spec.in +++ b/rpm_spec/qubes-utils.spec.in @@ -152,4 +152,4 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libqubes-rpc-filecopy.so %changelog - +@CHANGELOG@