Changeset 422 in ProjectBuilder

Timestamp:

May 2, 2008, 8:20:10 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Modifications for LinuxCOE to support pb 0.9.2
• improvements in dploy packages

Location:

projects

Files:

• dploy/pbconf/devel/dploy-common/rpm/dploy-common.spec (modified) (1 diff)
• dploy/pbconf/devel/dploy.pb (modified) (2 diffs)
• dploy/pbconf/devel/pbfilter/deb.pbf (modified) (1 diff)
• dploy/pbconf/devel/pbfilter/rpm.pbf (modified) (1 diff)
• linuxcoe/pbconf/RC1_4-1_2008_02_17/linuxcoe.pb (modified) (1 diff)
• linuxcoe/pbconf/cvs/linuxcoe.pb (modified) (1 diff)

projects/dploy/pbconf/devel/dploy-common/rpm/dploy-common.spec

@@ -55 +55 @@
 #%{_bindir}/*
 #%{_mandir}/man1/*
+%{_sysconfdir}/PBPROJ
 %{_mandir}/man3/*
 

projects/dploy/pbconf/devel/dploy.pb

@@ -31 +31 @@
 # Optional if you need to overwrite the global values above
 #
-pkgver dploy-dhcp = devel
-pkgver dploy-common = devel
-pkgver dploy-pxe = devel
+#pkgver dploy-dhcp = devel
+#pkgver dploy-common = devel
+#pkgver dploy-pxe = devel
 #pkgtag dploy-dhcp = 3
 #pkgver nil
@@ -52 +52 @@
 # Files are mentioned relatively to pbroot/defpkgdir
 filteredfiles dploy-dhcp = install.sh,bin/dploy-add2dhcp
-filteredfiles dploy-pxe = bin/dploy-add2pxe
+filteredfiles dploy-pxe = install.sh,bin/dploy-add2pxe
 filteredfiles dploy-common = install.sh,Makefile.PL
 #filteredfiles pkg1-doc = configure.in

projects/dploy/pbconf/devel/pbfilter/deb.pbf

@@ -22 +22 @@
 filter PBLOG = yes
 
-# PBPKG is replaced by the package name ($pbpkg in code)
-filter PBPKG = $pbpkg
-
 # PBPACKAGER is replaced by the packager name ($pbpackager in code)
 filter PBPACKAGER = $pbpackager

projects/dploy/pbconf/devel/pbfilter/rpm.pbf

@@ -20 +20 @@
 # Special for pb : MakeMaker has various variable for the dest dir
 filter PBKEYWORD = destdir
-filter PBFINALDIR =
-
+filter PBFINALDIR =   

projects/linuxcoe/pbconf/RC1_4-1_2008_02_17/linuxcoe.pb

@@ -25 +25 @@
 sshdir default = /mondo/ftp
 sshport default = 22
-
-#
-# For Virtual machines management
-# Naming convention to follow: distribution name (as per ProjectBuilder::Distribution)
-# followed by '_' and by release number
-# a .vmtype extension will be added to the resulting string
-# a QEMU rhel_3 here means that the VM will be named rhel_3.qemu
-#
-vmlist linuxcoe = mandrake-10.1-i386,mandrake-10.2-i386,mandriva-2006.0-i386,mandriva-2007.0-i386,mandriva-2007.1-i386,mandriva-2008.0-i386,redhat-7.3-i386,redhat-9-i386,fedora-4-i386,fedora-5-i386,fedora-6-i386,rhel-3-i386,rhel-4-i386,rhel-5-i386,suse-10.0-i386,suse-10.1-i386,suse-10.2-i386,suse-10.3-i386,sles-9-i386,sles-10-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,mandriva-2007.0-x86_64,mandriva-2007.1-x86_64,mandriva-2008.0-x86_64,fedora-6-x86_64,fedora-8-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,suse-10.3-x86_64,sles-10-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64
-
-velist linuxcoe = fedora-7-i386
-
-vetype linuxcoe = chroot
-ventp default = pool.ntp.org
-velogin linuxcoe = pb
-vepath linuxcoe = /var/lib/mock
-veconf linuxcoe = /etc/mock
-verebuild linuxcoe = false
-#
-# Valid values for vmtype are
-# qemu, (vmware, xen, ... TBD)
-vmtype linuxcoe = qemu
-vmntp linuxcoe = pool.ntp.org
-
-# We suppose we can commmunicate with the VM through SSH
-vmhost linuxcoe = localhost
-vmlogin linuxcoe = pb
-vmport linuxcoe = 2224
-# Timeout to wait when VM is launched/stopped
-vmtmout default = 120
-
-# per VMs needed paramaters
-#vmopt qemu = -m 256 -nographic -daemonize
-vmopt linuxcoe = -m 384 -daemonize
-vmpath linuxcoe = /users/qemu
-vmsize linuxcoe = 5G 
 
 #

projects/linuxcoe/pbconf/cvs/linuxcoe.pb

@@ -25 +25 @@
 sshdir default = /mondo/ftp
 sshport default = 22
-
-#
-# For Virtual machines management
-# Naming convention to follow: distribution name (as per ProjectBuilder::Distribution)
-# followed by '_' and by release number
-# a .vmtype extension will be added to the resulting string
-# a QEMU rhel_3 here means that the VM will be named rhel_3.qemu
-#
-vmlist linuxcoe = mandrake-10.1-i386,mandrake-10.2-i386,mandriva-2006.0-i386,mandriva-2007.0-i386,mandriva-2007.1-i386,mandriva-2008.0-i386,redhat-7.3-i386,redhat-9-i386,fedora-4-i386,fedora-5-i386,fedora-6-i386,rhel-3-i386,rhel-4-i386,rhel-5-i386,suse-10.0-i386,suse-10.1-i386,suse-10.2-i386,suse-10.3-i386,sles-9-i386,sles-10-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,mandriva-2007.0-x86_64,mandriva-2007.1-x86_64,mandriva-2008.0-x86_64,fedora-6-x86_64,fedora-8-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,suse-10.3-x86_64,sles-10-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64
-
-velist linuxcoe = fedora-7-i386
-
-vetype linuxcoe = chroot
-ventp default = pool.ntp.org
-velogin linuxcoe = pb
-vepath linuxcoe = /var/lib/mock
-veconf linuxcoe = /etc/mock
-verebuild linuxcoe = false
-#
-# Valid values for vmtype are
-# qemu, (vmware, xen, ... TBD)
-vmtype linuxcoe = qemu
-vmntp linuxcoe = pool.ntp.org
-
-# We suppose we can commmunicate with the VM through SSH
-vmhost linuxcoe = localhost
-vmlogin linuxcoe = pb
-vmport linuxcoe = 2224
-# Timeout to wait when VM is launched/stopped
-vmtmout default = 120
-
-# per VMs needed paramaters
-#vmopt qemu = -m 256 -nographic -daemonize
-vmopt linuxcoe = -m 384 -daemonize
-vmpath linuxcoe = /users/qemu
-vmsize linuxcoe = 5G 
 
 #