Changeset 1132 in ProjectBuilder for devel/pb-modules

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

Location:

devel/pb-modules

Files:

• etc/pb.conf (modified) (1 diff)
• lib/ProjectBuilder/Distribution.pm (modified) (4 diffs)

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"};