Changeset 1652 in ProjectBuilder

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

Files:

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

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*$/));

devel/pb/bin/pb

@@ -1477 +1477 @@
             # Older Redhat use _target_platform in %configure incorrectly
             my $specialdef = "";
-            if (($pbos->{'name'} eq "redhat") || (($pbos->{'name'} eq "rhel") && ($pbos->{'version'} eq "2.1"))) {
+            if (($pbos->{'name'} eq "rhel") && ($pbos->{'version'} eq "2.1")) {
                 $specialdef = "--define \'_target_platform \"\"\'";
+            }
+            my $buildcmd = "rpmbuild";
+            if (($pbos->{'name'} eq "redhat") && ($pbos->{'version'} =~ /^6/)){
+                $buildcmd = "rpm" ;
             }
 
@@ -1485 +1489 @@
                     # This could cause an issue in // mode
                     pb_distro_installdeps($f,$pbos);
-                    pb_system("rpmbuild $specialdef --define \"packager $ENV{'PBPACKAGER'}\" --define \"_topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}","verbose");
+                    pb_system("$buildcmd $specialdef --define \"packager $ENV{'PBPACKAGER'}\" --define \"_topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}","verbose");
                     last;
                 }
@@ -2343 +2347 @@
     if ($cmt =~ /^VE/) {
         my $res = pb_system("$shcmdroot sed -i '/requiretty/d' /etc/sudoers","Removing potential requiretty in sudoers","quiet");
-        pb_system("$shcmdroot sed '/requiretty/d' /etc/sudoers > /tmp/sudoers.new ; mv /tmp/sudoers.new $tpdir/tmp/sudoers.new ; $shcmdroot mv /tmp/sudoers.new /etc/sudoers","Removing again potential requiretty in sudoers as sed -i failed") if (($res ne 0) && (-f "$tpdir/etc/sudoers"));
+        pb_system("$shcmdroot sed '/requiretty/d' /etc/sudoers > /tmp/sudoers.new ; mv /tmp/sudoers.new $tpdir/tmp/sudoers.new ; $shcmdroot mv /tmp/sudoers.new /etc/sudoers ; $shcmdroot chown root:root /etc/sudoers ; $shcmdroot chmod 440 /etc/sudoers","Removing again potential requiretty in sudoers as sed -i failed") if (($res ne 0) && (-f "$tpdir/etc/sudoers"));
         pb_system("$shcmd \"sudo $chowncommand -R $mac $tdir\"","Adapt owner in $tdir to $mac");
     }
