Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 659206 - =app-emulation/libvirt-9999 fails to apply patch
Summary: =app-emulation/libvirt-9999 fails to apply patch
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-06-26 04:59 UTC by Michal Privoznik
Modified: 2018-06-29 04:50 UTC (History)
1 user (show)

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


Attachments
0001-gentoo-do-not-use-sysconf.patch (0001-gentoo-do-not-use-sysconf.patch,7.24 KB, patch)
2018-06-26 04:59 UTC, Michal Privoznik
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Michal Privoznik 2018-06-26 04:59:08 UTC
Created attachment 537264 [details, diff]
0001-gentoo-do-not-use-sysconf.patch

>>> Preparing source in /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999 ...
 * Applying libvirt-4.2.0-do_not_use_sysconf.patch ...
5 out of 5 hunks FAILED -- saving rejects to file src/Makefile.am.rej
1 out of 1 hunk FAILED -- saving rejects to file src/locking/virtlockd.service.in.rej
1 out of 1 hunk FAILED -- saving rejects to file src/logging/virtlogd.service.in.rej
1 out of 1 hunk FAILED -- saving rejects to file src/remote/libvirtd.service.in.rej
3 out of 3 hunks FAILED -- saving rejects to file tools/Makefile.am.rej
1 out of 1 hunk FAILED -- saving rejects to file tools/libvirt-guests.service.in.rej
1 out of 1 hunk FAILED -- saving rejects to file tools/libvirt-guests.sysconf.rej                                                                                                                                                                            [ !! ]


The problem is that libvirt-4.2.0-do_not_use_sysconf.patch does not apply cleanly anymore due to the following libvirt commit:

https://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=91038dfb3b29c3f3e76a36bfb2a0045b57225bd9

Find the rebased gentoo patch in the attachment.
Comment 1 Larry the Git Cow gentoo-dev 2018-06-29 04:50:18 UTC
The bug has been closed via the following commit(s):

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

commit d908013eafa6bc6963020e09a1a1ff97ac1cd705
Author:     Matthias Maier <tamiko@gentoo.org>
AuthorDate: 2018-06-29 04:19:26 +0000
Commit:     Matthias Maier <tamiko@gentoo.org>
CommitDate: 2018-06-29 04:19:26 +0000

    app-emulation/libvirt: update live ebuild
    
    Thanks to Michal Privoznik for the updated patch.
    
    Closes: https://bugs.gentoo.org/659206
    Package-Manager: Portage-2.3.41, Repoman-2.3.9

 ...sconf.patch => libvirt-4.5.0-do_not_use_sysconf.patch} |  0
 app-emulation/libvirt/libvirt-9999.ebuild                 | 15 +++------------
 2 files changed, 3 insertions(+), 12 deletions(-)