Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel-build.class: Allow usage with module-less kernel configs #32358

Closed
wants to merge 1 commit into from

Conversation

bstaletic
Copy link
Contributor

With CONFIG_MODULES not set to either y or m, kernel-build.eclass runs into two issues:

  1. Modules.symvers does not get generated. doins build/Module.symvers thus fails.
  2. kernel.release exists, but in ${WORKDIR}/build/include/config/kernel.release while kernel-build_src_install() seems to expect to to find it in ${PWD}/include/config

Closes: https://bugs.gentoo.org/904694

@gentoo-bot
Copy link

Pull Request assignment

Submitter: @bstaletic
Areas affected: eclasses
Packages affected: (none)

@gentoo/github

Linked bugs

Bugs linked: 904694

New packages

This Pull Request appears to be introducing new packages only. Due to limited manpower, adding new packages is considered low priority. This does not mean that your Pull Request will not receive any attention, however, it might take quite some time for it to be reviewed. In the meantime, your new ebuild might find a home in the GURU project repository: the ebuild repository maintained collaboratively by Gentoo users. GURU offers your ebuild a place to be reviewed and improved by other Gentoo users, while making it easy for Gentoo users to install it and enjoy the software it adds.

Missing GCO sign-off

Please read the terms of Gentoo Certificate of Origin and acknowledge them by adding a sign-off to all your commits.


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

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added need assignment It was impossible to assign the PR correctly. Please assign it manually. bug linked Bug/Closes found in footer, and cross-linked with the PR. no signoff One or more commits do not indicate GCO sign-off. labels Aug 17, 2023
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-08-17 17:30 UTC
Newest commit scanned: a816473
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/1863dcb831/output.html

Comment on lines 324 to 330
[[ ! -f "${ED}${kernel_dir}/include/config/kernel.release" ]] && cp "${WORKDIR}/build/include/config/kernel.release" "${ED}${kernel_dir}/include/config/"
local relfile=${ED}${kernel_dir}/include/config/kernel.release
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's fine to just change relfile if the other path is fine for both scenarios.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could for this specific case, but if kernel.release is not installed it will cause problems in other places.

I have finally figured out what is going on with kernel.release and was able to avoid this ugly check-and-copy. In short, with modules, kernel.release ends up in modprep directory and is then installed from there. That does not happen without modules.

@bstaletic bstaletic force-pushed the kernel-build-fix branch 2 times, most recently from ab343d6 to 919a738 Compare August 19, 2023 09:26
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-08-19 09:36 UTC
Newest commit scanned: ab343d6
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/34f6b7bec3/output.html

@bstaletic
Copy link
Contributor Author

Missing GCO sign-off

I did add a sign-off to the commit. Is anything else missing?

@mgorny mgorny removed the no signoff One or more commits do not indicate GCO sign-off. label Aug 19, 2023
@mgorny
Copy link
Member

mgorny commented Aug 19, 2023

Missing GCO sign-off

I did add a sign-off to the commit. Is anything else missing?

We need to remove that manually, sorry.

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-08-19 09:51 UTC
Newest commit scanned: 919a738
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/91ce8d759e/output.html

eclass/kernel-build.eclass Outdated Show resolved Hide resolved
With CONFIG_MODULES not set to either y or m, kernel-build.eclass runs
into two issues:

1. Modules.symvers does not get generated. doins build/Module.symvers
   thus fails.
2. kernel.release exists, but in ${WORKDIR}/build/include/config/kernel.release
   while kernel-build_src_install() seems to expect to to find it in ${PWD}/include/config

Closes: https://bugs.gentoo.org/904694
Signed-off-by: Boris Staletic <boris.staletic@protonmail.com>
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-08-20 15:26 UTC
Newest commit scanned: ad14deb
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/8d5429d1c1/output.html

@mgorny
Copy link
Member

mgorny commented Aug 20, 2023

Thanks!

MocioF pushed a commit to MocioF/gentoo that referenced this pull request Aug 23, 2023
With CONFIG_MODULES not set to either y or m, kernel-build.eclass runs
into two issues:

1. Modules.symvers does not get generated. doins build/Module.symvers
   thus fails.
2. kernel.release exists,
   but in ${WORKDIR}/build/include/config/kernel.release
   while kernel-build_src_install() seems to expect to to find it
   in ${PWD}/include/config.

Closes: https://bugs.gentoo.org/904694
Signed-off-by: Boris Staletic <boris.staletic@protonmail.com>
Closes: gentoo#32358
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug linked Bug/Closes found in footer, and cross-linked with the PR. need assignment It was impossible to assign the PR correctly. Please assign it manually.
Projects
None yet
4 participants