Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 550504 - >=net-fs/nfs-utils-1.3.3 - systemd units should be installed by the build system
Summary: >=net-fs/nfs-utils-1.3.3 - systemd units should be installed by the build system
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo's Team for Core System packages
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-05-26 23:39 UTC by Alexander Tsoy
Modified: 2018-02-15 13:26 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Alexander Tsoy 2015-05-26 23:39:42 UTC
After commits [1] (already included in 1.3.2) and [2] (commited after 1.3.2 release) configure understands --with-systemd[=...] option. I suggest the following patch for the upcoming nfs-utils-1.3.3:


@@ -84,6 +84,7 @@
                $(use_enable caps) \
                $(use_enable uuid) \
                $(use_enable kerberos gss) \
+               $(systemd_with_unitdir systemd) \
                --without-gssglue
 }
 
@@ -135,7 +136,6 @@
                -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
                "${ED}"/etc/conf.d/nfs || die #234132
 
-       systemd_dounit systemd/*.{mount,service,target}
        if ! use nfsv4 || ! use kerberos ; then
                rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
        fi


Tested with nfs-utils-1.3.2-r6 + patch [2].


[1] http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=0fbf91a4fd904724ce031d73d282608104c84eac;hp=56cfa334c9cf3bccebbd0548706e69f9e201d66d
[2] http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=578e44bd1778d70f677a3efedb49a072ee3483ec;hp=484be028e408901bc54e76859c17713a2d5a2252
Comment 1 Alexander Tsoy 2015-05-27 00:35:38 UTC
Oops.. Since /usr/$(get_libdir) is now created by the build system, we need the following change as well:

@@ -101,7 +107,7 @@
        # Don't overwrite existing xtab/etab, install the original
        # versions somewhere safe...  more info in pkg_postinst
        keepdir /var/lib/nfs/{,sm,sm.bak}
-       mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
+       mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
 
        # Install some client-side binaries in /sbin
        dodir /sbin
Comment 2 Larry the Git Cow gentoo-dev 2018-02-15 13:26:05 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d26f6ce692d267eae4a0d73a6b96f950ebf23946

commit d26f6ce692d267eae4a0d73a6b96f950ebf23946
Author:     Alexander Tsoy <alexander@tsoy.me>
AuthorDate: 2018-02-15 11:51:24 +0000
Commit:     Lars Wendler <polynomial-c@gentoo.org>
CommitDate: 2018-02-15 13:25:54 +0000

    net-fs/nfs-utils: pass --with-systemd to configure
    
    And get rid of systemd_dounit() and removing unneeded unit files
    afterwards.
    
    Closes: https://bugs.gentoo.org/550504
    Closes: https://github.com/gentoo/gentoo/pull/7193

 net-fs/nfs-utils/nfs-utils-2.3.1-r2.ebuild | 185 +++++++++++++++++++++++++++++
 1 file changed, 185 insertions(+)