Changeset 1015 in ProjectBuilder

Timestamp:

Apr 28, 2010, 5:29:27 PM (14 years ago)

Author:

Bruno Cornec

Message:

Fixes to support ia64 chroot with centos5

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (2 diffs)
• pb/bin/pb (modified) (3 diffs)
• rpmbootstrap/bin/rpmbootstrap (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -254 +254 @@
 #
 rbsmindep centos-5 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,centos-release,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,e2fsprogs-libs,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++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,nss,nspr,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-iniparse,python-sqlite,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib
+rbsmindep centos-5-ia64 = MAKEDEV,SysVinit,audit-libs,bash,beecrypt,bzip2-libs,centos-release,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,e2fsprogs-libs,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++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,nss,nspr,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,yum-metadata-parser,zlib
 #
 rbsmindep rhel-5 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,e2fsprogs-libs,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++,libsysfs,libtermcap,libxml2,libxml2-python,mcstrans,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,nss,nspr,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-iniparse,python-sqlite,python-urlgrabber,readline,redhat-release,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib
@@ -284 +285 @@
 rbsmirrorsrv centos-4 = http://mirrors.kernel.org/centos/4.8/os/$darch/CentOS/RPMS
 rbsmirrorsrv centos-5 = http://mirrors.kernel.org/centos/5.4/os/$darch/CentOS
+rbsmirrorsrv centos-5-ia64 = http://dev.centos.org/~z00dax/ia64/c5-wip/ia64/RPMS/
 #rbsmirrorsrv rhel =
 # darch == i586 for i386 repo

devel/pb/bin/pb

@@ -1742 +1742 @@
 
         # Get VE context
-        my ($ptr,$vepath,$rbsconf) = pb_conf_get("vetype","vepath","rbsconf");
+        my ($ptr,$vepath) = pb_conf_get("vetype","vepath");
         my $vetype = $ptr->{$ENV{'PBPROJ'}};
 
@@ -1789 +1789 @@
                         my $rinseverb = "";
                         $rinseverb = "--verbose" if ($pbdebug gt 0);
+                        my ($rbsconf) = pb_conf_get("rbsconf");
 
                         pb_system("sudo /usr/sbin/rinse --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch \"$darch\" --distribution \"$ddir-$dver\" --config \"$rbsconf->{$ENV{'PBPROJ'}}\" $b4post $postinstall $addpkgs $rinseverb","Creating the rinse VE for $ddir-$dver ($darch)", "verbose");
@@ -1804 +1805 @@
                         pb_system("sudo /usr/bin/rpmbootstrap $postinstall $addpkgs $ddir-$dver-$darch $rbsverb","Creating the rpmbootstrap VE for $ddir-$dver ($darch)", "verbose");
                     } elsif ($verpmstyle eq "mock") {
+                        my ($rbsconf) = pb_conf_get("rbsconf");
                         pb_system("sudo /usr/sbin/mock --init --resultdir=\"/tmp\" --configdir=\"$rbsconf->{$ENV{'PBPROJ'}}\" -r $v","Creating the mock VE for $ddir-$dver ($darch)");
                         # Once setup we need to install some packages, the pb account, ...

devel/rpmbootstrap/bin/rpmbootstrap

@@ -431 +431 @@
         pb_system("sed -i -e 's/\$releasever/$dver/g' $i","","quiet");
         pb_system("sed -i -e 's/^mirrorlist/#mirrorlist/' $i","","quiet");
-        pb_system("sed -i -e 's/^#baseurl/baseurl/' $i","","quiet");
+        # rather use neutral separators here
+        pb_system("sed -i -e 's|^#baseurl.*\$|baseurl=$mirror|' $i","","quiet");
     }
     $minipkglist = "ldconfig yum passwd vim-minimal dhclient authconfig";