Changeset 1531 in ProjectBuilder

Timestamp:

May 13, 2012, 4:27:42 AM (12 years ago)

Author:

Bruno Cornec

Message:

rpmbootstrap: Add support for stop-on-error. Expand out VE paths. Error out if no packages are defined for the OS version since that indicates something is badly wrong. Track the packages that we install so that we can re-install them with the vendor's tool. Don't mount proc if it is already mounted. Only process repo files under yum.repos.d. In comment for now: Include all the packages installed during bootstrapping in the list of packages to re-install for yum and zypper. If you don't do this for yum, you end up with the generic fedora release file which doesn't match the pattern expected to determine the version. If you don't do this for zypper, then /etc/passwd isn't created, which creates failures later. Remove the zypper repository before adding, just adding fails since it already exists. Hack to fix up the yum.repos.d files again after the yum install since centos 6 mangles them during install. Report on broken packages listed for installation at the end so the warning isn't hidden. (Eric Anderson)

File:

• devel/rpmbootstrap/bin/rpmbootstrap (modified) (15 diffs)

devel/rpmbootstrap/bin/rpmbootstrap

@@ -118 +118 @@
 at the end of the chroot build.
 
+=item B<--no-stop-on-error>
+
+Continue through errors with best effort.
+
 =back 
 
@@ -170 +174 @@
 # ---------------------------------------------------------------------------
 
+$Global::pb_stop_on_error = 1;
 my ($projectbuilderver,$projectbuilderrev) = pb_version_init();
 my $appname = "rpmbootstrap";
@@ -191 +196 @@
     "add|a=s" => \$opts{'a'},
     "version|V=s" => \$opts{'V'},
+    "stop-on-error!" => \$Global::pb_stop_on_error,
 ) || pb_syntax(-1,0);
 
@@ -247 +253 @@
 if (not defined $vepath) {
     my ($vestdpath) = pb_conf_get("vepath");
-    $vepath = "$vestdpath->{'default'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}" if (defined $vestdpath->{'default'});
+    $vepath = pb_path_expand("$vestdpath->{'default'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}") if (defined $vestdpath->{'default'});
 }
 
@@ -259 +265 @@
 my ($rbscachedir) = pb_conf_get_if("cachedir");
 my ($pkgs,$mirror) = pb_distro_get_param($pbos,pb_conf_get("rbsmindep","rbsmirrorsrv"));
+die "No packages defined for $pbos->{name}-$pbos->{version}-$pbos->{arch}" unless $pkgs =~ /\w/;
 
 my $cachedir = "/var/cache/rpmbootstrap";
@@ -373 +380 @@
 my $warning = 0;
 my $lwpkg ="";
+my @installed_packages;
+
 foreach my $p (split(/,/,$pkgs)) {
     pb_log(1,"Processing package $p ...\n");
@@ -408 +417 @@
                 unlink("$cachedir/$p1");
             }
-    
+            push(@installed_packages, $p);
         }
     } else {
@@ -452 +461 @@
     pb_mkdir_p("$vepath/usr/lib/python2.4/site-packages/urlgrabber.skx");
     foreach my $i (<$vepath/usr/lib/python2.4/site-packages/urlgrabber/keepalive.*>) {
-        move($i,"$vepath/usr/lib/python2.4/site-packages/urlgrabber.skx/");
+        move($i,"$vepath/usr/lib/python2.4/site-packages/urlgrabber.skx/");
     }
 }
@@ -460 +469 @@
 #
 pb_mkdir_p("$vepath/proc");
-pb_system("mount -o bind /proc $vepath/proc","Mounting /proc");
+pb_system("mount -o bind /proc $vepath/proc","Mounting /proc") unless (-d "$vepath/proc/$$";);
 
 #
@@ -484 +493 @@
     # $releasever also needs to be filtered
     # yum.conf as well
-    foreach my $i (<$vepath/etc/yum.repos.d/*>,"$vepath/etc/yum.conf") {
+    foreach my $i (<$vepath/etc/yum.repos.d/*.repo>,"$vepath/etc/yum.conf") {
         pb_system("sed -i -e 's/\$basearch/$pbos->{'arch'}/g' $i","","quiet");
         pb_system("sed -i -e 's/\$releasever/$pbos->{'version'}/g' $i","","quiet");
@@ -492 +501 @@
     }
     $minipkglist = "ldconfig yum passwd vim-minimal dhclient authconfig";
+    # TODO
+    # $minipkglist = join(" ", "ldconfig yum passwd vim-minimal dhclient authconfig", @installed_packages);
 } elsif ($pbos->{'install'} =~ /zypper/) {
     pb_mkdir_p("$vepath/etc/zypp/repos.d");
@@ -500 +511 @@
         pb_system("chroot $vepath /bin/bash -c \"yes | /usr/bin/zypper sa $baseurl $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper");
     } else {
+        pb_system("chroot $vepath /bin/bash -c \"/usr/bin/zypper rr $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper",undef,1); # don't care if remove fails if add succeeds.
         pb_system("chroot $vepath /bin/bash -c \"/usr/bin/zypper ar $baseurl $pbos->{'name'}-$pbos->{'version'}\"","Bootstrapping Zypper");
     }
@@ -512 +524 @@
     close(REPO);
     $minipkglist = "zypper";
+    # TODO: Re-installing packages missing and necessary on opensuse 11.4 to get /etc/passwd created.
+    # $minipkglist = join(" ", "zypper", @installed_packages);
 } elsif ($pbos->{'install'} =~ /urpmi/) {
     # Setup the repo
     my $baseurl = dirname(dirname(dirname($mirror)));
     pb_system("chroot $vepath /bin/bash -c \"urpmi.addmedia --distrib $baseurl\"","Bootstrapping URPMI");
+    # TODO here too ?
     $minipkglist = "ldconfig urpmi passwd vim-minimal dhcp-client";
 }
@@ -525 +540 @@
 $pbos->{'install'} =~ s/sudo//g;
 pb_system("chroot $vepath /bin/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"
+if (($pbos->{'name'} eq "centos") && ($pbos->{'version'} =~ /^6.*/)) {
+    pb_log(0,"Fixing $pbos->{'name'} $pbos->{'version'} bug for yum conf files");
+    foreach my $from (<$vepath/etc/yum.repos.d/*.rpmorig>) {
+        my $to = $from;
+        $to =~ s/.rpmorig$//;
+        pb_system("mv $from $to", "Recover $from");
+    }
+}
 
 #
@@ -553 +578 @@
 }
 
+if ($warning > 0) {
+    pb_log(0,"\n\n\n\n$warning WARNINGS found.\nMaybe you should review your package list for $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}\nand remove$lwpkg\n");
+    pb_log(0,"waiting 60 seconds to give you a chance to notice.\n");
+    sleep(60);
+}
+
 # Function for File::Find
 sub unlink_old_conf {