Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 648868 - =app-emulation/libvirt-9999 fails to apply patches
Summary: =app-emulation/libvirt-9999 fails to apply patches
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Matthias Maier
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-02-26 16:08 UTC by Michal Privoznik
Modified: 2018-03-23 14:16 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 Michal Privoznik 2018-02-26 16:08:10 UTC
With the recent work done upstream, daemon/ directory was moved to src/remote/ (see 3f055b5997ca and friends). This, however, means that some patches from -9999.ebuild no longer apply. For instance:

* Applying libvirt-1.3.0-do_not_use_sysconf.patch ...
The text leading up to this was:
--------------------------
|diff --git a/daemon/Makefile.am b/daemon/Makefile.am
|index be1b5a9..5ce0e1e 100644
|--- a/daemon/Makefile.am
|+++ b/daemon/Makefile.am
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
The text leading up to this was:
--------------------------
|diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
|index 608221c..63708f4 100644
|--- a/daemon/libvirtd.service.in
|+++ b/daemon/libvirtd.service.in
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
1 out of 1 hunk FAILED -- saving rejects to file src/Makefile.am.rej                                                                                                                                                                                         [ !! ]
Comment 1 Larry the Git Cow gentoo-dev 2018-03-14 18:18:09 UTC
The bug has been closed via the following commit(s):

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

commit 5faf22a12438c5539a1bea9685bc2d8f68397137
Author:     Matthias Maier <tamiko@gentoo.org>
AuthorDate: 2018-03-14 16:52:05 +0000
Commit:     Matthias Maier <tamiko@gentoo.org>
CommitDate: 2018-03-14 18:17:46 +0000

    app-emulation/libvirt: fix live ebuild
    
    Closes: https://bugs.gentoo.org/648868
    Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-emulation/libvirt/libvirt-9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Comment 2 Michal Privoznik 2018-03-15 07:10:17 UTC
(In reply to Larry the Git Cow from comment #1)
> The bug has been closed via the following commit(s):
> 
> https://gitweb.gentoo.org/repo/gentoo.git/commit/
> ?id=5faf22a12438c5539a1bea9685bc2d8f68397137

Still failing:

>>> Preparing source in /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999 ...
 * Applying libvirt-4.1.0-do_not_use_sysconf.patch ...
1 out of 2 hunks FAILED -- saving rejects to file src/Makefile.am.rej                                                                                                                                                                                        [ !! ]


It's the very first hunk from app-emulation/libvirt/files/libvirt-4.1.0-do_not_use_sysconf.patch that is failing (removing install-sysconfig and uninstall-sysconfig targets).
Comment 3 Larry the Git Cow gentoo-dev 2018-03-23 14:16:05 UTC
The bug has been closed via the following commit(s):

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

commit 0d514e5fa4b2ce70ed2ed0f156138f042ae9f646
Author:     Michal Prívozník <michal.privoznik@gmail.com>
AuthorDate: 2018-03-23 13:48:18 +0000
Commit:     Matthias Maier <tamiko@gentoo.org>
CommitDate: 2018-03-23 14:15:52 +0000

    app-emulation/libvirt: Update live ebuild, ebuild maintenance
    
    Fixes: https://bugs.gentoo.org/648868
    
    Signed-off-by: Michal Privoznik <michal.privoznik@gmail.com>
    Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
    Signed-off-by: Matthias Maier <tamiko@gentoo.org>

 .../files/libvirt-4.2.0-do_not_use_sysconf.patch   | 196 +++++++++++++++++++++
 app-emulation/libvirt/libvirt-9999.ebuild          |   2 +-
 2 files changed, 197 insertions(+), 1 deletion(-)