From 697e50711cfe85088eaf70c5bc126717d54f1e3f Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Sat, 30 Apr 2011 22:46:15 +0200 Subject: [PATCH 1/4] Makefile: update-repo-{current,unstable} targets --- Makefile.common | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/Makefile.common b/Makefile.common index 78d0eff..b24acb3 100644 --- a/Makefile.common +++ b/Makefile.common @@ -86,6 +86,30 @@ srpm: get-sources $(SPECFILE) verrel: @echo $(NAME)-$(VERSION)-$(RELEASE) + +update-repo-current: + ln -f rpm/x86_64/kernel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/ + ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/ + ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/ + ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f13/rpm/ + ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f14/rpm/ + ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f13/rpm/ + ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f14/rpm/ + ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f13/rpm/ + ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f14/rpm/ + +update-repo-unstable: + ln -f rpm/x86_64/kernel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/ + ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/ + ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/ + ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f13/rpm/ + ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f14/rpm/ + ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f13/rpm/ + ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f14/rpm/ + ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f13/rpm/ + ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f14/rpm/ + + # mop up, printing out exactly what was mopped. .PHONY : clean @@ -105,4 +129,5 @@ help: @echo "rpms-just-build Skip packaging (just test compilation)" @echo "srpm Create an srpm" @echo - + @echo "make update-repo-current -- copy newly generated rpms to qubes yum repo" + @echo "make update-repo-unstable -- same, but to -testing repo" From fef3ab7aff0e282fc1f186d01b071949c21a14dd Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Tue, 10 May 2011 12:13:24 +0200 Subject: [PATCH 2/4] Makefile: update-repo-current-testing target --- Makefile.common | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile.common b/Makefile.common index b24acb3..e5d6cd7 100644 --- a/Makefile.common +++ b/Makefile.common @@ -98,6 +98,18 @@ update-repo-current: ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f13/rpm/ ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f14/rpm/ +update-repo-current-testing: + ln -f rpm/x86_64/kernel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/dom0/rpm/ + ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/dom0/rpm/ + ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/dom0/rpm/ + ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f13/rpm/ + ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f14/rpm/ + ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f13/rpm/ + ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f14/rpm/ + ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f13/rpm/ + ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f14/rpm/ + + update-repo-unstable: ln -f rpm/x86_64/kernel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/ ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/ @@ -130,4 +142,5 @@ help: @echo "srpm Create an srpm" @echo @echo "make update-repo-current -- copy newly generated rpms to qubes yum repo" - @echo "make update-repo-unstable -- same, but to -testing repo" + @echo "make update-repo-current-testing -- same, but to -current-testing" + @echo "make update-repo-unstable -- same, but to -unstable repo" From 4043e5cd3f3a0b13e4cf98be9ac9485bc780e982 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Fri, 24 Jun 2011 15:48:08 +0200 Subject: [PATCH 3/4] Makefile: automaically copy rpms to _all_ vm repos --- Makefile.common | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/Makefile.common b/Makefile.common index e5d6cd7..31ffa75 100644 --- a/Makefile.common +++ b/Makefile.common @@ -91,36 +91,31 @@ update-repo-current: ln -f rpm/x86_64/kernel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/ ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/ ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/ - ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f13/rpm/ - ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f14/rpm/ - ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f13/rpm/ - ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f14/rpm/ - ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f13/rpm/ - ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/vm/f14/rpm/ + for vmrepo in ../yum/current-release/current/vm/* ; do \ + ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ + ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ + ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ + done update-repo-current-testing: ln -f rpm/x86_64/kernel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/dom0/rpm/ ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/dom0/rpm/ ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/dom0/rpm/ - ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f13/rpm/ - ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f14/rpm/ - ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f13/rpm/ - ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f14/rpm/ - ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f13/rpm/ - ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/vm/f14/rpm/ - + for vmrepo in ../yum/current-release/current-testing/vm/* ; do \ + ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ + ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ + ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ + done update-repo-unstable: ln -f rpm/x86_64/kernel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/ ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/ ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/ - ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f13/rpm/ - ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f14/rpm/ - ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f13/rpm/ - ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f14/rpm/ - ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f13/rpm/ - ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/vm/f14/rpm/ - + for vmrepo in ../yum/current-release/unstable/vm/* ; do \ + ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ + ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ + ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ + done # mop up, printing out exactly what was mopped. From f6489c6a2138f263330af6ff1699ba11201a197e Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Fri, 1 Jul 2011 19:04:37 +0200 Subject: [PATCH 4/4] Makefile: don't copy kernel-domU and kernel-debuginfo rpms to VM repos --- Makefile.common | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Makefile.common b/Makefile.common index 31ffa75..0962b83 100644 --- a/Makefile.common +++ b/Makefile.common @@ -92,8 +92,6 @@ update-repo-current: ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/ ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/ for vmrepo in ../yum/current-release/current/vm/* ; do \ - ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ - ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ done @@ -102,8 +100,6 @@ update-repo-current-testing: ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/dom0/rpm/ ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/dom0/rpm/ for vmrepo in ../yum/current-release/current-testing/vm/* ; do \ - ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ - ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ done @@ -112,8 +108,6 @@ update-repo-unstable: ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/ ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/ for vmrepo in ../yum/current-release/unstable/vm/* ; do \ - ln -f rpm/x86_64/kernel-domU-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ - ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\ done