Changeset 1132

Timestamp:

12/23/10 02:01:37 (2 years ago)

Author:

bruno

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

Files:

• devel/pb-modules/etc/pb.conf (modified) (1 diff)
• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (4 diffs)
• devel/pb/bin/pb (modified) (5 diffs)
• pbconf/devel/pb.pb (modified) (1 diff)
• pbconf/devel/rpmbootstrap/pbfilter/all.pbf (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -445 +445 @@
 oscmd rpmbootstrap = rpm,rpm2cpio,wget
 #oscmdopt rpmbootstrap = 
+#
+
+# How do you want to install pb in your VM/VE (pkg or file)
+pbinstalltype default = pkg
+# No gentoo repo provided yet
+pbinstalltype gen = file
+# Default main package for pkg install of pb
+ospkg default = project-builder
+# Where is the associated repo
+osrepo rpm = ftp://ftp.project-builder.org/$ddir/$dver/pb.repo
 
 # Number of process in // for pb
 #pbparallel pb = 2
 #
-
-# Default insgtallation type is with packages for pb
-pbinstalltype default = pkg
 
 #

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

@@ -23 +23 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_distro_conffile pb_distro_init pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_get_param);
+our @EXPORT = qw(pb_distro_conffile pb_distro_init 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_get_param);
 
 =pod
@@ -406 +406 @@
 }
 
-=item B<pb_distro_setuprepo>
-
-This function sets up potential additional repository to the build environment
-
-=cut
-
-sub pb_distro_setuprepo {
+=item B<pb_distro_setuposrepo>
+
+This function sets up potential additional repository for the setup phase
+
+=cut
+
+sub pb_distro_setuposrepo {
 
 my $ddir = shift || undef;
@@ -418 +418 @@
 my $darch = shift;
 my $dtype = shift || undef;
-
-my ($addrepo) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc","addrepo");
+my $dfam = shift || undef;
+my $dos = shift || undef;
+
+pb_distro_setuprepo_gen($ddir,$dver,$darch,$dtype,$dfam,$dos,pb_distro_conffile(),"osrepo");
+}
+
+=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 $dfam = shift || undef;
+my $dos = shift || undef;
+
+pb_distro_setuprepo_gen($ddir,$dver,$darch,$dtype,$dfam,$dos,"$ENV{'PBDESTDIR'}/pbrc","addrepo");
+}
+
+=item B<pb_distro_setuprepo_gen>
+
+This function sets up in a generic way potential additional repository 
+
+=cut
+
+sub pb_distro_setuprepo_gen {
+
+my $ddir = shift || undef;
+my $dver = shift;
+my $darch = shift;
+my $dtype = shift || undef;
+my $dfam = shift || undef;
+my $dos = shift || undef;
+my $pbconf = shift || undef;
+my $pbkey = shift || undef;
+
+return if (not defined $pbconf);
+return if (not defined $pbkey);
+my ($addrepo) = pb_conf_read($pbconf,$pbkey);
 return if (not defined $addrepo);
 
-my $param = pb_distro_get_param($ddir,$dver,$darch,$addrepo);
+my $param = pb_distro_get_param($ddir,$dver,$darch,$addrepo,$dfam,$dtype,$dos);
 return if ($param eq "");
 
@@ -487 +529 @@
 my $dos = shift || "unknown";
 
+pb_log(2,"DEBUG: pb_distro_get_param on $ddir-$dver-$darch for ".Dumper($opt)."\n");
 if (defined $opt->{"$ddir-$dver-$darch"}) {
     $param = $opt->{"$ddir-$dver-$darch"};

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

pbconf/devel/pb.pb

@@ -77 +77 @@
 filteredfiles rpmbootstrap = Makefile.PL
 filteredfiles ProjectBuilder = Makefile.PL,lib/ProjectBuilder/Base.pm,lib/ProjectBuilder/Distribution.pm
-
-# How do you want to install pb in your VM/VE (pkg or file)
-# Can not be outside pb.pb as for other projects it may conflict, so this file will be needed for 
-# pkg install with pb, which means that pkg install of pb in VM|VM is only possible when building for pb 
-# project. Constraint on users.
-pbinstalltype default = pkg
-# No gentoo repo provided yet
-pbinstalltype gen = file
-pbpkg default = project-builder
-addrepo centos-5-x86_64 = ftp://ftp.project-builder.org/centos/5/noarch/pb.repo

pbconf/devel/rpmbootstrap/pbfilter/all.pbf

@@ -1 +1 @@
 filter PBDESC = It helps building a chrooted environment for RPM based distributions$/in a similar way as debootstrap for deb based distributions.
 # Summary of package
-filter PBSUMMARY = tool similar to debootstrap for RPM based distributions
+filter PBSUMMARY = Tool similar to debootstrap for RPM based distributions