Use get_libdir() according to the API documentation #13479

XenHat · 2019-10-28T19:00:27Z

ref: https://bugs.gentoo.org/691454

XenHat · 2019-10-28T19:55:14Z

Sorry for the push spam, I'm not used to sign off my commits

Bug: https://bugs.gentoo.org/691454 Signed-off-by: David Turenne <xenhat.hex@gmail.com>

gentoo-bot · 2019-10-28T20:32:15Z

Pull Request assignment

Submitter: @XenHat
Areas affected: ebuilds
Packages affected: sys-boot/refind

sys-boot/refind: @sveyret, @gentoo/proxy-maint

Linked bugs

Bugs linked: 691454

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide

gentoo-repo-qa-bot · 2019-10-28T21:18:42Z

Pull request CI report

Report generated at: 2019-10-28 21:18 UTC
Newest commit scanned: ccc5dd8
Status: ✅ good

No issues found

sveyret · 2019-10-29T06:54:42Z

sys-boot/refind/refind-0.11.4.ebuild

 	# Prepare UDK workspace
 	if ! use gnuefi; then
 		mkdir "${UDK_WORKSPACE}" || die
-		ln -s "${EPREFIX}/usr/lib/udk/"{Mde,IntelFramework}{,Module}Pkg \
+		ln -s "${EPREFIX}${LIB_DIR}/udk/"{Mde,IntelFramework}{,Module}Pkg \


Have you tried compiling rEFInd without the gnuefi flag (this would require a change in Gentoo profile)? Because I'm not sure that UDK installation is already done in the correct library…

I can try it the next time I have some time to work on my laptop.

I will try this now

sveyret · 2019-10-29T07:06:13Z

Thank you for the PR @XenHat.
Sorry, but I am not sure I understood your last comment on the issue. Do you mean that you managed to install rEFInd v0.11.4 without the need to patch it? This would not be so surprising, because a lot of get_libdir() has been added in the compilation process since v0.10.4.
Because I am only proxy maintainer, I will let a real dev from the proxy maint team (@mgorny?) review it.

XenHat · 2019-10-31T21:29:54Z

Thank you for the PR @XenHat.
Sorry, but I am not sure I understood your last comment on the issue. Do you mean that you managed to install rEFInd v0.11.4 without the need to patch it? This would not be so surprising, because a lot of get_libdir() has been added in the compilation process since v0.10.4.
Because I am only proxy maintainer, I will let a real dev from the proxy maint team (@mgorny?) review it.

That is correct. I did these changes before trying to emerge v0.11.4, assuming it would also not emerge. Then my machine broke during a profile upgrade, and after fully re-installing it, it emerged without problems. If the patch is uneccessary, no harm done.

juippis

@sveyret so what do you think? You can approve or disapprove. Have you, as a maintainer, tested that it doesn't break revdeps? I don't see any harm in this, but I'm not familiar with refind. If it needs to be in /usr/lib or not.

juippis · 2019-12-07T13:08:25Z

sys-boot/refind/refind-0.11.4.ebuild

@@ -21,6 +21,7 @@ DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
 DOCS=(README.txt)
 PATCHES=("${FILESDIR}/makefile.patch")
 UDK_WORKSPACE="${T}/udk"
+LIBDIR="/usr/lib"


Hmm, you define this variable, but don't use it anywhere. Does the upstream makefile need it? Why not make this into get_libdir correctly, that should work with 17.1 profiles?

That's a honest tired mistake.

juippis · 2019-12-07T13:08:43Z

sys-boot/refind/refind-0.11.4.ebuild

