Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 715232 - sys-apps/systemd-9999 gentoo-generator-path-r1.patch needs rebased on top of current
Summary: sys-apps/systemd-9999 gentoo-generator-path-r1.patch needs rebased on top of ...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo systemd Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-03-29 08:52 UTC by Duncan
Modified: 2020-05-21 00:24 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 Duncan 2020-03-29 08:52:57 UTC
gentoo-generator-path-r1.patch apparently needs rebased on top of current.

Trying to track down a swap-enabling bug on systemd-245 so tried live-git-9999, with the following error:

>>> Preparing source in /tmp/portage/sys-apps/systemd-9999/work/systemd-9999 ...
* Applying gentoo-Dont-enable-audit-by-default.patch ...                                                                           [ ok ]
* Applying gentoo-systemd-user-pam.patch ...                                                                                       [ ok ]
* Applying gentoo-generator-path-r1.patch ...
patching file src/shared/path-lookup.c
Hunk #1 FAILED at 888.
1 out of 1 hunk FAILED -- saving rejects to file src/shared/path-lookup.c.rej                                                       [ !! ]

FWIW the new context looks like (space-damaged as posted):

        add = strv_new("/run/systemd/system-generators",
                "/etc/systemd/system-generators",
                "/usr/local/lib/systemd/system-generators",
                SYSTEM_GENERATOR_PATH);
        break;

case UNIT_FILE_GLOBAL: