- Timestamp:
- May 10, 2012, 6:07:28 PM (13 years ago)
- Location:
- devel/pb-modules
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/etc/pb.conf
r1515 r1517 307 307 rbsmindep rhel-4 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-sqlite,python-urlgrabber,readline,redhat-release,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib 308 308 # 309 rbsmindep centos-5 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,centos-release,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,nss,nspr,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-iniparse,python-sqlite,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib 310 rbsmindep centos-5-ia64 = MAKEDEV,SysVinit,audit-libs,bash,beecrypt,bzip2-libs,centos-release,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,nss,nspr,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-sqlite,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib 311 # 312 rbsmindep rhel-5 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,nss,nspr,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-iniparse,python-sqlite,python-urlgrabber,readline,redhat-release,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib 309 # CentOS-5.6 moved python-libs into a separate package. List it or otherwise we can't run yum. 310 # 311 rbsmindep centos-5 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,centos-release,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,nss,nspr,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-iniparse,python-libs,python-sqlite,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib 312 rbsmindep centos-5-ia64 = MAKEDEV,SysVinit,audit-libs,bash,beecrypt,bzip2-libs,centos-release,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,nss,nspr,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-libs,python-sqlite,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib 313 # 314 rbsmindep rhel-5 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,nss,nspr,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-iniparse,python-libs,python-sqlite,python-urlgrabber,readline,redhat-release,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib 313 315 rbsmindep oel-5 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,nss,nspr,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-iniparse,python-sqlite,python-urlgrabber,readline,redhat-release,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib 314 316 # … … 365 367 #rbsmirrorsrv fedora = http://download.fedora.redhat.com/pub/fedora/linux/releases/$pbos->{'version'}/Everything/$pbos->{'arch'}/os/Packages/ 366 368 rbsmirrorsrv fedora = http://mirrors.kernel.org/fedora/releases/$pbos->{'version'}/Fedora/$pbos->{'arch'}/os/Packages 367 rbsmirrorsrv centos-4 = http://mirrors.kernel.org/centos/ 4.8/os/$pbos->{'arch'}/CentOS/RPMS368 rbsmirrorsrv centos-5 = http://mirrors.kernel.org/centos/ 5.5/os/$pbos->{'arch'}/CentOS369 rbsmirrorsrv centos-4 = http://mirrors.kernel.org/centos/$pbos->{'version'}/os/$pbos->{'arch'}/CentOS/RPMS 370 rbsmirrorsrv centos-5 = http://mirrors.kernel.org/centos/$pbos->{'version'}/os/$pbos->{'arch'}/CentOS 369 371 rbsmirrorsrv centos-5-ia64 = http://dev.centos.org/~z00dax/ia64/c5-wip/ia64/RPMS/ 372 rbsmirrorsrv centos-6 = http://mirrors.kernel.org/centos/$pbos->{'version'}/os/$pbos->{'arch'}/CentOS 370 373 #rbsmirrorsrv rhel = 371 374 # pbos->{'arch'} == i586 for i386 repo -
devel/pb-modules/etc/pb.conf.pod
r1508 r1517 22 22 23 23 =over 4 24 25 =item B<addrepo> 26 27 Nature: Optional 28 Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here. 29 Value: comma separated list of URLs that point to repository files, or packages to install. The values may not include substitutions. 30 Conffile: project 31 Example: addrepo centos-5-x86_64 = file:///prj/extras.repo,http://mirror.centos.org/centos/5.8/extras/x86_64/RPMS/chrpath-0.13-3.el5.centos.x86_64.rpm 24 32 25 33 =item B<checkexclude> … … 1006 1014 1007 1015 =head1 OTHER PARAMETERS 1016 1017 =over 4 1018 1008 1019 =item B<pb_URL> 1020 1009 1021 =item B<pb_directory_desc> 1022 1010 1023 =item B<pb_environment_variables> 1024 1025 =back -
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r1516 r1517 290 290 } 291 291 292 # Internal function 293 294 sub pb_apply_conf_proxy ($) { 295 my ($pbos) = @_; 296 297 my $ftp_proxy = pb_distro_get_param($pbos,pb_conf_get_if("ftp_proxy")); 298 my $http_proxy = pb_distro_get_param($pbos,pb_conf_get_if("http_proxy")); 299 300 # We do not overwrite shell settings 301 $ENV{ftp_proxy} ||= $ftp_proxy; 302 $ENV{http_proxy} ||= $http_proxy; 303 } 304 292 305 =item B<pb_distro_installdeps> 293 306 … … 304 317 my $deps = shift || undef; 305 318 306 my $ftp_proxy = pb_distro_get_param($pbos,pb_conf_get_if("ftp_proxy")); 307 my $http_proxy = pb_distro_get_param($pbos,pb_conf_get_if("http_proxy")); 308 309 # We do not overwrite shell settings 310 $ENV{ftp_proxy} ||= $ftp_proxy; 311 $ENV{http_proxy} ||= $http_proxy; 312 319 pb_apply_conf_proxy($pbos); 313 320 # Protection 314 321 return if (not defined $pbos->{'install'}); … … 316 323 # Get dependencies in the build file if not forced 317 324 $deps = pb_distro_getdeps($f,$pbos) if (not defined $deps); 325 pb_log(1, "ftp_proxy=$ENV{ftp_proxy} http_proxy=$ENV{http_proxy}\n"); 318 326 pb_log(2,"deps: $deps\n"); 319 327 return if ((not defined $deps) || ($deps =~ /^\s*$/)); … … 326 334 pb_system($cmd, "Re-trying installing dependencies ($cmd)"); 327 335 } 336 # Check that all deps have been installed correctly 337 $deps = pb_distro_getdeps($f, $pbos); 338 die "Some dependencies did not install ($deps)" if ((defined $deps) && ($deps =~ /\S/)); 328 339 } 329 340 … … 520 531 return if ($param eq ""); 521 532 533 pb_apply_conf_proxy($pbos); 534 522 535 # Loop on the list of additional repo 523 536 foreach my $i (split(/,/,$param)) { … … 538 551 my $pn = $bn; 539 552 $pn =~ s/\.rpm//; 540 if (pb_system("rpm -q --quiet $pn","","quiet" ) != 0) {553 if (pb_system("rpm -q --quiet $pn","","quiet",1) != 0) { 541 554 pb_system("sudo rpm -Uvh $ENV{'PBTMP'}/$bn","Adding package to setup repository"); 542 555 } -
devel/pb-modules/lib/ProjectBuilder/Env.pm
r1506 r1517 611 611 612 612 # PBDESC contains the description of the package 613 #filter PBDESC = Bla-Bla 613 #filter PBDESC = Bla-Bla \ 614 # with a trailing \, the variable can be multi-line. \ 615 # only the trailing \'s will be removed, the leading spaces, \ 616 # trailing spaces, and newlines will remain except on the \ 617 # last line. You can use dollar slash as a way to introduce carraige \ 618 # return (perl syntax). \ 619 # You can use transform e.g. in rpm.pbf to adjust spaces 614 620 615 621 # PBSUMMARY contains a short single line description of the package … … 647 653 # PBOBS is replaced by the Obsolete line 648 654 #filter PBOBS = 655 656 # transform a variable from the key on the right to the key on the left using the perl expression 657 # after the input key name. Useful for taking multi-line documentation and removing trailing spaces 658 # or leading spaces. 659 #transform PBDESC = PBDESC_raw s/\s+\n/\n/go; 649 660 650 661 EOF -
devel/pb-modules/lib/ProjectBuilder/VE.pm
r1506 r1517 104 104 # Which tool is used 105 105 my $verpmstyle = $verpmtype->{$ENV{'PBPROJ'}}; 106 die "No verpmtype defined for $ENV{PBPROJ}" unless (defined $verpmstyle); 106 107 107 108 # Get potential rbs option
Note:
See TracChangeset
for help on using the changeset viewer.