@@ -49,11 +50,11 @@ src_prepare() {

 	# bug 598647 - PIE not supported
 	sed -e '/^CFLAGS/s:$: -fno-PIE:' -i Make.common || die
-
+	LIB_DIR="$(get_libdir)" || die


get_libdir is a built-in function and doesn't need to die.

That was more to fail if it could not get libdir

sveyret · 2019-12-07T13:20:51Z

@juippis I did not have time to make any test with this patch (and probably won't have time to make any in the coming weeks). But the conclusion of our discussion with @XenHat was that:

some of the changes are suspicious (could break compilation without the gnuefi flag);
the changes are however useless because this release of refind was already modified to use get_libdir where needed.

So I would suggest to close this PR without a merge. @XenHat, do you agree?

XenHat · 2019-12-07T15:48:46Z

I just upgraded my computer and I have more than enough processing power to do some tests. I could do them for you, or we can close this. Either works :)

XenHat · 2019-12-07T19:32:32Z

@juippis @sveyret if you want to provide a list of things to test, I can automate and/or run them manually for you 👍

XenHat · 2019-12-07T23:10:16Z

I could not get portage to compile refind without gnuefi, presumably because I use openRC, not systemd. But so far, it builds and refind-install as well as refind-mkdefault suceeds.

Whether or not those changes are required is still left to debate, but they don't seem to break on OpenRC.

XenHat · 2019-12-07T23:12:09Z

Closing for now, re-open if this needs to be revisited.

gentoo/gentoo#13479

gentoo-bot added assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. no signoff One or more commits do not indicate GCO sign-off. labels Oct 28, 2019

XenHat force-pushed the master branch 2 times, most recently from 2545eee to 6bb386e Compare October 28, 2019 19:54

XenHat force-pushed the master branch from 6bb386e to 61e4e97 Compare October 28, 2019 20:02

Use get_libdir() according to the API documentation

ccc5dd8

Bug: https://bugs.gentoo.org/691454 Signed-off-by: David Turenne <xenhat.hex@gmail.com>

XenHat force-pushed the master branch from 61e4e97 to ccc5dd8 Compare October 28, 2019 20:25

XenHat changed the title ~~Use get_libdir() according to the API documentation~~ Use get_libdir() according to the API documentation [please reassign] Oct 28, 2019

gentoo-bot changed the title ~~Use get_libdir() according to the API documentation [please reassign]~~ Use get_libdir() according to the API documentation Oct 28, 2019

sveyret reviewed Oct 29, 2019

View reviewed changes

juippis reviewed Dec 7, 2019

View reviewed changes

Clean up changes

8df3043

XenHat closed this Dec 7, 2019

XenHat added a commit to XenHat/xenhat-overlay that referenced this pull request Dec 7, 2019

a modified refind ebuild with some more paranoid get_libdir checks. See

3b00f3f

gentoo/gentoo#13479

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use get_libdir() according to the API documentation #13479

Use get_libdir() according to the API documentation #13479

XenHat commented Oct 28, 2019

XenHat commented Oct 28, 2019

gentoo-bot commented Oct 28, 2019

gentoo-repo-qa-bot commented Oct 28, 2019

sveyret Oct 29, 2019

XenHat Oct 31, 2019

XenHat Dec 7, 2019

sveyret commented Oct 29, 2019

XenHat commented Oct 31, 2019

juippis left a comment

juippis Dec 7, 2019

XenHat Dec 7, 2019

juippis Dec 7, 2019

XenHat Dec 7, 2019

sveyret commented Dec 7, 2019

XenHat commented Dec 7, 2019 •

edited

XenHat commented Dec 7, 2019

XenHat commented Dec 7, 2019 •

edited

XenHat commented Dec 7, 2019

Use get_libdir() according to the API documentation #13479

Use get_libdir() according to the API documentation #13479

Conversation

XenHat commented Oct 28, 2019

XenHat commented Oct 28, 2019

gentoo-bot commented Oct 28, 2019

Pull Request assignment

Linked bugs

gentoo-repo-qa-bot commented Oct 28, 2019

Pull request CI report

sveyret Oct 29, 2019

Choose a reason for hiding this comment

XenHat Oct 31, 2019

Choose a reason for hiding this comment

XenHat Dec 7, 2019

Choose a reason for hiding this comment

sveyret commented Oct 29, 2019

XenHat commented Oct 31, 2019

juippis left a comment

Choose a reason for hiding this comment

juippis Dec 7, 2019

Choose a reason for hiding this comment

XenHat Dec 7, 2019

Choose a reason for hiding this comment

juippis Dec 7, 2019

Choose a reason for hiding this comment

XenHat Dec 7, 2019

Choose a reason for hiding this comment

sveyret commented Dec 7, 2019

XenHat commented Dec 7, 2019 • edited

XenHat commented Dec 7, 2019

XenHat commented Dec 7, 2019 • edited

XenHat commented Dec 7, 2019

XenHat commented Dec 7, 2019 •

edited

XenHat commented Dec 7, 2019 •

edited