Changeset 1132 in ProjectBuilder for devel/pb

Timestamp:

Dec 23, 2010, 2:01:37 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Adds params to pb_distro_setuprepo to support generic family/os templates
• Fix pbinstalltype issue (setupve was broken) by useing a dsitro based hash
• Use new pb.conf variable (ospkg and osrepo for pkg install)
• Adds function pb_distro_setuposrepo to setup pb install repo
• Adds a private pb_distro_setuprepo_gen function for code share between pb_distro_setuposrepo and pb_distro_setuprepo
• Move the relative conf parameters from pb.pb to pb.conf

File:

• devel/pb/bin/pb (modified) (5 diffs)

devel/pb/bin/pb

@@ -1026 +1026 @@
 
     # Additional potential repo
-    pb_distro_setuprepo($ddir,$dver,$arch,$dtype);
+    pb_distro_setuprepo($ddir,$dver,$arch,$dtype,$dfam,$dos);
     foreach my $pbpkg (@pkgs) {
         # We need to install the package to test, and deps brought with it
@@ -1087 +1087 @@
 
             # If needed we may add repository to the build env
-            pb_distro_setuprepo($ddir,$dver,$arch,$dtype);
+            pb_distro_setuprepo($ddir,$dver,$arch,$dtype,$dfam,$dos);
             foreach my $f (@specfile) {
                 if ($f =~ /\.spec$/) {
@@ -1115 +1115 @@
             chmod 0755,"debian/rules";
 
-            pb_distro_setuprepo($ddir,$dver,$arch,$dtype);
+            pb_distro_setuprepo($ddir,$dver,$arch,$dtype,$dfam,$dos);
             pb_distro_installdeps("debian/control",$dtype,$pbins);
             pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package","verbose");
@@ -2704 +2704 @@
 
 EOF
-    my $itype = pb_conf_get("pbinstalltype");
-    if ($itype->{$ENV{'PBPROJ'}} =~ /^file/) {
+    my ($instype) = pb_conf_get("pbinstalltype");
+    my $itype = pb_distro_get_param($ddir,$dver,$darch,$instype,$dfam,$dtype,$dos);
+    if ($itype =~ /^file/) {
         print SCRIPT << 'EOF';
 # Then install manually the missing perl modules
@@ -2721 +2722 @@
 pb_system("rm -rf ProjectBuilder-* ; wget --passive-ftp ftp://ftp.mondorescue.org/src/ProjectBuilder-latest.tar.gz ; gzip -cd ProjectBuilder-latest.tar.gz | tar xf - ; cd ProjectBuilder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf ProjectBuilder-* ; rm -rf project-builder-* ; wget --passive-ftp ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz ; gzip -cd project-builder-latest.tar.gz | tar xf - ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf project-builder-* ;","Building Project-Builder");
 EOF
-    } elsif ($itype->{$ENV{'PBPROJ'}} =~ /^pkg/) {
+    } elsif ($itype =~ /^pkg/) {
         # pkg based install. We need to point to the project-builder.org repository
         print SCRIPT << 'EOF';
-my ($pbpkg) = pb_conf_get_if("pbpkg");
-
-my $pkgforpb = pb_distro_get_param($ddir,$dver,$darch,$pbpkg,$dfam,$dtype,$depdos);
-pb_distro_setuprepo($ddir,$dver,$darch,$dtype);
+my ($ospkg) = pb_conf_get_if("ospkg");
+
+my $pkgforpb = pb_distro_get_param($ddir,$dver,$darch,$ospkg,$dfam,$dtype,$dos);
+pb_distro_setuposrepo($ddir,$dver,$darch,$dtype,$dfam,$dos);
 pb_distro_installdeps(undef,$dtype,$pbins,pb_distro_only_deps_needed($dtype,join(' ',split(/,/,$pkgforpb))));
 EOF