Changeset 2241 in ProjectBuilder for devel/pb-modules/etc

Timestamp:

Aug 2, 2017, 6:16:44 PM (7 years ago)

Author:

Bruno Cornec

Message:

revert last commit as this is not ready yet for integration in that tree !

Location:

devel/pb-modules/etc

Files:

• pb.conf.pod (modified) (1 diff)
• pb.yml (modified) (9 diffs)

devel/pb-modules/etc/pb.conf.pod

@@ -17 +17 @@
 The key could be also default, in which case it will be used as a default value if no more precise content is given for the key.
 
-Each value is detailed below giving the nature of its use (Mandatory or Optional - only used for certain feature), the value of the key (could be the project, an OS name, default, ...), the value of the parameter field and its format, the default configuration file in which it should be defined (home $HOME/.pbrc, conf /etc/pb/pb.yml or /usr/local/etc/pb/pb.yml, VE vepath/.pbrc, VM vmpath/.pbrc,  or project project.pb) and an example of use.
+Each value is detailed below giving the nature of its use (Mandatory or Optional - only used for certain feature), the value of the key (could be the project, an OS name, default, ...), the value of the parameter field and its format, the default configuration file in which it should be defined (home $HOME/.pbrc, conf /etc/pb/pb.conf or /usr/local/etc/pb/pb.conf, VE vepath/.pbrc, VM vmpath/.pbrc,  or project project.pb) and an example of use.
 
 =head1 OPTIONS

devel/pb-modules/etc/pb.yml

@@ -1 @@
----
 # $Id$
-#
+# 
 # Main configuration file for project-builder.org
 #
@@ -10 +9 @@
 #
 # Define Operating systems
-#
-
-#
+# 
+
+# 
 # For the following keys osrelfile and osrelambfile:
 # The left member is the key that will be used overall as the OS name
@@ -20 +19 @@
 # all the keys from osrelfile and osrelambfile, and the values of osrelambfile
 #
+---
 #
 # The following conf info are for pb_distro_get (man ProjectBuilder::Distribution)
@@ -558 +558 @@
 # What is the regular expression to find the kernel file 
   mkbmkernelnamere:
-      #linux: ^linu|^vmlinu|^xen
+    linux: ^linu|^vmlinu|^xen
 
 # Files to add on the boot media to support a full working system
@@ -568 +568 @@
     linux:
 # Commands to add
-  mkbmbasecmds:
+  mkbmbasecmds
     linux: file,bzip2,bunzip2,bash,date,ctrlaltdel,wc,xargs,less,ldconfig,tee,efibootmgr,lilo,grub,elilo,fdisk,parted
 #
 # To support debug
-  mkbmdbgfiles:
+  mkbmdbgfiles
     linux:
-  mkbmdbgcmds:
+  mkbmdbgcmds
     linux: ldd,strace,valgrind,dmidecode,lsusb,lshw,lspci,ethtool
-  mkbmdbgdirs:
+  mkbmdbgdirs
     linux: /usr/lib/valgrind,/usr/lib64/valgrind
 
 # Where are the ISO bootloader for this OS
-  mkbmisobl:
+  mkbmisobl
     linux: /usr/lib/syslinux/isolinux.bin,/usr/lib64/syslinux/isolinux.bin
-  mkbmkbd:
+  mkbmkbd
     mageia: /usr/lib/kbd
 
@@ -661 +661 @@
     rhel-7: wget,make,ntpdate,patch,perl-Date-Manip,rpm-build,diffutils,perl-Module-Build
     centos-7: wget,make,ntpdate,patch,perl-Date-Manip,rpm-build,diffutils,perl-Module-Build,perl-ExtUtils-MakeMaker,perl-File-MimeInfo,perl-File-BaseDir
-    redhat:
+    redhat =
     suse: wget,make,ntp,patch,diffutils
     opensuse: openSUSE-release,wget,make,ntp,patch,perl-Date-Manip,perl-File-HomeDir,diffutils,rpm-build
@@ -792 +792 @@
 # Do you want to see detailed sudo commands or just the summary of them
 # Useful for security concerns, nice to have it as a parameter
-  pbshowsudo:
+pbshowsudo:
     default: false
 
 # Do not stop on errors by default (VE/VM are still broken with it on)
-  pbstoponerr:
+pbstoponerr:
     default: false
 
@@ -809 +809 @@
 # Where is the associated repo
   osrepo:
-    redhat-6.2:
+    redhat-6.2 =
     rpm: ftp://ftp.project-builder.org/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/pb.repo
     mageia: ftp://ftp.project-builder.org/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/pb.addmedia
@@ -872 +872 @@
 # CPAN upload info (info from cpanupload)
 #
-  cpanpause:
+cpanpause:
     default: pause.perl.org
-  cpandir:
+cpandir:
     default: incoming
-  cpansubdir:
+cpansubdir:
     default:
-  cpanurl:
+cpanurl:
     default: http://pause.perl.org/pause/authenquery
 #cpanuser: