Changeset 1603 in ProjectBuilder for devel/rpmbootstrap/bin/rpmbootstrap

Timestamp:

May 27, 2012, 1:49:49 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pbtest now uses debian-6.0 has the correct distro name and points to mandriva 2011.0
• pbtest now first umounts potential remaining /proc FS left from previous run and has a build dep fo deb on gcc
• pb: removes a useless chown in it which was always failing
• Fix errors in mageia deps
• Fix typo in Base.pm
• rpmbootstrap needs aaa_base for VE seyup with zypper, in order to add passwd file e.g.

File:

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

devel/rpmbootstrap/bin/rpmbootstrap

@@ -504 +504 @@
     }
     $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");
@@ -514 +512 @@
         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","mayfail"); # don't care if remove fails if add succeeds.
+        # 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");
     }
@@ -526 +525 @@
 #EOF
     close(REPO);
-    $minipkglist = "zypper";
+    $minipkglist = "zypper aaa_base";
     # 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