Changeset 702 in ProjectBuilder

Timestamp:

Feb 19, 2009, 4:42:22 PM (15 years ago)

Author:

Bruno Cornec

Message:

• new function pb_distro_setuprepo (addition of repository on the fly at build time)
• pb_get_dist_param => pb_distro_get_param and placed in Distribution
• removal of last locale issue

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Display.pm (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (3 diffs)
• pb/bin/pb (modified) (6 diffs)

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

@@ -17 +17 @@
 use Pod::Usage;
 use English;
-use Locale::gettext;
 use POSIX qw(locale_h);
 use ProjectBuilder::Base;

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

@@ -11 +11 @@
 use Data::Dumper;
 use ProjectBuilder::Base;
+use ProjectBuilder::Conf;
+use File::Basename;
+use File::Copy;
 
 # Inherit from the "Exporter" module which handles exporting functions.
@@ -20 +23 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_distro_init pb_distro_get pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed);
+our @EXPORT = qw(pb_distro_init pb_distro_get pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_get_param);
 
 =pod
@@ -469 +472 @@
 }
 
+=over 4
+
+=item B<pb_distro_setuprepo>
+
+This function sets up potential additional repository to the build environment
+
+=cut
+
+sub pb_distro_setuprepo {
+
+my $ddir = shift || undef;
+my $dver = shift;
+my $darch = shift;
+my $dtype = shift || undef;
+
+my ($addrepo) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc","addrepo");
+return if (not defined $addrepo);
+
+my $param = pb_distro_get_param($ddir,$dver,$darch,$addrepo);
+return if ($param eq "");
+
+# Loop on the list of additional repo
+foreach my $i (split(/,/,$param)) {
+
+    my ($scheme, $account, $host, $port, $path) = pb_get_uri($i);
+    my $bn = basename($i);
+
+    # The repo file can be local or remote. download or copy at the right place
+    if (($scheme eq "ftp") || ($scheme eq "http")) {
+        pb_system("wget -O $ENV{'PBTMP'}/$bn $i","Donwloading additional repository file $i");
+    } else {
+        copy($i,$ENV{'PBTMP'}/$bn);
+    }
+
+    # The repo file can be a real file or a package
+    if ($dtype eq "rpm") {
+        if ($bn =~ /\.rpm$/) {
+        pb_system("sudo rpm -Uvh $ENV{'PBTMP'}/$bn","Adding package to setup repostory");
+    } elsif ($bn =~ /\.repo$/) {
+            # Yum repo
+            pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/yum.repo.d","Adding yum repository");
+        } elsif ($bn =~ /\.addmedia/) {
+            # URPMI repo
+            pb_system("chmod 755 $ENV{'PBTMP'}/$bn ; sudo $ENV{'PBTMP'}/$bn 2>&1 > /dev/null","Adding urpmi repository");
+        } else {
+            pb_log(0,"Unable to deal with repository file $i on rpm distro ! Please report to dev team\n");
+        }
+    } elsif ($dtype eq "deb") {
+        if ($bn =~ /\.sources.list$/) {
+            my $aptrepo = "";
+            open(REPO,"$ENV{'PBTMP'}/$bn") || die "Unable to open $ENV{'PBTMP'}/$bn";
+            while (my $repo=<REPO>) {
+                my $found = 0;
+                open(APT,"/etc/apt/sources.list") || die "Unable to open /etc/apt/sources.list";
+                while (my $apt=<APT>) {
+                    $found++ if ($apt =~ /$repo/);
+                }
+                close(APT);
+                $aptrepo .= "$repo\n" if ($found == 0);
+            }
+            close(REPO);
+            if ($aptrepo ne "") {
+                pb_system("sudo echo # Added by project-builder.org >> /etc/apt/sources.list");
+                pb_system("sudo echo #  >> /etc/apt/sources.list");
+                pb_system("sudo echo \'$aptrepo\' >> /etc/apt/sources.list");
+            }
+            pb_system("sudo apt-get update","Adding apt repository");
+        } else {
+            pb_log(0,"Unable to deal with repository file $i on deb distro ! Please report to dev team\n");
+        }
+    } else {
+        pb_log(0,"Unable to deal with repository file $i on that distro ! Please report to dev team\n");
+    }
+}
+return;
+}
+
+=over 4
+
+=item B<pb_distro_get_param>
+
+This function gets the parameter in the conf file from the most precise tuple up to default
+
+=cut
+
+sub pb_distro_get_param {
+
+my $param = "";
+my $ddir = shift;
+my $dver = shift;
+my $darch = shift;
+my $opt = shift;
+
+if (defined $opt->{"$ddir-$dver-$darch"}) {
+    $param = $opt->{"$ddir-$dver-$darch"};
+} elsif (defined $opt->{"$ddir-$dver"}) {
+    $param = $opt->{"$ddir-$dver"};
+} elsif (defined $opt->{"$ddir"}) {
+    $param = $opt->{"$ddir"};
+} elsif (defined $opt->{"default"}) {
+    $param = $opt->{"default"};
+} else {
+    $param = "";
+}
+return($param);
+
+}
 =back 
 

