Skip to content

Add eclass/usr-ldscript.eclass to package automation#2373

Merged
krnowak merged 2 commits intomainfrom
krnowak/add-usr-ldscript-eclass-to-pkg-auto
Oct 16, 2024
Merged

Add eclass/usr-ldscript.eclass to package automation#2373
krnowak merged 2 commits intomainfrom
krnowak/add-usr-ldscript-eclass-to-pkg-auto

Conversation

@krnowak
Copy link
Copy Markdown
Member

@krnowak krnowak commented Oct 11, 2024 •
edited
Loading

CI: http://jenkins.infra.kinvolk.io:8080/job/container/job/sdk/1781/cldsv/

--

It couldn't be added before to automation, because the eclass in Gentoo would introduce have unwanted side-effects into our built images. But the Gentoo version of the eclass is essentially a no-op when USE=split-usr is disabled. We have recently moved to use Gentoo profiles that disable USE=split-usr altogether, and with this move, we can now safely put the eclass into automation.

This marks the point where the entirety of the portage-stable is under automation.

Closes flatcar/Flatcar#645.
Closes flatcar/Flatcar#646.

--

  • Inspected CI output for image differences: /boot and /usr size, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc.

@krnowak
eclass/usr-ldscript: Sync with Gentoo
85943f4 
It's from Gentoo commit a7361d2e880798bce305c5085c2f63b5d2c747a6.
@krnowak
.github: Add eclass/usr-ldscript.eclass to automation
66f10fe 
It couldn't be added before to automation, because the eclass in
Gentoo would introduce have unwanted side-effects into our built
images. But the Gentoo version of the eclass is essentially a no-op
when USE=split-usr is disabled. We have recently moved to use Gentoo
profiles that disable USE=split-usr altogether, and with this move, we
can now safely put the eclass into automation.

This marks the point where the entirety of the portage-stable is under
automation.
@krnowak krnowak added the main label Oct 11, 2024
This was referenced Oct 11, 2024
Closed
Closed
@krnowak
Copy link
Copy Markdown
Member Author

krnowak commented Oct 15, 2024

This does not seem to be exactly a no-op change, though. But the changes seem to be minor - previously some packages were installing /usr/lib64/libfoo.so.1.2.3 (being a proper dynamic library), /usr/lib64/libfoo.so.1 (being a symlink to the libfoo.so.1.2.3), and /usr/lib64/libfoo.so (being some linker script). Now /usr/lib64/libfoo.so is also a symlink to libfoo.so.1.2.3 instead.

The linker script was fixing some linking issues that stemmed from the fact that some dynamic libraries were stored in /lib, whereas static libraries - in /usr/lib. This fix is clearly irrelevant, because we only have /usr/lib, and /lib is a symlink to the former. This means that the fix was for profiles that enabled USE=split-usr. We are not using such profiles anymore.

The reason that this change occurred now is because some ebuilds are calling gen_usr_ldscript function (which created those linker scripts, clobbering the libfoo.so -> libfoo.so.1.2.3 symlink) and this PR added the usr-ldscript.eclass which brings in the second definition of the function (and it clobbers the first one), and this function became essentially a no-op because it does an early return if USE=split-usr is disabled. The first definition came from toolchain-funcs.eclass', it's documented as deprecated and doesn't have the shortcut for USE=split-usrbeing disabled. So earlier,gen_usr_ldscriptfromtoolchain-funcs.eclasswas in use and it was generating linker scripts, nowgen_usr_ldscriptfromusr-ldscript.eclass` is in use and it does nothing.

@krnowak krnowak marked this pull request as ready for review October 15, 2024 13:58
@github-actions
Copy link
Copy Markdown

github-actions bot commented Oct 15, 2024 •
edited
Loading

Build action triggered: https://github.com/flatcar/scripts/actions/runs/11347653651

@krnowak krnowak requested a review from a team October 15, 2024 13:58
@krnowak
Copy link
Copy Markdown
Member Author

krnowak commented Oct 15, 2024

CI passed.

@krnowak krnowak merged commit ecd0d40 into main Oct 16, 2024
@krnowak krnowak deleted the krnowak/add-usr-ldscript-eclass-to-pkg-auto branch October 16, 2024 10:37
@github-actions github-actions bot mentioned this pull request Oct 22, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dongsupark dongsupark dongsupark approved these changes

Assignees

No one assigned

Labels

main

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[RFE] Move out customizations out from portage-stable [RFE] Keep packages in portage-stable updated

2 participants

@krnowak @dongsupark