Skip to content

Check for include/config/auto.conf by default in place of .config #468

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.

Sign up for GitHub

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

Merged
amilonenv merged 1 commit into from
Dec 12, 2024
Merged

Check for include/config/auto.conf by default in place of .config #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions dkms.8.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,20 +304,21 @@ it is assumed to be located in
See below for more information on the format of
.I dkms.conf.
.TP
.B \-\-config <kernel\-.config\-location>
.B \-\-config <kernel\-include/config/auto.conf\-location>
During a
.B build
this option is used to specify an alternate location for the kernel .config
file which was used to compile that kernel. Normally,
this option is used to specify an alternate location for the kernel
.I include/config/auto.conf
configuration file which contains that kernel configuration. Normally,
.B dkms
uses the Red Hat standard location and config filenames located in
.I /usr/src/linux\-<kernel>/configs/.
If the config for the kernel that you
are building a module for is not located here or does not have the expected
name in this location, you will need to tell
is able to derive the location of the configuration file from the filesystem, but if there is a problem
in the detection, you will need to tell
.B dkms
where the necessary .config can be found so that your kernel can be properly
prepared for the module build.
where the necessary
.I include/config/auto.conf file
(or the legacy
.I .config
file) can be found so that your kernel can be properly prepared for the module build.
.TP
.B \-\-archive <tarball\-location>
This option is used during a
Expand Down
8 changes: 6 additions & 2 deletions dkms.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ show_usage()
echo " [options] = [-m module] [-v module-version] [-k kernel-version] [-a arch]"
echo " [-c dkms.conf-location] [-q] [--force] [--force-version-override] [--all]"
echo " [--templatekernel=kernel] [--directive='cli-directive=cli-value']"
echo " [--config=kernel-.config-location] [--archive=tarball-location]"
echo " [--config=kernel-include/config/auto.conf-location] [--archive=tarball-location]"
echo " [--kernelsourcedir=source-location] [--rpm_safe_upgrade]"
echo " [--dkmstree path] [--sourcetree path] [--installtree path]"
echo " [--binaries-only] [--source-only] [--verbose]"
Expand Down Expand Up @@ -336,7 +336,11 @@ set_kernel_source_dir_and_kconfig()
kernel_source_dir="$(_get_kernel_dir "$1")"
fi
if [[ -z "${kconfig_fromcli}" ]]; then
kernel_config="${kernel_source_dir}/.config"
if [[ -e "${kernel_source_dir}/include/config/auto.conf" ]]; then
kernel_config="${kernel_source_dir}/include/config/auto.conf"
else
kernel_config="${kernel_source_dir}/.config"
fi
fi
}

Expand Down