| Summary: | x11-base/x11-drm-99999999: 002_all_misc-makefile-fixes.patch fails to apply | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Jure Repinc <jlp.bugs> |
| Component: | Current packages | Assignee: | Bryan Stine (RETIRED) <battousai> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | kanelxake, oahong, SpOeK, x11-drivers |
| Priority: | High | ||
| Version: | unspecified | ||
| Hardware: | AMD64 | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
| Bug Depends on: | |||
| Bug Blocks: | 259503 | ||
| Attachments: |
002_all_misc-makefile-fixes.patch-22936.out
Various fixes for x11-drm, addition of x11-apps/drm-progs |
||
Created attachment 179078 [details]
002_all_misc-makefile-fixes.patch-22936.out
I think they recently changed their makefile to not build dr[im]stat in the same cases. That probably broke our patch. It seems to work if everything related to dr[im]stat and epatch was removed from ebuild. Reassigning to me for whenever I get overlay access... Feel free to generate a git-formatted patch (commit message etc included) with `git format-patch HEAD^..HEAD` or so and post it here for me to apply. Created attachment 179399 [details, diff]
Various fixes for x11-drm, addition of x11-apps/drm-progs
git formatted patch to x11 overlay.
This patch covers two issues. This bug, as Donnie said, is a result of upstream changes to the linux-core Makefile. The test programs have their own happy home now, so the Makefiles are completely independent. Because of this, it's now possible to build x11-drm without any patches.
Since we don't need patches, I've made the SRC_URI and patch processing conditional on the presence of PATCHVER in the ebuild. No point doing all that stuff (and distributing an empty patchball) if there's nothing there.
I've fixed a minor issue with the MODULESD_... variables, which needed the .${KV_OBJ} stripped off the module names when being eval'ed.
Finally for x11-drm, I've removed the dr[im]stat programs.
Since those programs might be useful, they've been added as a new package, x11-apps/drm-progs (Donnie's awesome package name). This ebuild performs some minor source and autotools modifications to build the programs against the system-provided libdrm (for the most part... dristat is mildly problematic).
Included in this git patch is a live ebuild for drm-progs. It almost certainly makes most sense to package as snapshots, since they don't change much and there is some source modification involved. Distfiles for the package will be almost the same as x11-drm's source tarball, with the *-core directories ripped out, since they aren't needed.
Thanks.
I think Bryan has a good point in his approach. dristat/drmstat may be as intresting for people building modules from the kernel as it is for people building from x11-drm. And building libdrm again just to build dri/drmstat in x11-drm? As I see it either follow Bryans proposal or let libdrm build and install dri/drmstat and let x11-drm only build and install the modules. Oh, and drm-progs should maybe follow libdrm instead of git-snapshots? That patch doesn't work anymore after a recent sync: error: patch failed: x11-base/x11-drm/Manifest:1 error: x11-base/x11-drm/Manifest: patch does not apply error: patch failed: x11-base/x11-drm/x11-drm-99999999.ebuild:28 error: x11-base/x11-drm/x11-drm-99999999.ebuild: patch does not apply *** Bug 254649 has been marked as a duplicate of this bug. *** I've been given access to the overlay now, so I pushed these changes in. Marking as fixed. Thanks. |
When I try to emerge x11-base/x11-drm from x11 overlay It fails with this message: * Applying various patches (bugfixes/updates) ... * 002_all_misc-makefile-fixes.patch ... * Failed Patch: 002_all_misc-makefile-fixes.patch ! * ( /var/tmp/portage/x11-base/x11-drm-99999999/work/patch/002_all_misc-makefile-fixes.patch ) * * Include in your bugreport the contents of: * * /var/tmp/portage/x11-base/x11-drm-99999999/temp/002_all_misc-makefile-fixes.patch-22936.out * * ERROR: x11-base/x11-drm-99999999 failed. * Call stack: * ebuild.sh, line 49: Called src_unpack * environment, line 4048: Called epatch '/var/tmp/portage/x11-base/x11-drm-99999999/work/patch' * environment, line 2053: Called die * The specific snippet of code: * die "Failed Patch: ${patchname}!"; * The die message: * Failed Patch: 002_all_misc-makefile-fixes.patch! Reproducible: Always Steps to Reproduce: