Configure kernel consistently with qcom-deb-images - #86
Merged
Christopher Obbard (obbardc) merged 5 commits intoAug 28, 2026
Merged
Conversation
Appending fragments to .config left duplicate and conflicting entries for olddefconfig to resolve silently. Use scripts/kconfig/merge_config.sh -m -r instead, so later fragments properly override earlier ones and any override is reported. Signed-off-by: Christopher Obbard <chris.obbard@oss.qualcomm.com>
prune.config strips options out of the base defconfig, so merging it after qcom.config let it drop options that qcom.config had deliberately enabled. Merge it first instead so that qcom.config wins on any overlap. Signed-off-by: Christopher Obbard <chris.obbard@oss.qualcomm.com>
Update the README to match debian/rules: fragments are merged with scripts/kconfig/merge_config.sh rather than appended to .config, and prune.config is merged before qcom.config. Signed-off-by: Christopher Obbard <chris.obbard@oss.qualcomm.com>
An "intree:" entry names a bare fragment, resolved under arch/arm64/configs/, so nothing outside that one directory can be referenced. The kernel ships useful fragments elsewhere, notably kernel/configs/debug.config. Take the whole path relative to the kernel source root instead, e.g. intree:arch/arm64/configs/qcom_debug.config, and copy the file into debian/config/ under its basename. Every directory in the tree becomes reachable and the entry says exactly which file it activates rather than leaving the directory implicit. Reject an absolute path or one containing "..", so an entry cannot reach outside the source tree, and require the .config suffix that override_dh_auto_configure globs for, so a misnamed fragment fails here instead of being copied in and silently ignored. The existing collision check now also catches two in-tree paths sharing a basename, which the wider namespace makes reachable: arch/arm64/configs/hardening.config and kernel/configs/hardening.config both exist. The old bare form is no longer accepted; it fails with a message showing the path form. ci/build-matrix.json in the CI branch already emits full paths. Signed-off-by: Christopher Obbard <chris.obbard@oss.qualcomm.com>
Follow the resolution change through the places that document the option: the --kernel-config help in prepare-source.sh and build-kernel.sh and the config fragment section of the README. State what the new form buys: any directory in the kernel tree, not just arch/arm64/configs/ and record the constraints a caller can trip over: the required .config suffix, the rejection of absolute and ".." paths and the basename collision that two in-tree paths can now cause. Signed-off-by: Christopher Obbard <chris.obbard@oss.qualcomm.com>
This was referenced Aug 28, 2026
Contributor
|
Reviewed this alongside #83. The diffconfig comparison covers the part I cared about, and I checked separately that One thing: did you generate those |
Contributor
Author
I did a full end-to-end package build and compared the generated config to a similar end-to-end package build from qcom-deb-images :-). |
Bjordis Collaku (bjordiscollaku)
approved these changes
Aug 28, 2026
Christopher Obbard (obbardc)
merged commit Aug 28, 2026
dea363c
into
qcom/debian/latest
3 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Generate the kernel configuration using the same method as
qcom-deb-images.I compared the generated
.configfiles withscripts/diffconfig, there are no functional configuration differences.