Changeset 1652 in ProjectBuilder for devel/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

Location:

devel/rpmbootstrap

Files:

• bin/rpmbootstrap (modified) (1 diff)
• etc/.pbrc (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'}");
 }
 #

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