Changeset 993 in ProjectBuilder

Timestamp:

Mar 3, 2010, 9:09:56 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3719@localhost: bruno | 2010-03-03 19:10:43 +0100

• Improvements for mandriva chroot. GPG check still not working

Location:

devel

Files:

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

devel/pb-modules/etc/pb.conf

@@ -271 +271 @@
 rbsmindep mandriva-2009.1 = MAKEDEV,ConsoleKit-libs,audit-libs,basesystem,bash,beecrypt,bzip2-libs,chkconfig,compat-db45,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,dirmngr,e2fsprogs,e2fsprogs-libs,elfutils-libelf,ethtool,expat,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libksba,liblzma,libselinux,libsepol,libstdc++,libusb,libvolume_id,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,upstart,urpmi,util-linux-ng,vim-minimal,zlib
 #
-rbsmindep mandriva-2010.0 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,libacl1,libattr1,libblkid1,libbzip2_1,libcap2,libcurl4,libdb4.7,libelfutils1,libgcc1,libgcrypt11,libgpg-error0,libidn11,libksba8,liblua5.1,liblzma2,libmagic1,libncurses5,libnspr4,libnss3,libpopt0,libreadline6,librpm4,libsqlite3_0,libstdc++6,libtermcap2,libusb1.0_0,libuuid1,libxml2_2,logrotate,lua,mingetty,module-init-tools,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,sysvinit-tools,udev,urpmi,util-linux-ng,vim-minimal,zlib1
+rbsmindep mandriva-2010.0 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,libacl1,libattr1,libblkid1,libbzip2_1,libcap2,libcurl4,libdb4.7,libelfutils1,libext2fs2,libgcc1,libgcrypt11,libgpg-error0,libidn11,libkrb53,libksba8,libldap2.4_2,liblua5.1,liblzma2,libmagic1,libncurses5,libnspr4,libnss3,libopenssl0.9.8,libpopt0,libreadline6,librpm4,libsasl2,libsqlite3_0,libssh2_1,libstdc++6,libtermcap2,libusb1.0_0,libuuid1,libxml2_2,logrotate,lua,meta-task,mingetty,module-init-tools,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,sysvinit-tools,udev,urpmi,util-linux-ng,vim-minimal,zlib1
 
 # Where to store packages downloaded temporarily by rpmbootstrap

devel/rpmbootstrap/bin/rpmbootstrap

@@ -455 +455 @@
 } elsif ($pbupd =~ /urpmi/) {
     # Setup the repo
-    open(REPO,"> $vepath/etc/urpmi/urpmi.cfg") || die "Unable to create repo file";
-    print REPO << "EOF";
-Main\ (mdv1) $mirror/media/main/release {
-  key-ids: 70771ff3
-}
-
-Main\ Updates\ (mdv2) $mirror/media/main/updates {
-  key-ids: 22458a98
-  update
-}
-
-Contrib\ (mdv9) $mirror/media/contrib/release {
-  key-ids: 78d019f5
-}
-
-Contrib\ Updates\ (mdv10) $mirror/media/contrib/updates {
-  key-ids: 26752624
-  update
-}
-EOF
-    close(REPO);
-    $minipkglist = "ldconfig urpmi passwd vim-minimal dhcp-client authconfig";
+    my $baseurl = dirname(dirname(dirname($mirror)));
+    pb_system("chroot $vepath /bin/bash -c \"urpmi.addmedia --distrib $baseurl\"","Bootstrapping URPMI");
+    $minipkglist = "ldconfig urpmi passwd vim-minimal dhcp-client";
 }