Changeset 2360


Ignore:
Timestamp:
Feb 25, 2019, 12:20:25 PM (5 months ago)
Author:
bruno
Message:

More opensuse support

  • remove os-release management from conf file and do it in code as this

is a generic last resort file we want to look at if nothing else was
found. This is the case for newest opensuse distros

  • supports latest opensuse distros
Location:
devel
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/etc/pb.yml

    r2352 r2360  
    114114  lsb: /etc/lsb-release
    115115
    116   # LSB
    117   #os-release: /etc/os-release
    118 
    119116#
    120117# Here is the association between the key and all the OS using the same file
     
    127124  redhat: redhat,rhel,centos,mandrake,mandriva,vmware,oel,scilinux,cloudlinux
    128125  lsb: ubuntu,lsb
    129   #os-release: opensuse,fedora
    130126
    131127#
     
    160156  asianux: Asianux (?:Server|release) ([0-9]).* \(
    161157  lsb: .*\nDISTRIB_ID=[\"]*LSB.*\nDISTRIB_RELEASE=[\"]*([^\"]+)[\"]*
    162   #os-release: .*\nID=[\"\']*([0-9a-z\._-]+)[\"\']*\nVERSION_ID=[\"\']*([0-9a-z\._-]+)[\"\']*\n
    163158  ubuntu: .*Ubuntu.*\nDISTRIB_RELEASE=(.+)
    164159  debian: (\d+)\.\d+
     
    643638  suse: Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,YAML
    644639  # New OpenSuSE - Module-Build first for processing as needed by others
    645   opensuse: Module-Build,File-MimeInfo,File-BaseDir
     640  # As of 15.x all modules are available as packages
     641  #opensuse: Module-Build,File-MimeInfo,File-BaseDir
     642  #
    646643  mandrake-10.1: Date-Manip,YAML
    647644  md:
     
    685682  redhat:
    686683  suse: wget,make,ntp,patch,diffutils
    687   opensuse: openSUSE-release,wget,make,ntp,patch,perl-Date-Manip,perl-File-HomeDir,diffutils,rpm-build,perl-YAML
     684  opensuse: openSUSE-release,wget,make,ntp,patch,perl-Date-Manip,perl-File-HomeDir,diffutils,rpm-build,perl-YAML,perl-Module-Build,perl-File-MimeInfo,perl-File-BaseDir
    688685  opensuse-11.0: wget,make,ntp,patch,perl-DateManip,perl-File-HomeDir,diffutils,perl-YAML
    689686  opensuse-10.2: wget,make,ntp,patch,perl-File-HomeDir,diffutils,perl-YAML
  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r2350 r2360  
    257257        # Found one possibility.
    258258        # Get all distros concerned by that file
    259         my $tmp=pb_get_content("$r");
     259        my $tmp = pb_get_content("$r");
    260260        my $ptr = $distro_similar->{$d};
    261261        pb_log(2,"amb: ".Dumper($ptr)."\n");
     
    277277    }
    278278}
     279#
     280# Now look at the os-release file to see if we have a std distribution description
     281#
     282$r = "/usr/lib/os-release";
     283if (-r $r) {
     284    my $tmp = pb_get_content("$r");
     285    ($release) = $tmp =~ m/.*\nVERSION_ID=[\"\']*([0-9a-z\._-]+)[\"\']*\n/m;
     286    ($distro) = $tmp =~ m/.*\nID=[\"\']*([0-9A-z\._-]+)[\"\']*\n/m;
     287    # Remove the leap suffix if present (OpenSUSE)
     288    $distro =~ s/-leap//;
     289    $found = 1 if ((defined $release) && (defined $distro));
     290}
    279291if ($found == 0) {
    280292    print STDERR "Unable to find a version in ".join(' ',keys %$ambiguous_rel_files)." (ambiguous)\n";
    281293    print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
    282     return("unknown","unknown");
     294    confess "Please report to the maintainer bruno_at_project-builder.org\n";
    283295} else {
    284296    return($distro,$release);
  • devel/rpmbootstrap/etc/.pbrc.yml

    r2355 r2360  
    5555#velist default = centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64
    5656velist:
    57   default: centos-6-x86_64,centos-7-x86_64,debian-7-i386,debian-7-x86_64,debian-8-x86_64,debian-9-x86_64,redhat-6.2-i386,ubuntu-14.04-x86_64,ubuntu-14.10-x86_64,ubuntu-15.04-x86_64,ubuntu-15.10-x86_64,ubuntu-16.04-x86_64,ubuntu-16.10-x86_64,ubuntu-17.04-x86_64,ubuntu-17.10-x86_64,ubuntu-18.04-x86_64,ubuntu-18.10-x86_64,mageia-3-x86_64,mageia-4-x86_64,mageia-5-x86_64,mageia-6-x86_64,fedora-22-x86_64,fedora-23-x86_64,fedora-24-x86_64,fedora-25-x86_64,fedora-26-x86_64,fedora-27-x86_64,fedora-28-x86_64,fedora-29-x86_64,opensuse-42.1-x86_64,opensuse-42.2-x86_64,opensuse-42.3-x86_64,opensuse-13.2-x86_64,opensuse-15.0-x86_64,gentoo-nover-x86_64,alpine-nover-x86_64
     57  default: centos-6-x86_64,centos-7-x86_64,debian-7-i386,debian-7-x86_64,debian-8-x86_64,debian-9-x86_64,redhat-6.2-i386,ubuntu-14.04-x86_64,ubuntu-14.10-x86_64,ubuntu-15.04-x86_64,ubuntu-15.10-x86_64,ubuntu-16.04-x86_64,ubuntu-16.10-x86_64,ubuntu-17.04-x86_64,ubuntu-17.10-x86_64,ubuntu-18.04-x86_64,ubuntu-18.10-x86_64,mageia-3-x86_64,mageia-4-x86_64,mageia-5-x86_64,mageia-6-x86_64,fedora-22-x86_64,fedora-23-x86_64,fedora-24-x86_64,fedora-25-x86_64,fedora-26-x86_64,fedora-27-x86_64,fedora-28-x86_64,fedora-29-x86_64,opensuse-42.1-x86_64,opensuse-42.2-x86_64,opensuse-42.3-x86_64,opensuse-13.2-x86_64,opensuse-15.0-x86_64,opensuse-15.1-x86_64,gentoo-nover-x86_64,alpine-nover-x86_64
Note: See TracChangeset for help on using the changeset viewer.