From dfc6bbe56a85fd9eed13ddccf2a661855ce33067 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 10 Jan 2011 17:14:45 -0500 Subject: [PATCH] revert back to 22 kernel and introduce coblitz-unstable-tags.mk --- coblitz-latest-tags.mk | 11 +++++---- coblitz-unstable-tags.mk | 48 ++++++++++++++++++++++++++++++++++++++++ coblitz.mk | 26 +++++++++++----------- 3 files changed, 66 insertions(+), 19 deletions(-) create mode 100644 coblitz-unstable-tags.mk diff --git a/coblitz-latest-tags.mk b/coblitz-latest-tags.mk index bc02ea03..ca8ef3f7 100644 --- a/coblitz-latest-tags.mk +++ b/coblitz-latest-tags.mk @@ -1,13 +1,12 @@ # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication -mkinitrd-GITPATH := git://git.planet-lab.org/mkinitrd.git@master -linux-2.6-BRANCH := rhel6 -linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-7 +linux-2.6-BRANCH := coblitz2 +linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-22-49.3.coblitz madwifi-BRANCH := 0.9.4 madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@madwifi-0.9.4-3 -util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-10 -util-vserver-BUILD-FROM-SRPM := yes # tmp -util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-21 +util-vserver-BRANCH := scholz +util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6 +util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-27 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-7 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 diff --git a/coblitz-unstable-tags.mk b/coblitz-unstable-tags.mk new file mode 100644 index 00000000..bc02ea03 --- /dev/null +++ b/coblitz-unstable-tags.mk @@ -0,0 +1,48 @@ +# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication + +mkinitrd-GITPATH := git://git.planet-lab.org/mkinitrd.git@master +linux-2.6-BRANCH := rhel6 +linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-7 +madwifi-BRANCH := 0.9.4 +madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@madwifi-0.9.4-3 +util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-10 +util-vserver-BUILD-FROM-SRPM := yes # tmp +util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-21 +libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 +nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-7 +PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 +nodemanager-GITPATH := git://git.planet-lab.org/nodemanager@nodemanager-1.8-29 +pyplnet-GITPATH := git://git.planet-lab.org/pyplnet@pyplnet-4.3-7 +pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 +codemux-GITPATH := git://git.planet-lab.org/codemux.git@CoDemux-0.1-13 +fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-1 +pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2 +Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2 +iptables-BUILD-FROM-SRPM := yes # tmp +iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptables-1.4.9-0 +iproute-BUILD-FROM-SRPM := yes # tmp +iproute2-GITPATH := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0 +inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 +vsys-BRANCH := 0.9 +vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4 +vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-18 +plcapi-GITPATH := git://git.planet-lab.org/plcapi@plcapi-4.3-36 +drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14 +plewww-GITPATH := git://git.planet-lab.org/plewww@PLEWWW-4.3-53 +www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5 +Monitor-SVNPATH := http://svn.planet-lab.org/svn//Monitor/tags/Monitor-3.0-30/ +pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-2/ +nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-4.3-7 +BootManager-BRANCH := 4.3 +bootmanager-GITPATH := git://git.planet-lab.org/bootmanager@bootmanager-4.3-20 +pypcilib-GITPATH := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9 +bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-4.2-18 +vserver-reference-GITPATH := git://git.planet-lab.org/vserver-reference@vserver-reference-5.0-5 +bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@BootstrapFS-1.0-12 +myplc-GITPATH := git://git.planet-lab.org/myplc@myplc-4.3-43 +sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-14 +pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1 +PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11 + +# locating the right test directory - see make tests_gitpath +tests-GITPATH := git://git.onelab.eu/tests.git@tests-4.3-6 diff --git a/coblitz.mk b/coblitz.mk index 16ad1ecd..70c7440f 100644 --- a/coblitz.mk +++ b/coblitz.mk @@ -14,16 +14,16 @@ # mkinitrd # -ifeq "$(DISTRONAME)" "centos5" -mkinitrd-MODULES := mkinitrd -mkinitrd-SPEC := mkinitrd.spec -mkinitrd-BUILD-FROM-SRPM := yes -ALL += mkinitrd -IN_BOOTCD += mkinitrd -IN_VSERVER += mkinitrd -IN_BOOTSTRAPFS += mkinitrd -IN_MYPLC += mkinitrd -endif +#ifeq "$(DISTRONAME)" "centos5" +#mkinitrd-MODULES := mkinitrd +#mkinitrd-SPEC := mkinitrd.spec +#mkinitrd-BUILD-FROM-SRPM := yes +#ALL += mkinitrd +#IN_BOOTCD += mkinitrd +#IN_VSERVER += mkinitrd +#IN_BOOTSTRAPFS += mkinitrd +#IN_MYPLC += mkinitrd +#endif # # kernel @@ -34,9 +34,9 @@ endif kernel-MODULES := linux-2.6 kernel-SPEC := kernel-2.6.spec -ifeq "$(DISTRONAME)" "centos5" -kernel-DEPEND-DEVEL-RPMS: mkinitrd -endif +#ifeq "$(DISTRONAME)" "centos5" +#kernel-DEPEND-DEVEL-RPMS: mkinitrd +#endif kernel-BUILD-FROM-SRPM := yes ifeq "$(HOSTARCH)" "i386" kernel-RPMFLAGS:= --target i686 -- 2.47.0