@@ -2369 +2373 @@
         pb_system("$cpcmd $cp2target/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$ 2> /dev/null","Get package names in $cp2target");
         if (not -f "$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$") {
-            pb_log(0,"ERROR with VM/RM $v on getting $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$");
+            pb_log(0,"ERROR with VM/RM $v on getting $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$\n");
         } else {
             open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$";
@@ -2466 +2470 @@
     # in $ENV{'PBDESTDIR'}/pbscript.$$
     if ((defined $pbscript ) && ($pbscript ne "$ENV{'PBDESTDIR'}/pbscript.$$")) {
-        copy($pbscript,"$ENV{'PBDESTDIR'}/pbscript.$$") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript.$$";
+        copy($pbscript,"$ENV{'PBDESTDIR'}/pbscript.$$") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript.$$ from $pbscript";
         chmod 0755,"$ENV{'PBDESTDIR'}/pbscript.$$";
     }
@@ -2763 +2767 @@
     if ($action eq "build") {
         print SCRIPT "# Preparation for pb\n";
+        print SCRIPT "rm -f \$HOME/.pbrc\n";
         print SCRIPT "mv .pbrc \$HOME\n";
         print SCRIPT "cd ..\n";
@@ -3299 +3304 @@
 print PBOUT "Defaults:$pbac->{$ENV{'PBPROJ'}} !requiretty\n";
 print PBOUT "Defaults:root !requiretty\n";
+EOF
+    # RH 6.2 sudo doesn't support env_keep
+    if (($pbos->{'name'} ne "redhat") && ($pbos->{'version'} ne "6.2")) {
+        print SCRIPT << "EOF";
 # Keep proxy configuration while using sudo
 print PBOUT "Defaults:$pbac->{$ENV{'PBPROJ'}}    env_keep += \\\"http_proxy ftp_proxy\\\"\n";
 print PBOUT "Defaults:root    env_keep += \\\"http_proxy ftp_proxy\\\"\n";
 EOF
+    }
     # Try to restrict security to what is really needed
     if ($vtype =~ /^vm/) {

devel/rpmbootstrap/bin/rpmbootstrap

@@ -449 +449 @@
         unlink("$vepath/tmp/$p1");
     }
-# RedHat 6.2 has a buggy termcap setup
-} elsif ($pbos->{'name'} =~ /redhat/) {
+# RedHat 6.2 has a buggy termcap setup and doesn't support usage of setarch, so still returns x86_64 in a chroot
+} elsif (($pbos->{'name'} =~ /redhat/) && ( $pbos->{'version'} =~ /^6/)) {
     pb_system("chroot $vepath ldconfig","Forcing ldconfig on $pbos->{'name'} $pbos->{'version'}");
+    pb_system("chroot $vepath echo 'arch_canon:     x86_64: x86_64  1' >> /etc/rpmrc","Forcing ldconfig on $pbos->{'name'} $pbos->{'version'}");
+    pb_system("chroot $vepath echo 'arch_compat: x86_64: i386' >> /etc/rpmrc","Forcing ldconfig on $pbos->{'name'} $pbos->{'version'}");
+    pb_system("chroot $vepath echo 'buildarch_compat: x86_64: i386' >> /etc/rpmrc","Forcing ldconfig on $pbos->{'name'} $pbos->{'version'}");
+    pb_system("chroot $vepath echo 'buildarchtranslate: x86_64: i386' >> /etc/rpmrc","Forcing ldconfig on $pbos->{'name'} $pbos->{'version'}");
 }
 #

devel/rpmbootstrap/etc/.pbrc

@@ -41 +41 @@
 #velist default = mandrake-10.1-i386,mandrake-10.2-i386,mandriva-2006.0-i386,mandriva-2007.0-i386,mandriva-2007.1-i386,mandriva-2008.0-i386,mandriva-2008.1-i386,mandriva-2009.0-i386,redhat-7.3-i386,redhat-9-i386,fedora-4-i386,fedora-5-i386,fedora-6-i386,fedora-7-i386,fedora-8-i386,fedora-9-i386,fedora-10-i386,rhel-2.1-i386,rhel-3-i386,rhel-4-i386,rhel-5-i386,suse-10.0-i386,suse-10.1-i386,suse-10.2-i386,suse-10.3-i386,sles-9-i386,sles-10-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,ubuntu-8.04-i386,mandriva-2007.0-x86_64,mandriva-2007.1-x86_64,mandriva-2008.0-x86_64,mandriva-2008.1-x86_64,mandriva-2009.0-x86_64,fedora-6-x86_64,fedora-7-x86_64,fedora-8-x86_64,fedora-9-x86_64,fedora-10-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,suse-10.3-x86_64,sles-10-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64,rhel-3-ia64,centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64
 #velist default = centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64
-velist default = centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64,debian-5.0-i386,debian-5.0-x86_64,lsb-3.2.0-i386,lsb-3.2.0-x86_64,lsb-4.0.1-i386,lsb-4.0.1-x86_64,mandriva-2010.0-x86_64,ubuntu-10.04-x86_64,mandriva-2010.1-x86_64
+velist default = centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64,debian-5.0-i386,debian-5.0-x86_64,lsb-3.2.0-i386,lsb-3.2.0-x86_64,lsb-4.0.1-i386,lsb-4.0.1-x86_64,mandriva-2010.0-x86_64,mandriva-2010.1-x86_64,redhat-6.2-i386,ubuntu-10.04-x86_64