Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 942764 - sys-apps/cpuid-20241023 patch fails
Summary: sys-apps/cpuid-20241023 patch fails
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Conrad Kostecki
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-11-02 15:45 UTC by Michael Cook
Modified: 2024-11-04 23:42 UTC (History)
18 users (show)

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


Attachments
Makefile.rej (Makefile.rej,506 bytes, text/plain)
2024-11-02 23:42 UTC, Gary E. Miller
Details
build log (sys-apps:cpuid-20241023:20241102-233735.log,2.72 KB, text/plain)
2024-11-02 23:43 UTC, Gary E. Miller
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Cook 2024-11-02 15:45:56 UTC
* Applying cpuid-20220620-makefile.patch ...
patching file Makefile
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 41 (offset 1 line).
Hunk #3 succeeded at 62 (offset 6 lines).
1 out of 3 hunks FAILED -- saving rejects to file Makefile.rej

Reproducible: Always
Comment 1 Gary E. Miller 2024-11-02 23:39:56 UTC
#MeToo
Comment 2 Gary E. Miller 2024-11-02 23:42:30 UTC
Created attachment 907739 [details]
Makefile.rej

/var/tmp/portage/sys-apps/cpuid-20241023/work/cpuid-20241023/Makefile.rej
Comment 3 Gary E. Miller 2024-11-02 23:43:43 UTC
Created attachment 907740 [details]
build log

build log
Comment 4 Ștefan Talpalaru 2024-11-04 18:08:20 UTC
A working sys-apps/cpuid-20241023-r1 is available in my overlay: https://github.com/stefantalpalaru/gentoo-overlay
Comment 5 Benjamin Réveillé 2024-11-04 21:51:10 UTC
(In reply to Ștefan Talpalaru from comment #4)
> A working sys-apps/cpuid-20241023-r1 is available in my overlay:
> https://github.com/stefantalpalaru/gentoo-overlay

Worked for me. Thanks !
Comment 6 Larry the Git Cow gentoo-dev 2024-11-04 23:42:00 UTC
The bug has been closed via the following commit(s):

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

commit b67739f35ad1f35569215b985db2161a301be400
Author:     Conrad Kostecki <conikost@gentoo.org>
AuthorDate: 2024-11-04 23:39:30 +0000
Commit:     Conrad Kostecki <conikost@gentoo.org>
CommitDate: 2024-11-04 23:39:30 +0000

    sys-apps/cpuid: fix patch
    
    Closes: https://bugs.gentoo.org/942764
    Signed-off-by: Conrad Kostecki <conikost@gentoo.org>

 sys-apps/cpuid/cpuid-20241023.ebuild               |  2 +-
 sys-apps/cpuid/files/cpuid-20241023-makefile.patch | 38 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)