- Timestamp:
- Aug 30, 2017, 5:08:03 PM (7 years ago)
- Location:
- devel
- Files:
-
- 1 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/Makefile.PL
r2241 r2279 73 73 $text .= "\t".'mkdir -p $(DESTDIR)'."$sharedir\n"; 74 74 $text .= "\t".'chmod 755 $(DESTDIR)'."$sharedir\n"; 75 $text .= "\t".'cp etc/pb. conf$(DESTDIR)'."$sharedir\n";75 $text .= "\t".'cp etc/pb.yml $(DESTDIR)'."$sharedir\n"; 76 76 77 77 # Also create a fake version in /etc/pb for sysadmin to modify 78 78 $text .= "\t".'mkdir -p $(DESTDIR)'."$sysconfdir\n"; 79 79 $text .= "\t".'chmod 755 $(DESTDIR)'."$sysconfdir\n"; 80 $text .= "\t".'perl -p -e \'s|^|#|\' etc/pb. conf > $(DESTDIR)/'."$sysconfdir/pb.conf\n";80 $text .= "\t".'perl -p -e \'s|^|#|\' etc/pb.yml > $(DESTDIR)/'."$sysconfdir/pb.yml\n"; 81 81 # Doesn't seem to work in the makefile generated for now :-( 82 #$text .= "\t".'perl -p -e \'s|^([^#])|#$1|\' etc/pb. conf > $(DESTDIR)/'."$sysconfdir/pb.conf\n";82 #$text .= "\t".'perl -p -e \'s|^([^#])|#$1|\' etc/pb.yml > $(DESTDIR)/'."$sysconfdir/pb.yml\n"; 83 83 84 # Produce the man page for pb. conf84 # Produce the man page for pb.yml 85 85 $text .= "\t".'mkdir -p $(DESTDIR)'."$mandir/man5\n"; 86 86 $text .= "\t".'pod2man --section=5 etc/pb.conf.pod > $(DESTDIR)'."$mandir/man5/pb.conf.5\n"; -
devel/pb-modules/bin/pbdistrocheck
r2241 r2279 94 94 =head1 CONFIGURATION FILES 95 95 96 Uses the main /etc/pb/pb. conf (or /usr/local/etc/pb/pb.confif installed from files) configuration file to give its answers.96 Uses the main /etc/pb/pb.yml (or /usr/local/etc/pb/pb.yml if installed from files) configuration file to give its answers. 97 97 98 98 =head1 AUTHORS -
devel/pb-modules/bin/pbgetparam
r2241 r2279 75 75 =head1 CONFIGURATION FILES 76 76 77 Uses the main /etc/pb/pb. conf (or /usr/local/etc/pb/pb.confif installed from files) configuration file to give its answers.77 Uses the main /etc/pb/pb.yml (or /usr/local/etc/pb/pb.yml if installed from files) configuration file to give its answers. 78 78 79 79 =head1 AUTHORS -
devel/pb-modules/lib/ProjectBuilder/Conf.pm
r2278 r2279 22 22 # Inherit from the "Exporter" module which handles exporting functions. 23 23 24 use vars qw($VERSION $REVISION @ISA @EXPORT);24 use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT); 25 25 use Exporter; 26 26 … … 184 184 185 185 # Read the content of the config file and cache it in the %h hash then available for queries 186 if ($ confver < 0.15) {186 if ($PBCONFVER < 1) { 187 187 open(CONF,$cf) || confess "Unable to open $cf"; 188 188 # This is the original conf file format for versions up to 0.14 … … 333 333 open(CONF,"> $conffile") || confess "Unable to write into $conffile"; 334 334 335 if ($ confver < 0.15) {335 if ($PBCONFVER < 1) { 336 336 # This is the original conf file format for versions up to 0.14 337 337 foreach my $p (sort keys %$h) { -
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r2261 r2279 26 26 # Inherit from the "Exporter" module which handles exporting functions. 27 27 28 use vars qw($VERSION $REVISION @ISA @EXPORT);28 use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT); 29 29 use Exporter; 30 30 … … 34 34 our @ISA = qw(Exporter); 35 35 our @EXPORT = qw(pb_distro_init pb_distro_conffile pb_distro_sysconffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_setuprepo_gen pb_distro_get_param pb_distro_get_context pb_distro_to_keylist pb_distro_conf_print pb_apply_conf_proxy); 36 ($VERSION,$REVISION ) = pb_version_init();36 ($VERSION,$REVISION,$PBCONFVER) = pb_version_init(); 37 37 38 38 =pod … … 77 77 sub pb_distro_conffile { 78 78 79 return("CCCC/pb.conf"); 79 if ($PBCONFVER < 1) { 80 return("CCCC/pb.conf"); 81 } else { 82 return("CCCC/pb.yml"); 83 } 80 84 } 81 85 … … 88 92 sub pb_distro_sysconffile { 89 93 90 return("SSSS/pb.conf"); 94 if ($PBCONFVER < 1) { 95 return("SSSS/pb.conf"); 96 } else { 97 return("SSSS/pb.yml"); 98 } 91 99 } 92 100 -
devel/pb-modules/lib/ProjectBuilder/Version.pm
r2270 r2279 33 33 my $projectbuilderconfver = $PBCONFVER; 34 34 35 return($projectbuilderver,$projectbuilderrev );35 return($projectbuilderver,$projectbuilderrev,$projectbuilderconfver); 36 36 } 37 37 1; -
devel/pb/bin/pb
r2271 r2279 863 863 if ($@) { 864 864 # Sys::CPU not found, defaulting to 1 865 pb_log(1,"ADVISE: Install Sys::CPU to benefit from automatic parallelism optimization.\nOr use pbparallel in your pb. conffile\nOnly 1 process at a time for the moment\n");865 pb_log(1,"ADVISE: Install Sys::CPU to benefit from automatic parallelism optimization.\nOr use pbparallel in your pb.yml file\nOnly 1 process at a time for the moment\n"); 866 866 $pbparallel = 1; 867 867 } else { … … 4974 4974 if ($@) { 4975 4975 # Linux::SysInfo not found 4976 pb_log(1,"ADVISE: Install Linux::SysInfo to benefit from automatic parallelism optimization.\nOr optimize manually pbparallel in your pb. conffile\nUsing $pbparallel processes max at a time for the moment\nWARNING: This may consume too much memory for your system\n");4976 pb_log(1,"ADVISE: Install Linux::SysInfo to benefit from automatic parallelism optimization.\nOr optimize manually pbparallel in your pb.yml file\nUsing $pbparallel processes max at a time for the moment\nWARNING: This may consume too much memory for your system\n"); 4977 4977 } else { 4978 4978 # Using the memory size 4979 4979 my $si = Linux::SysInfo::sysinfo(); 4980 4980 if (not defined $si) { 4981 pb_log(1,"ADVISE: Install Linux::SysInfo to benefit from automatic parallelism optimization.\nOr optimize manually pbparallel in your pb. conffile\nUsing $pbparallel processes max at a time for the moment\nWARNING: This may consume too much memory for your system\n");4981 pb_log(1,"ADVISE: Install Linux::SysInfo to benefit from automatic parallelism optimization.\nOr optimize manually pbparallel in your pb.yml file\nUsing $pbparallel processes max at a time for the moment\nWARNING: This may consume too much memory for your system\n"); 4982 4982 } else { 4983 4983 # Keep the number of VM whose memory can be allocated -
devel/pbmkbm/bin/pbmkbm
r2252 r2279 183 183 =head1 CONFIGURATION FILE 184 184 185 Uses Project-Builder.org configuration file (/etc/pb/pb. conf or /usr/local/etc/pb/pb.conf)185 Uses Project-Builder.org configuration file (/etc/pb/pb.yml or /usr/local/etc/pb/pb.yml) 186 186 187 187 =head1 AUTHORS -
devel/rpmbootstrap/bin/rpmbootstrap
r2252 r2279 50 50 rpmbootstrap works in 2 phases. The first one is used to download all 51 51 the required packages to have a working package management system in the 52 chroot working. This list of packages is stored in /etc/pb/pb. confunder52 chroot working. This list of packages is stored in /etc/pb/pb.yml under 53 53 the rbsmindep parameter (aka rpmbootstrap minimal dependencies). Once the 54 54 packages have been downloaded from the mirror, they are extracted with … … 160 160 =head1 CONFIGURATION FILE 161 161 162 Uses Project-Builder.org configuration file (/etc/pb/pb. conf or /usr/local/etc/pb/pb.conf)162 Uses Project-Builder.org configuration file (/etc/pb/pb.yml or /usr/local/etc/pb/pb.yml) 163 163 164 164 =head1 AUTHORS
Note:
See TracChangeset
for help on using the changeset viewer.