Changeset 2279


Ignore:
Timestamp:
Aug 30, 2017, 5:08:03 PM (3 months ago)
Author:
bruno
Message:

YAML support working for most distros

  • Fix rebase issues
  • Adds a pbsyncheck script for pre-commit check
  • Fix test deps for centos & fedora
  • update pbcl versions for deb build
Files:
1 added
15 edited
2 copied

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/Makefile.PL

    r2241 r2279  
    7373    $text .= "\t".'mkdir -p $(DESTDIR)'."$sharedir\n";
    7474    $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";
    7676
    7777    # Also create a fake version in /etc/pb for sysadmin to modify
    7878    $text .= "\t".'mkdir -p $(DESTDIR)'."$sysconfdir\n";
    7979    $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";
    8181    # 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";
    8383
    84     # Produce the man page for pb.conf
     84    # Produce the man page for pb.yml
    8585    $text .= "\t".'mkdir -p $(DESTDIR)'."$mandir/man5\n";
    8686    $text .= "\t".'pod2man --section=5 etc/pb.conf.pod > $(DESTDIR)'."$mandir/man5/pb.conf.5\n";
  • devel/pb-modules/bin/pbdistrocheck

    r2241 r2279  
    9494=head1 CONFIGURATION FILES
    9595
    96 Uses the main /etc/pb/pb.conf (or /usr/local/etc/pb/pb.conf if installed from files) configuration file to give its answers.
     96Uses the main /etc/pb/pb.yml (or /usr/local/etc/pb/pb.yml if installed from files) configuration file to give its answers.
    9797
    9898=head1 AUTHORS
  • devel/pb-modules/bin/pbgetparam

    r2241 r2279  
    7575=head1 CONFIGURATION FILES
    7676
    77 Uses the main /etc/pb/pb.conf (or /usr/local/etc/pb/pb.conf if installed from files) configuration file to give its answers.
     77Uses the main /etc/pb/pb.yml (or /usr/local/etc/pb/pb.yml if installed from files) configuration file to give its answers.
    7878
    7979=head1 AUTHORS
  • devel/pb-modules/lib/ProjectBuilder/Conf.pm

    r2278 r2279  
    2222# Inherit from the "Exporter" module which handles exporting functions.
    2323 
    24 use vars qw($VERSION $REVISION @ISA @EXPORT);
     24use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT);
    2525use Exporter;
    2626 
     
    184184
    185185# Read the content of the config file and cache it in the %h hash then available for queries
    186 if ($confver < 0.15) {
     186if ($PBCONFVER < 1) {
    187187    open(CONF,$cf) || confess "Unable to open $cf";
    188188    # This is the original conf file format for versions up to 0.14
     
    333333open(CONF,"> $conffile") || confess "Unable to write into $conffile";
    334334
    335 if ($confver < 0.15) {
     335if ($PBCONFVER < 1) {
    336336    # This is the original conf file format for versions up to 0.14
    337337    foreach my $p (sort keys %$h) {
  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r2261 r2279  
    2626# Inherit from the "Exporter" module which handles exporting functions.
    2727 
    28 use vars qw($VERSION $REVISION @ISA @EXPORT);
     28use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT);
    2929use Exporter;
    3030 
     
    3434our @ISA = qw(Exporter);
    3535our @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();
    3737
    3838=pod
     
    7777sub pb_distro_conffile {
    7878
    79 return("CCCC/pb.conf");
     79if ($PBCONFVER < 1) {
     80    return("CCCC/pb.conf");
     81} else {
     82    return("CCCC/pb.yml");
     83}
    8084}
    8185
     
    8892sub pb_distro_sysconffile {
    8993
    90 return("SSSS/pb.conf");
     94if ($PBCONFVER < 1) {
     95    return("SSSS/pb.conf");
     96} else {
     97    return("SSSS/pb.yml");
     98}
    9199}
    92100
  • devel/pb-modules/lib/ProjectBuilder/Version.pm

    r2270 r2279  
    3333my $projectbuilderconfver = $PBCONFVER;
    3434
    35 return($projectbuilderver,$projectbuilderrev);
     35return($projectbuilderver,$projectbuilderrev,$projectbuilderconfver);
    3636}
    37371;
  • devel/pb/bin/pb

    r2271 r2279  
    863863    if ($@) {
    864864        # 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.conf file\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");
    866866        $pbparallel = 1;
    867867    } else {
     
    49744974    if ($@) {
    49754975        # 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.conf file\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");
    49774977    } else {
    49784978        # Using the memory size
    49794979        my $si = Linux::SysInfo::sysinfo();
    49804980        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.conf file\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");
    49824982        } else {
    49834983            # Keep the number of VM whose memory can be allocated
  • devel/pbmkbm/bin/pbmkbm

    r2252 r2279  
    183183=head1 CONFIGURATION FILE
    184184
    185 Uses Project-Builder.org configuration file (/etc/pb/pb.conf or /usr/local/etc/pb/pb.conf)
     185Uses Project-Builder.org configuration file (/etc/pb/pb.yml or /usr/local/etc/pb/pb.yml)
    186186
    187187=head1 AUTHORS
  • devel/rpmbootstrap/bin/rpmbootstrap

    r2252 r2279  
    5050rpmbootstrap works in 2 phases. The first one is used to download all
    5151the required packages to have a working package management system in the
    52 chroot working. This list of packages is stored in /etc/pb/pb.conf under
     52chroot working. This list of packages is stored in /etc/pb/pb.yml under
    5353the rbsmindep parameter (aka rpmbootstrap minimal dependencies). Once the
    5454packages have been downloaded from the mirror, they are extracted with
     
    160160=head1 CONFIGURATION FILE
    161161
    162 Uses Project-Builder.org configuration file (/etc/pb/pb.conf or /usr/local/etc/pb/pb.conf)
     162Uses Project-Builder.org configuration file (/etc/pb/pb.yml or /usr/local/etc/pb/pb.yml)
    163163
    164164=head1 AUTHORS
  • pbconf/devel/ProjectBuilder/pbcl

    r2227 r2279  
    33PERL-PROJECTBUILDER CHANGES
    44
    5 0.14.6 (2030-01-01)
     50.15.1 (2030-01-01)
    66- TBD
    77
  • pbconf/devel/ProjectBuilder/pbfilter/centos.yml

    r2278 r2279  
    88#
    99# PBDEP is replaced by the list of dependencies
    10   PBBUILDDEP: BuildRequires: rpm-build,perl-Test-More
     10  PBBUILDDEP: BuildRequires: rpm-build,perl-Test-Simple
  • pbconf/devel/ProjectBuilder/pbfilter/fedora.yml

    r2277 r2279  
    88#
    99# PBDEP is replaced by the list of dependencies
    10   PBBUILDDEP: BuildRequires: rpm-build,perl-Test-More
     10  PBBUILDDEP: BuildRequires: rpm-build,perl-Test-Simple
  • pbconf/devel/pbmkbm/pbcl

    r2227 r2279  
    33PBMKBM CHANGES
    44
    5 0.14.6 (2030-01-01)
     50.15.1 (2030-01-01)
    66- TBD
    77
  • pbconf/devel/project-builder/pbcl

    r2227 r2279  
    33PB CHANGES
    44
    5 0.14.6 (2030-01-01)
     50.15.1 (2030-01-01)
    66- TBD
    77
  • pbconf/devel/project-builder/pbfilter/centos.yml

    r2278 r2279  
    99# PBBUILDDEP is replaced by the list of build dependencies
    1010#
    11   PBBUILDDEP: BuildRequires: rpm-build,perl-Test-More
     11  PBBUILDDEP: BuildRequires: rpm-build,perl-Test-Simple
  • pbconf/devel/project-builder/pbfilter/fedora.yml

    r2277 r2279  
    99# PBBUILDDEP is replaced by the list of build dependencies
    1010#
    11   PBBUILDDEP: BuildRequires: rpm-build,perl-Test-More
     11  PBBUILDDEP: BuildRequires: rpm-build,perl-Test-Simple
  • pbconf/devel/rpmbootstrap/pbcl

    r2227 r2279  
    33RPMBOOTSTRAP CHANGES
    44
    5 0.14.6 (2030-01-01)
     50.15.1 (2030-01-01)
    66- TBD
    77
Note: See TracChangeset for help on using the changeset viewer.