Changeset 2012 in ProjectBuilder

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.

Location:

devel

Files:

• pb-doc/SECURITY (modified) (1 diff)
• pb-modules/etc/pb.conf (modified) (4 diffs)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)
• pb/bin/pb (modified) (2 diffs)
• rpmbootstrap/bin/rpmbootstrap (modified) (6 diffs)
• website/about.shtml (modified) (1 diff)
• website/downloads.shtml (modified) (1 diff)

devel/pb-doc/SECURITY

@@ -10 +10 @@
 
 In the default pb.conf main configuration files, parameters for osupd and osins for the various distributions call sudo to make the installation of missing packages. These calls are done as 'pb' user by default (or the account configured as rmlogin in the configuration file). In case this is used, and sudo isn't configured accordingly, then the additional required packages will NOT be added and the build will probably fail.
-For RM, we may consider that all required packages for the build are already installed on the system, or give rpm/yum/apt/urpmi/zypper... sudo rights to the build account manually.
+For RM, we may consider that all required packages for the build are already installed on the system, or give rpm/yum/dnf/apt/urpmi/zypper... sudo rights to the build account manually.
 Recommended for a manual setup (not using rmsetup): Add manually to your system sudo access for the pb account to the local package install and update command such as /bin/rpm e.g:
 cat >> /etc/sudoers << EOF

devel/pb-modules/etc/pb.conf

@@ -229 +229 @@
 osupd gen = sudo /usr/bin/emerge --update --deep world; sudo /usr/bin/revdep-rebuild
 osupd rpm = sudo /usr/bin/yum clean all; sudo /usr/bin/yum -y update
+osupd fedora-22 = sudo /usr/bin/dnf clean all; sudo /usr/bin/dnf -y upgrade ; sudo /usr/bin/dnf -y update
 osupd md = sudo /usr/sbin/urpmi.update -a ; sudo /usr/sbin/urpmi --auto --auto-select --no-suggests
 osupd opensuse-10.2 = sudo /usr/bin/yast2 -i
@@ -247 +248 @@
 osins gen = sudo /usr/bin/emerge 
 osins rpm = sudo /usr/bin/yum clean all; sudo /usr/bin/yum -y update ; sudo /usr/bin/yum -y install 
+osins fedora-22 = sudo /usr/bin/dnf clean all; sudo /usr/bin/dnf -y upgrade ; sudo /usr/bin/dnf -y install 
 osins rhel-2 = sudo /usr/sbin/up2date -y 
 osins rhel-3 = sudo /usr/sbin/up2date -y 
@@ -348 +350 @@
 #
 rbsmindep fedora-20 = ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,ca-certificates,c-ares,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,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,libdb,libffi,libgcc,libgcrypt,libgpg-error,libidn,libselinux,libsepol,libssh2,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,mingetty,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,nss-softokn,nss-softokn-freebl,nss-util,openldap,openssl,openssl-libs,pam,passwd,pcre,perl,perl-Data-Dumper,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 fedora-21 = ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,ca-certificates,c-ares,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,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,libdb,libffi,libgcc,libgcrypt,libgpg-error,libidn,libselinux,libsepol,libssh2,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,mingetty,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,nss-softokn,nss-softokn-freebl,nss-util,openldap,openssl,openssl-libs,pam,passwd,pcre,perl,perl-Data-Dumper,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 fedora-22 = ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,ca-certificates,c-ares,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,dbus,dbus-libs,device-mapper,device-mapper-libs,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,libdb,libffi,libgcc,libgcrypt,libgpg-error,libidn,libselinux,libsepol,libssh2,libusb,libxml2,linux-atm-libs,logrotate,lua,mingetty,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,nss-softokn,nss-softokn-freebl,nss-util,openldap,openssl,openssl-libs,pam,passwd,pcre,perl,perl-Data-Dumper,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,dnf,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
@@ -657 +663 @@
 # Commands needed on the underlying system
 oscmd pb = tar,chmod,ls
