Changeset 990

Timestamp:

02/24/10 07:03:55 (3 years ago)

Author:

bruno

Message:

r3709@localhost: bruno | 2010-02-22 22:05:32 +0100

• First addition of OpenSUSE support in rpmbootstrap

Location:

devel

Files:

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

devel/pb-modules/etc/pb.conf

@@ -195 +195 @@
 osupd md = sudo urpmi.update -a ; sudo urpmi --auto 
 osupd novell = export TERM=linux ; export PATH=\$PATH:/sbin:/usr/sbin ; sudo yast2 -i 
+osupd opensuse-10.2 = sudo yes | zypper install
 osupd opensuse = sudo zypper -n install
 osupd sol = sudo pkgadd -d

devel/rpmbootstrap/bin/rpmbootstrap

@@ -275 +275 @@
 # Prepare early the yum cache env for the VE in order to copy in it packages on the fly
 #
+my $oscachedir = "/tmp";
+my $osupdcachedir;
+my $osupdname = "";
+
+pb_log(1,"Setting up $osupdname cache in VE\n");
 if ($pbupd =~ /yum/) {
-    pb_log(1,"Setting up YUM cache in VE\n");
-    pb_mkdir_p("$vepath/var/cache/yum/core/packages/");
-    pb_mkdir_p("$vepath/var/cache/yum/updates-released/packages/");
-}
+    $oscachedir = "$vepath/var/cache/yum/core/packages/";
+    $osupdcachedir = "$vepath/var/cache/yum/updates-released/packages/";
+    $osupdname = "YUM";
+    # Recent Fedora release use a new yum cache dir
+    if (($ddir eq "fedora") && ($dver > 8)) {
+        $oscachedir = "$vepath/var/cache/yum/$darch/$dver/fedora/packages";
+        $osupdcachedir = "$vepath/var/cache/yum/$darch/$dver/updates/packages";
+        $osupdcachedir = "$vepath/var/cache/yum/updates-released/packages/";
+    }
+} elsif ($pbupd =~ /zypper/) {
+    pb_log(1,"Setting up Zypper cache in VE\n");
+    $oscachedir = "$vepath/var/cache/zypp/packages/opensuse/suse/$darch";
+    $osupdname = "Zypper";
+}
+pb_mkdir_p($oscachedir);
+pb_mkdir_p($osupdcachedir) if (defined $osupdcachedir);
 
 # For each package to process, get it, put it in the cache dir 
@@ -309 +326 @@
 
             #
-            # Copy the cached .RPM files into the yum directory, so that yum doesn't need to make them again.
+            # Copy the cached .RPM files into the oscachedir directory, so that os doesn't need to download them again.
             #
-            if ($pbupd =~ /yum/) {
-                pb_log(1,"Link package into $vepath/var/cache/yum/core/packages\n");
-                #link("$cachedir/$p1","$vepath/var/cache/yum/core/packages/");
-                copy("$cachedir/$p1","$vepath/var/cache/yum/$darch/$dver/fedora/packages");
-                symlink("$vepath/var/cache/yum/$darch/$dver/fedora/packages","$vepath/var/cache/yum/$darch/$dver/updates/packages");
-            }
+            pb_log(1,"Link package into $oscachedir\n");
+            copy("$cachedir/$p1",$oscachedir) if (defined $oscachedir);
+            symlink("$oscachedir/$p1","$osupdcachedir/p1") if (defined $osupdcachedir);
 
             # And extract it to the finale dir
@@ -347 +361 @@
 
 # yum needs that distro-release package be installed, so force it
-
-foreach my $p1 (<$cachedir/($ddir|redhat)-release-*.rpm>) {
-    copy("$cachedir/$p1","$vepath/tmp");
-    pb_system("chroot $vepath rpm -ivh --force --nodeps /tmp/$p1","Forcing RPM installation of $p1");
-    unlink("$vepath/tmp/$p1");
+if ($pbupd =~ /yum/) {
+    foreach my $p1 (<$cachedir/($ddir|redhat)-release-*.rpm>) {
+        copy("$cachedir/$p1","$vepath/tmp");
+        pb_system("chroot $vepath rpm -ivh --force --nodeps /tmp/$p1","Forcing RPM installation of $p1");
+        unlink("$vepath/tmp/$p1");
+    }
 }
 #
@@ -363 +378 @@
 # BUGFIX:
 #
-if (($ddir eq "centos") && ($dver eq "5")) {
+if ((($ddir eq "centos") || ($ddir eq "rhel")) && ($dver eq "5")) {
     pb_log(1,"BUGFIX for centos-5\n");
     pb_mkdir_p("$vepath/usr/lib/python2.4/site-packages/urlgrabber.skx");
@@ -384 +399 @@
 pb_system("mknod -m 666 $vepath/dev/zero c 1 5","Creating $vepath/dev/zero") if (! -c "$vepath/dev/zero");
 
+my $minipkglist;
+
+pb_log(1,"Adapting $osupdname repository entries");
 if ($pbupd =~ /yum/) {
     #
@@ -399 +417 @@
         pb_system("sed -i -e 's/^#baseurl/baseurl/' $i","","quiet");
     }
-
-    #
-    # Run "yum install the necessary modules".
-    # No need for sudo here
-    #
-    $pbupd =~ s/sudo//g;
-    pb_system("chroot $vepath /bin/bash -c \"$pbupd ldconfig yum passwd vim-minimal dhclient authconfig\"","Bootstrapping yum");
-}
+    $minipkglist = "ldconfig yum passwd vim-minimal dhclient authconfig";
+} elsif ($pbupd =~ /zypper/) {
+    pb_mkdir_p("$vepath/etc/zypp/repos.d");
+    open(REPO,"> $vepath/etc/zypp/repos.d/$ddir-$dver") || die "Unable to create repo file";
+    my $baseurl = dirname(dirname($mirror));
+    print REPO << 'EOF';
+[opensuse]
+name=$ddir-$dver
+baseurl=$baseurl
+enabled=1
+gpgcheck=1
+
+EOF
+    $minipkglist = "zypper vim-minimal dhclient";
+    # Bootstraping zypper
+    if ($dver eq "10.2") {
+        pb_system("chroot $vepath /bin/bash -c \"yes | /usr/bin/zypper sa $baseurl $ddir-$dver\"","Bootstrapping Zypper");
+    }
+}
+
+#
+# Run "install the necessary modules".
+# No need for sudo here
+#
+$pbupd =~ s/sudo//g;
+pb_system("chroot $vepath /bin/bash -c \"$pbupd $minipkglist \"","Bootstrapping OS by running $pbupd $minipkglist");
 
 #