Changeset 1812 in ProjectBuilder

Timestamp:

Jan 2, 2014, 12:15:42 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Improve fedora rpmbootstrap VE (still need now correct deps list)

Location:

devel

Files:

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

devel/pb-modules/etc/pb.conf

@@ -334 +334 @@
 #
 rbsmindep fedora-17 = ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,c-ares,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,e2fsprogs,e2fsprogs-libs,elfutils-libelf,expat,fedora-release,fedora-release-notes,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,libcom_err,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libselinux,libsepol,libssh2,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,nss-softokn,nss-softokn-freebl,nss-util,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-pycurl,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,vim-minimal,xz-libs,yum,yum-metadata-parser,zlib
+#
+rbsmindep fedora-18 = ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,c-ares,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db5,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,e2fsprogs,e2fsprogs-libs,elfutils-libelf,expat,fedora-release,fedora-release-notes,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,libcom_err,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libselinux,libsepol,libssh2,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,nss-softokn,nss-softokn-freebl,nss-util,openldap,openssl,pam,passwd,pcre,pinentry,popt,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-pycurl,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,systemd,tzdata,vim-minimal,xz-libs,yum,yum-metadata-parser,zlib
+#
 #
 rbsmindep centos-4 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,centos-release,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,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++,libtermcap,libxml2,libxml2-python,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,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

devel/rpmbootstrap/bin/rpmbootstrap

@@ -303 +303 @@
 # Get the list of packages and their URL in this hash
 my %url;
+my %done;
 foreach my $l (@list_pkg) {
     my ($url,$desc) = rbs_find_pkg($l,$parch,"pkg");
@@ -309 +310 @@
     } else {
         pb_log(3,"not a package, maybe a dir containing packages\n");
-        my $response1 = $ua->get("$mirror/Packages");
-        # Check if we have a fedora 17/18 type of repo
-        if ($response1->is_success) {
-            foreach my $d (split(/\n/,$response1->as_string())) {
-                ($url,$desc) = rbs_find_pkg($d,$parch,"dir");
-                if (defined $url) {
-                    # Here we have the dir in which are packages
-                    my $response2 = $ua->get("$mirror/Packages/$desc");
-                    foreach my $p (split(/\n/,$response2->as_string())) {
-                        ($url,$desc) = rbs_find_pkg($d,$parch,"dir");
-                        if (defined $url) {
-                            $url{$p} = "$mirror/$desc";
-                        } else {
-                            pb_log(3,"not a package, and not a dir containing packages\n");
-                        }
+        ($url,$desc) = rbs_find_pkg($l,$parch,"dir");
+        if ((defined $desc) and (not defined $done{$desc})) {
+            my $response1 = $ua->get("$mirror/$desc");
+            # Check if we have a fedora 17/18 type of repo
+            if ($response1->is_success) {
+                $done{$desc} = "true";
+                foreach my $d (split(/\n/,$response1->as_string())) {
+                    my ($url2,$desc2) = rbs_find_pkg($d,$parch,"pkg");
+                    if (defined $url2) {
+                        # Here we have the dir in which are packages
+                        $url{$url2} = "$mirror/$desc/$desc2";
+                    } else {
+                        pb_log(3,"not a package, and not a dir containing packages\n");
                     }
-                } else {
                 }
+            } else {
             }
-        } else {
         }
     }
@@ -477 +475 @@
 pb_system("mknod -m 666 $vepath/dev/null c 1 3","Creating $vepath/dev/null") if (! -c "$vepath/dev/null");
 
+# Where is bash
+my $bash = "/usr/bin/bash";
+if (! -x "$vepath/$bash" ) {
+    $bash = "/bin/bash";
+    if (! -x "$vepath/$bash" ) {
+        die "No bash found in usual places. Please report to dev team";
+    }
+}
+    
+
 my $minipkglist;
 
@@ -503 +511 @@
     # Setup the repo
     if ($pbos->{'version'} eq "10.2") {
-        pb_system("chroot $vepath /bin/bash -c \"yes | /usr/bin/zypper sa $baseurl $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper");
+        pb_system("chroot $vepath $bash -c \"yes | /usr/bin/zypper sa $baseurl $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper");
     } else {
         # don't care if remove fails if add succeeds.
-        pb_system("chroot $vepath /bin/bash -c \"/usr/bin/zypper rr $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper","mayfail");
-        pb_system("chroot $vepath /bin/bash -c \"/usr/bin/zypper ar $baseurl $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper");
+        pb_system("chroot $vepath $bash -c \"/usr/bin/zypper rr $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper","mayfail");
+        pb_system("chroot $vepath $bash -c \"/usr/bin/zypper ar $baseurl $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper");
     }
     #print REPO << "EOF";
@@ -523 +531 @@
     # Setup the repo
     my $baseurl = dirname(dirname(dirname($mirror)));
-    pb_system("chroot $vepath /bin/bash -c \"urpmi.addmedia --distrib $baseurl\"","Bootstrapping URPMI");
+    pb_system("chroot $vepath $bash -c \"urpmi.addmedia --distrib $baseurl\"","Bootstrapping URPMI");
     # TODO here too ?
     $minipkglist = "ldconfig urpmi passwd vim-minimal dhcp-client";
@@ -560 +568 @@
 
 # Keep redhat variants from destroying nis domain on install
-#pb_system("chroot $vepath /bin/bash -e -c \"ln -snf /bin/true /bin/domainname\"");
+#pb_system("chroot $vepath $bash -e -c \"ln -snf /bin/true /bin/domainname\"");
 
 #if ($pbos->{'name'} =~ /fedora/i) { # hack to prevent fedora from destroying NIS settings on host
@@ -567 +575 @@
 #   close(AUTH);
 #}
-pb_system("chroot $vepath /bin/bash -c \"$pbos->{'install'} $minipkglist \"","Bootstrapping OS by running $pbos->{'install'} $minipkglist");
+pb_system("chroot $vepath $bash -c \"$pbos->{'install'} $minipkglist \"","Bootstrapping OS by running $pbos->{'install'} $minipkglist");
 
 # CentOS6 will replace the yum.repos.d files; oddly it will leave the yum.conf file alone and make the new one ".rpmnew"
@@ -585 +593 @@
 # TODO: Not generic enough to be done like that IMHO
 # In case it was changed during the install
-#pb_system("chroot $vepath /bin/bash -e -c \"ln -snf /bin/true /bin/domainname\"");
-pb_system("chroot $vepath /bin/bash -c \"if [ -x /usr/bin/authconfig ]; then /usr/bin/authconfig --enableshadow --update --nostart; fi\"","Calling authconfig");
+#pb_system("chroot $vepath $bash -e -c \"ln -snf /bin/true /bin/domainname\"");
+pb_system("chroot $vepath $bash -c \"if [ -x /usr/bin/authconfig ]; then /usr/bin/authconfig --enableshadow --update --nostart; fi\"","Calling authconfig");
 
 # Installed additional packages we were asked to
 if (defined $opts{'a'}) {
     $opts{'a'} =~ s/,/ /g;
-    pb_system("chroot $vepath /bin/bash -c \"$pbos->{'install'} $opts{'a'} \"","Adding packages to OS by running $pbos->{'install'} $opts{'a'}");
+    pb_system("chroot $vepath $bash -c \"$pbos->{'install'} $opts{'a'} \"","Adding packages to OS by running $pbos->{'install'} $opts{'a'}");
 }