-oscmdopt pb = rpmbuild,dpkg-buildpackage,rpm,dpkg,wget,sudo,apt-get,mv,gzip,ebuild,makepkg,pkgmk,pkgtrans,rm,rpmlint,lintian,chroot,schroot,cp,chown,debsign,qemu-img,qemu,kvm,rpmbootstrap,rinse,mock,debootstrap,mkdir,cat,ssh,scp,yum,bash,make,vi,ssh-keygen,svn,hg,cvs,git,svk,svn2cl,cvs2cl,urpmi
+oscmdopt pb = rpmbuild,dpkg-buildpackage,rpm,dpkg,wget,sudo,apt-get,mv,gzip,ebuild,makepkg,pkgmk,pkgtrans,rm,rpmlint,lintian,chroot,schroot,cp,chown,debsign,qemu-img,qemu,kvm,rpmbootstrap,rinse,mock,debootstrap,mkdir,cat,ssh,scp,yum,dnf,bash,make,vi,ssh-keygen,svn,hg,cvs,git,svk,svn2cl,cvs2cl,urpmi
 oscmd rpmbootstrap = rpm,rpm2cpio,wget
 #oscmdopt rpmbootstrap = 

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -589 +589 @@
             if ($pbos->{install} =~ /\byum\b/) {
                 $reponame="yum";
+                $dirdest = "/etc/yum.repos.d";
+            } elsif ($pbos->{install} =~ /\bdnf\b/) {
+                $reponame="dnf";
                 $dirdest = "/etc/yum.repos.d";
             } elsif ($pbos->{install} =~ /\bzypper\b/) {

devel/pb/bin/pb

@@ -2199 +2199 @@
             # By default force GPG check in repo even if we support signature of packages to fail. This is a best practice
             $pbgpgcheck = 1 if (not defined $pbgpgcheck);
-            # Also make a pbscript to generate yum/urpmi bases
+            # Also make a pbscript to generate dnf/yum/urpmi bases
             print PBS << "EOF";
 #!/bin/bash
-# Prepare a script to ease yum setup
+# Prepare a script to ease dnf/yum setup
 EOF
             print PBS "set -x\n" if ($pbdebug gt 1);
@@ -3797 +3797 @@
 
 # First install all required packages
-pb_system("yum clean all","Cleaning yum env","mayfail") if (($pbos->{'name'} eq "fedora") || ($pbos->{'name'} eq "asianux") || ($pbos->{'name'} eq "rhel"));
+pb_system("dnf clean all","Cleaning dnf env","mayfail") if (($pbos->{'name'} eq "fedora") && ($pbos->{'version'} >= 22));
+pb_system("yum clean all","Cleaning yum env","mayfail") if ((($pbos->{'name'} eq "fedora") && ($pbos->{'version'} < 22)) || ($pbos->{'name'} eq "asianux") || ($pbos->{'name'} eq "rhel"));
 my ($ospkgdep) = pb_conf_get_if("ospkgdep");
     

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) {

devel/website/about.shtml

@@ -39 +39 @@
     <li>Multiple systems (RPM Linux - Red Hat, SuSE, Mandriva, ..., deb Linux - Debian, Ubuntu, ..., ebuild - Gentoo, pkg Solaris/OpenSolaris, ...)</li>
     <li>Multiple build environments (local, VM - QEMU, KVM, ..., VE - rpmbootstrap, mock, rinse, debootstrap, RM - ssh...)</li>
-    <li>Multiple repository manager (yum, urpmi, apt, ...)</li>
+    <li>Multiple repository manager (yum, dnf, urpmi, apt, ...)</li>
 </ul>
 and this, at various phases (development, test, integration, delivery).

devel/website/downloads.shtml

@@ -64 +64 @@
 <p>
 <p>For Fedora distributions, after downloading the <a href="ftp://ftp.project-builder.org/fedora/">repo file</a> pb.repo and adding it to the /etc/yum.repos.d directory, just use the magic:<br>
-<tt>yum install project-builder</tt></p>
+<tt>yum|dnf install project-builder</tt></p>
 <p>
 For Debian/Ubuntu, just use the magic: <br>