devel/pb/bin/pb

@@ -782 +782 @@
     open(LAST,">> $ENV{'PBDESTDIR'}/pbrc") || die "Unable to create $ENV{'PBDESTDIR'}/pbrc";
     print LAST "pbroot $ENV{'PBPROJ'} = $ENV{'PBROOTDIR'}\n";
-    print LAST "pbprojver $ENV{'PBPROJ'} = $ENV{'PBPROJVER'}\n";
-    print LAST "pbprojtag $ENV{'PBPROJ'} = $ENV{'PBPROJTAG'}\n";
+    print LAST "projver $ENV{'PBPROJ'} = $ENV{'PBPROJVER'}\n";
+    print LAST "projtag $ENV{'PBPROJ'} = $ENV{'PBPROJTAG'}\n";
     print LAST "pbpackager $ENV{'PBPROJ'} = $ENV{'PBPACKAGER'}\n";
     close(LAST);
@@ -841 +841 @@
                 $specialdef = "--define \'_target_platform \"\"\'";
             }
+
+            # If needed we may add repository to the build env
+            my $darch = pb_get_arch();
+            pb_distro_setuprepo($ddir,$dver,$darch,$dtype);
             foreach my $f (@specfile) {
                 if ($f =~ /\.spec$/) {
@@ -1519 +1523 @@
                 if ($dtype eq "rpm") {
 
-                    my $verpmstyle = pb_get_dist_param($ddir,$dver,$darch,$verpmtype);
+                    my $verpmstyle = pb_distro_get_param($ddir,$dver,$darch,$verpmtype);
                     if ($verpmstyle eq "rinse") {
                         # Need to reshape the mirrors generated
                         my $post = "--before-post-install ";
-                        my $postparam = pb_get_dist_param($ddir,$dver,$darch,$veb4pi);
+                        my $postparam = pb_distro_get_param($ddir,$dver,$darch,$veb4pi);
                         if ($postparam eq "") {
                             $post = "";
@@ -1532 +1536 @@
                         # Need to reshape the package list for pb
                         my $addpkgs;
-                        $postparam = pb_get_dist_param($ddir,$dver,$darch,$vepkglist);
+                        $postparam = pb_distro_get_param($ddir,$dver,$darch,$vepkglist);
                         if ($postparam eq "") {
                             $addpkgs = "";
@@ -1887 +1891 @@
             my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd) = pb_distro_init($name,$ver);
     
-            my $postparam = pb_get_dist_param($ddir,$dver,$darch,$vepkglist);
+            my $postparam = pb_distro_get_param($ddir,$dver,$darch,$vepkglist);
             # Change the list of pkg in to a space separated list
             $postparam =~ s/,/ /g;
@@ -2564 +2568 @@
 }
 
-sub pb_get_dist_param {
-
-my $param = "";
-my $ddir = shift;
-my $dver = shift;
-my $darch = shift;
-my $opt = shift;
-
-if (defined $opt->{"$ddir-$dver-$darch"}) {
-    $param = $opt->{"$ddir-$dver-$darch"};
-} elsif (defined $opt->{"$ddir-$dver"}) {
-    $param = $opt->{"$ddir-$dver"};
-} elsif (defined $opt->{"$ddir"}) {
-    $param = $opt->{"$ddir"};
-} elsif (defined $opt->{"default"}) {
-    $param = $opt->{"default"};
-} else {
-    $param = "";
-}
-return($param);
-}
-
 1;