Changeset 1652 in ProjectBuilder for devel/pb

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

File:

• devel/pb/bin/pb (modified) (7 diffs)

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/) {