Changeset 1652 in ProjectBuilder for devel/rpmbootstrap/bin/rpmbootstrap

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/rpmbootstrap/bin/rpmbootstrap (modified) (1 diff)

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'}");
 }
 #