Changeset 992 in ProjectBuilder

Timestamp:

Mar 3, 2010, 8:24:08 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3713@localhost: bruno | 2010-03-02 23:13:29 +0100

• Adds support for mandriva in rpmbootstrap - Not finished yet. chroot should be able to call urpmi

Location:

devel

Files:

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

devel/pb-modules/etc/pb.conf

@@ -269 +269 @@
 rbsmindep opensuse-11.2 = ConsoleKit,cracklib-dict-small,PolicyKit,aaa_base,audit-libs,bash,boost-license,bzip2,coreutils,coreutils-lang,cpio,cpio-lang,cracklib,cyrus-sasl,dbus-1,dbus-1-glib,device-mapper,diffutils,dirmngr,e2fsprogs,ethtool,expat,filesystem,fillup,findutils,gawk,gdbm,glib2,glib2-branding-upstream,glib2-lang,glibc,gpg2,gpg2-lang,grep,gzip,hal,info,insserv,keyutils-libs,krb5,libacl,libattr,libboost_signals1_36_0,libbz2-1,libcom_err2,libcurl4,libdb-4_5,libexpat1,libgcc43,libgcrypt11,libglib-2_0-0,libgobject-2_0-0,libgthread-2_0-0,libgpg-error0,libidn,libksba,libldap-2_4-2,libncurses5,libnscd,libopenssl0_9_8,libreadline5,libreiserfs,libselinux1,libsepol1,libsmbios2,libstdc++43,libusb-0_1-4,libuuid1,libvolume_id1,libxcrypt,libxml2,libxml2-python,libzio,libzypp,login,mingetty,module-init-tools,ncurses-utils,neon,net-tools,openSUSE-release,openSUSE-release-ftp,openslp,pam,pam-config,pam-modules,parted,pciutils,pcre,perl-base,permissions,pinentry,pm-utils,pmtools,popt,procps,psmisc,pth,pwdutils,python,python-urlgrabber,rpm,rpm-python,satsolver-tools,sed,setserial,sysvinit,termcap,terminfo-base,udev,util-linux,uuid-runtime,zlib,zypper
 #
-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,util-linux-ng,vim-minimal,yum,yum-metadata-parser,zlib
-#
-rbsmindep mandriva-2010.0 = 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,util-linux-ng,vim-minimal,yum,yum-metadata-parser,zlib
+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
 
 # Where to store packages downloaded temporarily by rpmbootstrap

devel/rpmbootstrap/bin/rpmbootstrap

@@ -250 +250 @@
 my $response = $ua->get($mirror);
 if (! $response->is_success) {
-    die "Unable to download packages from $mirror for $ddir-$dver-$darch";
+    if ($mirror =~ /i386/) {
+        # Some distro have an i586 or i686 mirror dir instead for i386
+        warn "Unable to download packages from $mirror for $ddir-$dver-$darch.";
+        $mirror =~ s|/i386/|/i586/|;
+        $response = $ua->get($mirror);
+        if (! $response->is_success) {
+            die "Unable to download packages from $mirror for $ddir-$dver-$darch";
+        }
+    }
 }
 pb_log(3,"Mirror $mirror gave answer: ".Dumper($response->dump(maxlength => 0))."\n");
@@ -298 +306 @@
     $osupdname = "Zypper";
 } elsif ($pbupd =~ /urpmi/) {
-    $oscachedir = "$vepath/var/cache/zypp/packages/opensuse/suse/$darch";
-    $osupdname = "Zypper";
+    $oscachedir = "$vepath/var/cache/urpmi/rpms";
+    $osupdname = "URPMI";
 }
 pb_log(1,"Setting up $osupdname cache in VE\n");
@@ -402 +410 @@
 # Some devices may be needed
 #
+pb_mkdir_p("$vepath/dev");
 pb_system("mknod -m 644 $vepath/dev/random c 1 8","Creating $vepath/dev/random") if (! -c "$vepath/dev/random");
 pb_system("mknod -m 644 $vepath/dev/urandom c 1 9","Creating $vepath/dev/urandom") if (! -c "$vepath/dev/urandom");
@@ -429 +438 @@
     open(REPO,"> $vepath/etc/zypp/repos.d/$ddir-$dver") || die "Unable to create repo file";
     my $baseurl = dirname(dirname($mirror));
+    # Setup the repo
     print REPO << 'EOF';
 [opensuse]
@@ -437 +447 @@
 
 EOF
+    close(REPO);
     $minipkglist = "zypper vim-minimal dhclient";
     # Bootstraping zypper
@@ -442 +453 @@
         pb_system("chroot $vepath /bin/bash -c \"yes | /usr/bin/zypper sa $baseurl $ddir-$dver\"","Bootstrapping Zypper");
     }
+} 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";
 }