From 9b42f11084ded3e22a4fe938ca02c699e6195d5b Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Wed, 16 Mar 2011 19:14:42 +0100 Subject: [PATCH 1/4] Tag RPMs with dist info --- rpm_spec/core-appvm.spec | 2 +- rpm_spec/core-commonvm.spec | 2 +- rpm_spec/core-netvm.spec | 2 +- rpm_spec/core-proxyvm.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rpm_spec/core-appvm.spec b/rpm_spec/core-appvm.spec index 91fd13c..ce94bbe 100644 --- a/rpm_spec/core-appvm.spec +++ b/rpm_spec/core-appvm.spec @@ -24,7 +24,7 @@ Name: qubes-core-appvm Version: %{version} -Release: 1 +Release: 1%{dist} Summary: The Qubes core files for AppVM Group: Qubes diff --git a/rpm_spec/core-commonvm.spec b/rpm_spec/core-commonvm.spec index 1ee16a7..921e2ad 100644 --- a/rpm_spec/core-commonvm.spec +++ b/rpm_spec/core-commonvm.spec @@ -24,7 +24,7 @@ Name: qubes-core-commonvm Version: %{version} -Release: 1 +Release: 1%{dist} Summary: The Qubes core files for any VM Group: Qubes diff --git a/rpm_spec/core-netvm.spec b/rpm_spec/core-netvm.spec index 346c548..7394dd2 100644 --- a/rpm_spec/core-netvm.spec +++ b/rpm_spec/core-netvm.spec @@ -24,7 +24,7 @@ Name: qubes-core-netvm Version: %{version} -Release: 1 +Release: 1%{dist} Summary: The Qubes core files for NetVM Group: Qubes diff --git a/rpm_spec/core-proxyvm.spec b/rpm_spec/core-proxyvm.spec index 52bc17f..b5303cd 100644 --- a/rpm_spec/core-proxyvm.spec +++ b/rpm_spec/core-proxyvm.spec @@ -24,7 +24,7 @@ Name: qubes-core-proxyvm Version: %{version} -Release: 1 +Release: 1%{dist} Summary: The Qubes core files for NetVM Group: Qubes From 1726e81969dcf55b05ca6b331a43d08be7b4d6f0 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Wed, 23 Mar 2011 17:19:44 +0100 Subject: [PATCH 2/4] version 1.5.1 --- version_vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_vm b/version_vm index 347f583..26ca594 100644 --- a/version_vm +++ b/version_vm @@ -1 +1 @@ -1.4.1 +1.5.1 From 6c56fdc98b0ae4179168030ca6dff1401c30a037 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Wed, 23 Mar 2011 19:55:35 -0400 Subject: [PATCH 3/4] Enable build on appvm. --- rpm_spec/core-appvm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm_spec/core-appvm.spec b/rpm_spec/core-appvm.spec index 82df6ee..79d5cec 100644 --- a/rpm_spec/core-appvm.spec +++ b/rpm_spec/core-appvm.spec @@ -60,8 +60,8 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/qubes %build make clean all make -C ../common -make -C ../vchan make -C ../u2mfn +make -C ../vchan make -C ../qrexec %install From 1f92e9f746eaed92c4f13d04d64d0132b49a8850 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Wed, 23 Mar 2011 19:57:48 -0400 Subject: [PATCH 4/4] gitignores --- appvm/.gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appvm/.gitignore b/appvm/.gitignore index edd6d09..567ebb7 100644 --- a/appvm/.gitignore +++ b/appvm/.gitignore @@ -1,3 +1,7 @@ qubes_add_pendrive_script qubes_penctl qvm-open-in-dvm +dvm_file_editor +qfile-agent +qfile-agent-dvm +qfile-unpacker