git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 616f130 afaa75e)
Merge branch 'master' into lxc_devel
authorMarco Yuen <marcoy@cs.princeton.edu>
Mon, 16 Jan 2012 16:29:54 +0000 (11:29 -0500)
committerMarco Yuen <marcoy@cs.princeton.edu>
Mon, 16 Jan 2012 16:29:54 +0000 (11:29 -0500)
1  2 
onelab-k32-tags.mk patch | diff1 | diff2 | blob | history
planetlab-k32-tags.mk patch | diff1 | diff2 | blob | history

diff --combined onelab-k32-tags.mk
index 75f8472,daf6e1a..fc6afff
--- 1/onelab-k32-tags.mk
--- 2/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@@ -34,7 -34,7 +34,7 @@@ Mom-SVNPATH                   := http://svn.planet-lab.
  inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
  openvswitch-GITPATH           := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-2
  vsys-GITPATH                    := git://git.onelab.eu/vsys.git@vsys-0.99-2
- vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-33
+ vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-34
  plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-36
  drupal-GITPATH                  := git://git.onelab.eu/drupal.git@drupal-4.7-15
  plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-69
@@@ -52,7 -52,7 +52,7 @@@ oml-GITPATH                     := git:
  sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-2.0-9
  sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.9-3
  nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
 -bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-20
 +bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@lxcbuild
  pypcilib-GITPATH              := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10
  pyplnet-GITPATH                 := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-11
  bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-11
diff --combined planetlab-k32-tags.mk
index 2a5eed2,0a1e8ab..406b15c
--- 1/planetlab-k32-tags.mk
--- 2/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@@ -3,10 -3,9 +3,10 @@@
  mkinitrd-GITPATH              := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2
  linux-2.6-BRANCH              := rhel6
  linux-2.6-GITPATH             := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-27
 +linux-3-GITPATH               := git://git.planet-lab.org/linux-3.git@lxcbuild
  # help out spec2make on f8 and centos5, due to a bug in rpm
  ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 -kernel-WHITELIST-RPMS := kernel-devel,kernel-headers
 +kernel-WHITELIST-RPMS := kernel-devel,kernel-headers,kernel-firmware
  endif
  kernel-DEVEL-RPMS             += elfutils-libelf-devel
  madwifi-GITPATH                 := git://git.planet-lab.org/madwifi.git@madwifi-4132-4
@@@ -19,20 -18,20 +19,20 @@@ libnl-GITPATH                      := git://git.planet-lab
  util-vserver-pl-GITPATH               := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-26
  nodeupdate-GITPATH            := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9
  PingOfDeath-SVNPATH           := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 -nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-34
 +nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@lxcbuild
  # Trellis-specific NodeManager plugins
  nodemanager-topo-GITPATH      := git://git.planet-lab.org/NodeManager-topo@master
  NodeManager-optin-SVNPATH     := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
  #
  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-15
 -fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-3
 +fprobe-ulog-GITPATH             := git://git.planet-lab.org/fprobe-ulog.git@fprobe-ulog-1.1.4-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-4
 +Mom-GITPATH                     := git://git.planet-lab.org/mom.git@Mom-2.3-4
  inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
  openvswitch-GITPATH           := git://git.planet-lab.org/openvswitch.git@master
  vsys-GITPATH                  := git://git.planet-lab.org/vsys.git@vsys-0.99-2
- vsys-scripts-GITPATH          := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-33
+ vsys-scripts-GITPATH          := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-34
  plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-36
  drupal-GITPATH                  := git://git.planet-lab.org/drupal.git@drupal-4.7-15
  plewww-GITPATH                        := git://git.planet-lab.org/plewww@plewww-4.3-69
@@@ -48,7 -47,7 +48,7 @@@ omf-GITPATH                     := git:
  sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.0-7
  sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-3
  nodeconfig-GITPATH            := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5
 -bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-20
 +bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@lxcbuild
  pypcilib-GITPATH              := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10
  pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-11
  DistributedRateLimiting-SVNPATH       := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
@@@ -58,6 -57,4 +58,6 @@@ vserver-reference-GITPATH       := git:
  bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-13
  myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-19
  # locating the right test directory - see make tests_gitpath
 -tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.0-34
 +tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.0-32
 +libvirt-GITPATH                 := git://git.planet-lab.org/libvirt.git@lxcbuild
 +lxc-reference-GITPATH           := git://git.planet-lab.org/lxc-reference.git@lxcbuild
build