Changeset 2012 in ProjectBuilder for devel/rpmbootstrap

Timestamp:

Oct 12, 2015, 12:17:48 PM (9 years ago)

Author:

Bruno Cornec

Message:

Adds dnf support

Starting with Fedora 22 the package manager is dnf and not yum anymore
pb needed some adaptations to support it, which have been mostly been
coded in this patch. Tests to be done.

File:

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

devel/rpmbootstrap/bin/rpmbootstrap

@@ -354 +354 @@
     if (($pbos->{'name'} eq "fedora") && ($pbos->{'version'} > 8)) {
         $oscachedir = "$vepath/var/cache/yum/$pbos->{'arch'}/$pbos->{'version'}/fedora/packages";
-        $osupdcachedir = "$vepath/var/cache/yum/$pbos->{'arch'}/$pbos->{'version'}/updates/packages";
+        #$osupdcachedir = "$vepath/var/cache/yum/$pbos->{'arch'}/$pbos->{'version'}/updates/packages";
         $osupdcachedir = "$vepath/var/cache/yum/updates-released/packages/";
     }
+} elsif ($pbos->{'install'} =~ /dnf/) {
+    $osupdname = "DNF";
+    $oscachedir = "$vepath/var/cache/dnf/$pbos->{'arch'}/$pbos->{'version'}/fedora/packages";
+    $osupdcachedir = "$vepath/var/cache/dnf/updates-released/packages/";
 } elsif ($pbos->{'install'} =~ /zypper/) {
     $oscachedir = "$vepath/var/cache/zypp/packages/opensuse/suse/$pbos->{'arch'}";
@@ -442 +446 @@
 
 # yum needs that distro-release package be installed, so force it
-if ($pbos->{'install'} =~ /yum/) {
+if (($pbos->{'install'} =~ /yum/) || ($pbos->{'install'} =~ /dnf/)) {
     my $ddir = $pbos->{'name'};
     foreach my $p1 (<$cachedir/($ddir|redhat)-release-*.rpm>) {
@@ -504 +508 @@
 
 pb_log(1,"Adapting $osupdname repository entries\n");
-if ($pbos->{'install'} =~ /yum/) {
+if (($pbos->{'install'} =~ /yum/) || ($pbos->{'install'} =~ /dnf/)) {
     #
-    # Force the architecture for yum
+    # Force the architecture for yum/dnf
     # The goal is to allow i386 chroot on x86_64
     #
-    # FIX: Not sufficient to have yum working
+    # FIX: Not sufficient to have yum/dnf working
     # mirrorlist is not usable
     # $releasever also needs to be filtered
     # yum.conf as well
-    foreach my $i (<$vepath/etc/yum.repos.d/*.repo>,"$vepath/etc/yum.conf") {
+    foreach my $i (<$vepath/etc/yum.repos.d/*.repo>,"$vepath/etc/yum.conf","$vepath/etc/dnf/dnf.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");
@@ -521 +525 @@
         pb_system("sed -i -e 's|^#baseurl.*\$|baseurl=$repo|' $i","","quiet");
     }
-    $minipkglist = "ldconfig yum passwd vim-minimal dhclient authconfig";
+    my $pkgmgr = "";
+    if ($pbos->{'install'} =~ /yum/) {
+        $pkgmgr = "yum";
+    }
+    if ($pbos->{'install'} =~ /dnf/) {
+        $pkgmgr = "dnf";
+    }
+    $minipkglist = "ldconfig $pkgmgr passwd vim-minimal dhclient authconfig";
 } elsif ($pbos->{'install'} =~ /zypper/) {
     pb_mkdir_p("$vepath/etc/zypp/repos.d");
@@ -626 +637 @@
     pb_system("chroot $vepath /usr/bin/yum clean all","Cleaning yum");
 }
+if ($pbos->{'install'} =~ /dnf/) {
+    pb_system("chroot $vepath /usr/bin/dnf clean all","Cleaning dnf");
+}
 pb_system("umount $vepath/proc","Unmounting /proc");
 find(\&unlink_old_conf, $vepath);
@@ -704 +718 @@
 my $repo = $mirror;
 my $found = 0;
-if ($pbos->{'install'} =~ /yum/) {
+if (($pbos->{'install'} =~ /yum/) || ($pbos->{'install'} =~ /dnf/)) {
     my $response1;
     while ($found == 0) {