From a5e33bdbc0d62f85ab6dba2fe0abc795d8089c0c Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Thu, 26 May 2011 13:58:15 +0200 Subject: [PATCH 1/8] version 1.5.28-vm --- version_vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_vm b/version_vm index f93a854..ac2f82c 100644 --- a/version_vm +++ b/version_vm @@ -1 +1 @@ -1.5.27 +1.5.28 From a7c679c6e7272b93662b317e830dd1aeabcf0720 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Fri, 24 Jun 2011 23:00:40 +0200 Subject: [PATCH 2/8] Makefile: automaically copy rpms to _all_ vm repos --- Makefile | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 881b6a4..aea9b2f 100644 --- a/Makefile +++ b/Makefile @@ -29,23 +29,28 @@ rpms-vaio-fixes: update-repo-current: ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/current/dom0/rpm/ ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*fc13*.rpm ../yum/current-release/current/dom0/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc13*.rpm ../yum/current-release/current/vm/f13/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc14*.rpm ../yum/current-release/current/vm/f14/rpm/ + for vmrepo in ../yum/current-release/current/vm/* ; do \ + dist=$$(basename $$vmrepo) ;\ + ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ + done cd ../yum && ./update_repo.sh update-repo-current-testing: ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/current-testing/dom0/rpm/ ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*fc13*.rpm ../yum/current-release/current-testing/dom0/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc13*.rpm ../yum/current-release/current-testing/vm/f13/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc14*.rpm ../yum/current-release/current-testing/vm/f14/rpm/ + for vmrepo in ../yum/current-release/current-testing/vm/* ; do \ + dist=$$(basename $$vmrepo) ;\ + ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ + done cd ../yum && ./update_repo.sh - update-repo-unstable: ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/unstable/dom0/rpm/ ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*fc13*.rpm ../yum/current-release/unstable/dom0/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc13*.rpm ../yum/current-release/unstable/vm/f13/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*fc14*.rpm ../yum/current-release/unstable/vm/f14/rpm/ + for vmrepo in ../yum/current-release/unstable/vm/* ; do \ + dist=$$(basename $$vmrepo) ;\ + ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ + done cd ../yum && ./update_repo.sh update-repo-installer: From b2482f80256719e12915a99d673c23a591fc6c09 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Thu, 30 Jun 2011 20:47:48 +0200 Subject: [PATCH 3/8] Makefile: don't autoupdate yum repo after copying rpms there --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index aea9b2f..8f98ae4 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,6 @@ update-repo-current: dist=$$(basename $$vmrepo) ;\ ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ done - cd ../yum && ./update_repo.sh update-repo-current-testing: ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/current-testing/dom0/rpm/ @@ -42,7 +41,6 @@ update-repo-current-testing: dist=$$(basename $$vmrepo) ;\ ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ done - cd ../yum && ./update_repo.sh update-repo-unstable: ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*fc13*.rpm ../yum/current-release/unstable/dom0/rpm/ @@ -51,7 +49,6 @@ update-repo-unstable: dist=$$(basename $$vmrepo) ;\ ln -f $(RPMS_DIR)/x86_64/qubes-core-*vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ done - cd ../yum && ./update_repo.sh update-repo-installer: ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-*$(VERSION_DOM0)*fc13*.rpm ../installer/yum/qubes-dom0/rpm/ From 3d1ca80d28e70f6239a5c40fb6b4ff8aaf756754 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Fri, 1 Jul 2011 22:56:11 +0200 Subject: [PATCH 4/8] Update VM yum repos confs for Beta2 --- common/qubes.fc13.repo | 6 +++--- common/qubes.fc14.repo | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/qubes.fc13.repo b/common/qubes.fc13.repo index 982b095..376b490 100644 --- a/common/qubes.fc13.repo +++ b/common/qubes.fc13.repo @@ -1,19 +1,19 @@ [qubes-vm-current] name = Qubes OS Repository for VM (updates) -baseurl = http://yum.qubes-os.org/r1-beta1/current/vm/f13 +baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc13 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary gpgcheck = 1 [qubes-vm-current-testing] name = Qubes OS Repository for VM (updates-testing) -baseurl = http://yum.qubes-os.org/r1-beta1/current-testing/vm/f13 +baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc13 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary gpgcheck = 1 enabled=0 [qubes-vm-unstable] name = Qubes OS Repository for VM (unstable) -baseurl = http://yum.qubes-os.org/r1-beta1/unstable/vm/f13 +baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc13 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary gpgcheck = 1 enabled=0 diff --git a/common/qubes.fc14.repo b/common/qubes.fc14.repo index b10c80c..2020d1e 100644 --- a/common/qubes.fc14.repo +++ b/common/qubes.fc14.repo @@ -1,19 +1,19 @@ [qubes-vm-current] name = Qubes OS Repository for VM (updates) -baseurl = http://yum.qubes-os.org/r1-beta1/current/vm/f14 +baseurl = http://yum.qubes-os.org/r1-beta2/current/vm/fc14 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary gpgcheck = 1 [qubes-vm-current-testing] name = Qubes OS Repository for VM (updates-testing) -baseurl = http://yum.qubes-os.org/r1-beta1/current-testing/vm/f14 +baseurl = http://yum.qubes-os.org/r1-beta2/current-testing/vm/fc14 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary gpgcheck = 1 enabled=0 [qubes-vm-unstable] name = Qubes OS Repository for VM (unstable) -baseurl = http://yum.qubes-os.org/r1-beta1/unstable/vm/f14 +baseurl = http://yum.qubes-os.org/r1-beta2/unstable/vm/fc14 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary gpgcheck = 1 enabled=0 From 313928c305b732f135ffb15a0660f63d34443927 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Sat, 2 Jul 2011 00:30:28 +0200 Subject: [PATCH 5/8] version: 1.6.5 --- version_vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_vm b/version_vm index 9edc58b..9f05f9f 100644 --- a/version_vm +++ b/version_vm @@ -1 +1 @@ -1.6.4 +1.6.5 From 0574daa2c5067371156c402119403804aa244aac Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Sat, 2 Jul 2011 13:12:53 +0200 Subject: [PATCH 6/8] vm: Load evtchn module in qubes_core --- common/qubes_core | 1 + 1 file changed, 1 insertion(+) diff --git a/common/qubes_core b/common/qubes_core index b941efb..fbc48d4 100755 --- a/common/qubes_core +++ b/common/qubes_core @@ -15,6 +15,7 @@ start() exit 1 fi + modprobe evtchn modprobe u2mfn # Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read From 232f22856c44bb26a1ff7e1115bd14dc74c500fb Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Sat, 2 Jul 2011 13:14:57 +0200 Subject: [PATCH 7/8] vm: qubes_core ident fixes --- common/qubes_core | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/qubes_core b/common/qubes_core index fbc48d4..fb2d30c 100755 --- a/common/qubes_core +++ b/common/qubes_core @@ -15,11 +15,11 @@ start() exit 1 fi - modprobe evtchn - modprobe u2mfn + modprobe evtchn + modprobe u2mfn - # Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read - chmod 666 /proc/xen/xenbus + # Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read + chmod 666 /proc/xen/xenbus name=$(/usr/bin/xenstore-read name) if ! [ -f /etc/this_is_dvm ] ; then From 18d55a9faa84181373ca6d847325b6de9ef15d5e Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Sat, 2 Jul 2011 13:36:19 +0200 Subject: [PATCH 8/8] version 1.6.6 --- version_vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_vm b/version_vm index 9f05f9f..ec70f75 100644 --- a/version_vm +++ b/version_vm @@ -1 +1 @@ -1.6.5 +1.6.6