Changeset 1652 in ProjectBuilder for devel/pb-modules

Timestamp:

Oct 7, 2012, 7:54:06 PM (12 years ago)

Author:

Bruno Cornec

Message:

• As Red Hat 6.2 in chroot doesn't support setarch i386 for a x86_64 environment, we have to fake x86_64 rpm build in /etc/rpmrc
• Red Hat 6.2 builds with the rpm command, not rpmbuild
• Red Hat 6.2 sudo doesn't support the env_keep var, remove it

Location:

devel/pb-modules

Files:

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

devel/pb-modules/bin/pbdistrocheck

@@ -30 +30 @@
 =head1 SYNOPSIS
 
-pbdistrocheck [-d][-v][-l [-c][-i][-r][-a]][-s] [distro-ver-arch]
+pbdistrocheck [-h][-d][-v][-l [-c][-i][-r][-a]][-s] [distro-ver-arch]
 
 =head1 OPTIONS
 
 =over 4
+
+=item B<-h|--help>
+
+Prints this help
 
 =item B<-v|--verbose>
@@ -42 +46 @@
 =item B<-a|--all>
 
-print all parameters
+Print all parameters
 
 =item B<-s|--short>
 
-generate a short format user friendly, comma separated allowing parsing
+Generate a short format user friendly, comma separated allowing parsing
 
 =item B<-l|--lsb>
 
-generate an LSB compliant output
+Generate an LSB compliant output
 
 =item B<-d|--description>
 
-print only description (LSB only)
+Print only description (LSB only)
 
 =item B<-r|--release>
 
-print only release (LSB only)
+Print only release (LSB only)
 
 =item B<-c|--codename>
 
-print only codename (LSB only)
+Print only codename (LSB only)
 
 =item B<-i|--id>
 
-print only distribution identificator (LSB only)
+Print only distribution identificator (LSB only)
 
 =item B<-a|--all>
 
-print all LSB fields
+Print all LSB fields
 
 =back 
@@ -76 +80 @@
 =head1 ARGUMENTS
 
-arguments are optional. If none given, analyzes the underlying operating system
+Arguments are optional. If none given, analyzes the underlying operating system
 If one is given, it should have the format osname-version-architecture, and in that case pbdistrocheck will provide all the information related to that OS needed by pb.
 
@@ -107 +111 @@
         "verbose|v+" => \$opts{'v'},
         "short|s" => \$opts{'s'},
+        "help|h" => \$opts{'h'},
         "description|d" => \$opts{'d'},
         "id|i" => \$opts{'i'},

devel/pb-modules/etc/pb.conf

@@ -301 +301 @@
 # These deps are needed for rpmbootstrap to install a base distribution
 # Originally reuse from rinse conf files
-rbsmindep redhat-6.2 = MAKEDEV,SysVinit,authconfig,basesystem,bash,binutils,bzip2,chkconfig,console-tools,cracklib,cracklib-dicts,dev,dev86,diffutils,dhcpcd,e2fsprogs,file,filesystem,fileutils,findutils,gawk,gdbm,glib,glibc,gmp,grep,gzip,info,initscripts,iproute,iputils,kernel,krb5-configs,krb5-libs,ldconfig,ld.so,libc,libelf,libstdc++,libtermcap,logrotate,make,mingetty,mktemp,modutils,mount,newt,ncurses,net-tools,pam,passwd,patch,perl,popt,procps,psmisc,pwdb,python,readline,redhat-release,rpm,rpm-python,sed,setup,shadow-utils,sh-utils,slang,sysklogd,tar,tcsh,termcap,textutils,util-linux,vim-common,vim-minimal,vixie-cron,which,wget,xntp3,zlib
+# For Rd Hat 6.2 perl is excluded as a manual install from http://www.cpan.org/src/5.0/perl-5.6.2.tar.gz is required
+rbsmindep redhat-6.2 = MAKEDEV,SysVinit,authconfig,basesystem,bash,binutils,bzip2,chkconfig,console-tools,cracklib,cracklib-dicts,dev,dev86,diffutils,dhcpcd,e2fsprogs,file,filesystem,fileutils,findutils,gawk,gdbm,glib,glibc,gmp,grep,gzip,info,initscripts,iproute,iputils,kernel,krb5-configs,krb5-libs,ldconfig,ld.so,libc,libelf,libstdc++,libtermcap,logrotate,make,mingetty,mktemp,modutils,mount,newt,ncurses,net-tools,pam,passwd,patch,popt,procps,psmisc,pwdb,python,readline,redhat-release,rpm,rpm-build,rpm-python,sed,setup,shadow-utils,sh-utils,slang,sysklogd,tar,tcsh,termcap,textutils,util-linux,vim-common,vim-minimal,vixie-cron,which,wget,xntp3,zlib
 #
 rbsmindep fedora-4 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,chkconfig,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++,libtermcap,libxml2,libxml2-python,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,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,zlib

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

@@ -453 +453 @@
 
 This function returns the architecture of our local environment and
-standardize on i386 for those platforms. It also solves issues where a i386 VE on x86_64 returns x86_64 wrongly
+standardize on i386 for those platforms. 
 
 =cut

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

@@ -132 +132 @@
 # Initialize arch
 $pbos->{'arch'} = pb_get_arch() if (not defined $pbos->{'arch'});
+# Solves a bug on Red Hat 6.x where real arch is not detected when using setarch and a chroot
+# As it was only i386 forcing it here.
+$pbos->{'arch'} = "i386" if (($pbos->{'name'} eq "redhat") && ($pbos->{'version'} =~ /^6\./));
 
 # Dig into the tuple to find the best answer
@@ -330 +333 @@
 # Get dependencies in the build file if not forced
 $deps = pb_distro_getdeps($f,$pbos) if (not defined $deps);
-pb_log(1, "ftp_proxy=$ENV{ftp_proxy} http_proxy=$ENV{http_proxy}\n");
+pb_log(1, "ftp_proxy=$ENV{ftp_proxy}\n") if (defined $ENV{ftp_proxy});
+pb_log(1, "http_proxy=$ENV{http_proxy}\n")  if (defined $ENV{http_proxy});
 pb_log(2,"deps: $deps\n");
 return if ((not defined $deps) || ($deps =~ /^\s*$/));