Changeset 2360 in ProjectBuilder

Timestamp:

Feb 25, 2019, 12:20:25 PM (6 years ago)

Author:

Bruno Cornec

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:

• pb-modules/etc/pb.yml (modified) (5 diffs)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• rpmbootstrap/etc/.pbrc.yml (modified) (1 diff)

devel/pb-modules/etc/pb.yml

@@ -114 +114 @@
   lsb: /etc/lsb-release
 
-  # LSB
-  #os-release: /etc/os-release
-
 #
 # Here is the association between the key and all the OS using the same file
@@ -127 +124 @@
   redhat: redhat,rhel,centos,mandrake,mandriva,vmware,oel,scilinux,cloudlinux
   lsb: ubuntu,lsb
-  #os-release: opensuse,fedora
 
 #
@@ -160 +156 @@
   asianux: Asianux (?:Server|release) ([0-9]).* \(
   lsb: .*\nDISTRIB_ID=[\"]*LSB.*\nDISTRIB_RELEASE=[\"]*([^\"]+)[\"]*
-  #os-release: .*\nID=[\"\']*([0-9a-z\._-]+)[\"\']*\nVERSION_ID=[\"\']*([0-9a-z\._-]+)[\"\']*\n
   ubuntu: .*Ubuntu.*\nDISTRIB_RELEASE=(.+)
   debian: (\d+)\.\d+
@@ -643 +638 @@
   suse: Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,YAML
   # New OpenSuSE - Module-Build first for processing as needed by others
-  opensuse: Module-Build,File-MimeInfo,File-BaseDir
+  # As of 15.x all modules are available as packages
+  #opensuse: Module-Build,File-MimeInfo,File-BaseDir
+  #
   mandrake-10.1: Date-Manip,YAML
   md: 
@@ -685 +682 @@
   redhat:
   suse: wget,make,ntp,patch,diffutils
-  opensuse: openSUSE-release,wget,make,ntp,patch,perl-Date-Manip,perl-File-HomeDir,diffutils,rpm-build,perl-YAML
+  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
   opensuse-11.0: wget,make,ntp,patch,perl-DateManip,perl-File-HomeDir,diffutils,perl-YAML
   opensuse-10.2: wget,make,ntp,patch,perl-File-HomeDir,diffutils,perl-YAML

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -257 +257 @@
         # Found one possibility. 
         # Get all distros concerned by that file
-        my $tmp=pb_get_content("$r");
+        my $tmp = pb_get_content("$r");
         my $ptr = $distro_similar->{$d};
         pb_log(2,"amb: ".Dumper($ptr)."\n");
@@ -277 +277 @@
     }
 }
+#
+# Now look at the os-release file to see if we have a std distribution description
+#
+$r = "/usr/lib/os-release";
+if (-r $r) {
+    my $tmp = pb_get_content("$r");
+    ($release) = $tmp =~ m/.*\nVERSION_ID=[\"\']*([0-9a-z\._-]+)[\"\']*\n/m;
+    ($distro) = $tmp =~ m/.*\nID=[\"\']*([0-9A-z\._-]+)[\"\']*\n/m;
+    # Remove the leap suffix if present (OpenSUSE)
+    $distro =~ s/-leap//;
+    $found = 1 if ((defined $release) && (defined $distro));
+}
 if ($found == 0) {
     print STDERR "Unable to find a version in ".join(' ',keys %$ambiguous_rel_files)." (ambiguous)\n";
     print STDERR "Please report to the maintainer bruno_at_project-builder.org\n";
-    return("unknown","unknown");
+    confess "Please report to the maintainer bruno_at_project-builder.org\n";
 } else {
     return($distro,$release);

devel/rpmbootstrap/etc/.pbrc.yml

@@ -55 +55 @@
 #velist default = centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64
 velist:
-  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
+  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