add BUILD_EXCLUSIVE_CONFIG #269

anbe42 · 2022-10-26T12:31:32Z

support build exclusion depending on kernel features being present/absent, e.g. BUILD_EXCLUSIVE_CONFIG="CONFIG_FOO !CONFIG_BAR"

dkms.8.in

dkms.in

evelikov · 2022-10-26T13:54:31Z

With the few things it's be perfect. Please double-check with other Debian/Ubuntu patches and send them all upstream.

Thanks in advance o/

dkms.in

evelikov · 2022-10-27T11:53:12Z

dkms.in

@@ -1670,7 +1670,7 @@ do_status_weak()
 # interested in, but that the DKMS internals do not usually care about.
 module_status_built_extra() (
    set_module_suffix "$3"
-    read_conf "$3" "$4" "$dkms_tree/$1/$2/source/dkms.conf"
+    read_conf "$3" "$4" "$dkms_tree/$1/$2/source/dkms.conf" 2>/dev/null


Why are we masking only this one and not the other dozen+ instances of read_conf/read_conf_or_die?

dkms.in

evelikov · 2022-10-27T12:43:08Z

@anbe42 the Ubuntu tests are failing - it seems like the "update-secureboot-policy" change is causing some additional changes/output. Can you fix those up?

With that we should be good to land.

xuzhen · 2022-10-27T12:52:12Z

If we enroll the created key on Ubuntu, why we not do the same on other distributions?
And there is no need to enroll the key on computers that do not have SecureBoot enabled.

anbe42 · 2023-04-03T12:30:31Z

rebased onto additional fixes arising from discussion on the recently merged PRs, now all green ;-)

anbe42 · 2023-04-03T12:32:48Z

with that merged, all my open bugs and PRs should be addressed and most Debian issues should be resolved and upstreamed ;-)

run_test.sh

dkms.in

there is no point in special casing a mismatching return code of 0

the bash idiom <(foo) relies on the /dev/fd -> /proc/self/fd symlink if /proc is not mounted, dkms status (and other actions) may fail with /usr/sbin/dkms: line ####: /dev/fd/##: No such file or directory https://bugs.debian.org/810665

…derr" This reverts commit 288f580.

skip building the module if kernelver does not satisfy BUILD_EXCLUSIVE_KERNEL_MIN <= kernelver <= BUILD_EXCLUSIVE_KERNEL_MAX Closes dell#300

support build exclusion depending on kernel features being present/absent, e.g. BUILD_EXCLUSIVE_CONFIG="CONFIG_FOO !CONFIG_BAR" Closes dell#219

this is a purely cosmetic change to get a "natural" processing order in case multiple kernels versions are installed, e.g. 4.1 < 4.2 < 4.10 < 5.0 instead of alphanumeric order, e.g. 4.1 < 4.10 < 4.2 < 5.0

evelikov · 2023-04-06T14:47:19Z

Fixing shellcheck warnings/issues gets a huge 💯 👍 from me. Although let's keep those a separate follow-up PR.

It's very easy to follow the suggestions and break thing in unexpected ways - it has happened (both to me and friends) a number of times.

With the shellcheck commit dropped, this is ready to merge.

anbe42 · 2023-04-07T13:03:03Z

I've split the fixes for obvious errors from the shellcheck commit into separate verbose commits and left the quoting style changes for later.

dkms.in

dkms_autoinstaller

SC2070 (error): -n doesn't work with unquoted arguments. Quote or use [[ ]].

SC2157 (error): Argument to implicit -n is always true due to literal strings.

SC2071 (error): > is for string comparisons. Use -gt instead.

this is used in multiple case "$running_distribution" in ... statements that are independent of $addon_modules_dir

evelikov · 2023-04-20T08:16:44Z

dkms.in

@@ -2361,7 +2362,6 @@ rm -f "$tmpfile"
 # These can come from the environment or the config file
 [[ ! ${ADDON_MODULES_DIR} && -e /etc/sysconfig/module-init-tools ]] && . /etc/sysconfig/module-init-tools
 addon_modules_dir="${ADDON_MODULES_DIR}"
-[[ ! ${addon_modules_dir} ]] && running_distribution="$(distro_version)"


This looks right, but has a high risk of causing regressions. Let's merge it here and it can be reverted independently if needed.

anbe42 · 2023-04-24T10:52:54Z

With all my patches merged, what do are your plans for making a new release?

evelikov · 2023-04-27T14:29:53Z

No objections on my end although I have no idea what to do 😅

@scaronni can you share some pointers - be that here or throw them in a RELEASE.md file within git? Thanks o/

scaronni · 2023-04-27T15:02:24Z

Well, there is no rule, I got the repository as is 😄

I'll make a release now, but in general just bump the release in the Makefile and make a release whenever you think it's a good moment. I'm open for improvements!

Since version 3.0.11 <dell/dkms#269>, dkms supports the [`BUILD_EXCLUSIVE_CONFIG`] option in dkms.conf to specify kernel configuration options which must be enabled in the targeted kernel. Add this option with `CONFIG_HID`, `CONFIG_INPUT_FF_MEMLESS`, and `CONFIG_POWER_SUPPLY`, since xpadneo will fail to modpost if any of these are disabled. If a user installs a kernel where these options are disabled, the module will not be built and a warning similar to the following is printed: Warning: The /var/lib/dkms/hid-xpadneo/v0.9-144-g9b3b696-dirty/6.8.0-rc2/x86_64/dkms.conf for module hid-xpadneo includes a BUILD_EXCLUSIVE directive which does not match this kernel/arch/config. This indicates that it should not be built. dkms autoinstall on 6.8.0-rc2/x86_64 was skipped for hid-xpadneo Without this option, the module build would fail and the kernel package would fail to install, leaving the user with a partially installed kernel package (on Debian, at least). [`BUILD_EXCLUSIVE_CONFIG`]: https://manpages.debian.org/unstable/dkms/dkms.8.en.html#BUILD_EXCLUSIVE_CONFIG= Signed-off-by: Kevin Locke <kevin@kevinlocke.name>

Since version 3.0.11 <dell/dkms#269>, dkms supports the [`BUILD_EXCLUSIVE_CONFIG`] option in dkms.conf to specify kernel configuration options which must be enabled in the targeted kernel. Add this option with `CONFIG_HID`, `CONFIG_INPUT_FF_MEMLESS`, and `CONFIG_POWER_SUPPLY`, since xpadneo will fail to modpost if any of these are disabled. If a user installs a kernel where these options are disabled, the module will not be built and a warning similar to the following is printed: Warning: The /var/lib/dkms/hid-xpadneo/v0.9-144-g9b3b696-dirty/6.8.0-rc2/x86_64/dkms.conf for module hid-xpadneo includes a BUILD_EXCLUSIVE directive which does not match this kernel/arch/config. This indicates that it should not be built. dkms autoinstall on 6.8.0-rc2/x86_64 was skipped for hid-xpadneo Without this option, the module build would fail and the kernel package would fail to install, leaving the user with a partially installed kernel package (on Debian, at least). [`BUILD_EXCLUSIVE_CONFIG`]: https://github.com/dell/dkms/blob/782bd07641b957012f9b8d621bf9b51f82bfc728/dkms.8.in#L688-L696 Signed-off-by: Kevin Locke <kevin@kevinlocke.name>

anbe42 mentioned this pull request Oct 26, 2022

Skip building modules for incompatible kernel configs #219

Closed

evelikov reviewed Oct 26, 2022

View reviewed changes

dkms.8.in Show resolved Hide resolved

evelikov reviewed Oct 26, 2022

View reviewed changes

dkms.8.in Show resolved Hide resolved

evelikov reviewed Oct 26, 2022

View reviewed changes

dkms.in Show resolved Hide resolved

evelikov mentioned this pull request Oct 26, 2022

sha512 signed modules not works #266

Closed

anbe42 force-pushed the BUILD_EXCLUSIVE_CONFIG branch from 2b5d819 to 4bc767f Compare October 27, 2022 06:18

xuzhen mentioned this pull request Oct 27, 2022

Fix --config option #272

Merged

evelikov reviewed Oct 27, 2022

View reviewed changes

dkms.in Outdated Show resolved Hide resolved

evelikov reviewed Oct 27, 2022

View reviewed changes

dkms.in Outdated Show resolved Hide resolved

evelikov reviewed Oct 27, 2022

View reviewed changes

dkms.in Outdated Show resolved Hide resolved

anbe42 force-pushed the BUILD_EXCLUSIVE_CONFIG branch from 308abc7 to 10209c7 Compare October 27, 2022 12:00

anbe42 force-pushed the BUILD_EXCLUSIVE_CONFIG branch 2 times, most recently from bd51788 to a205e55 Compare March 23, 2023 13:59

whitespace cleanup

fbf76c1

anbe42 force-pushed the BUILD_EXCLUSIVE_CONFIG branch from a205e55 to d67671c Compare April 3, 2023 12:11

evelikov reviewed Apr 4, 2023

View reviewed changes

run_test.sh Show resolved Hide resolved

evelikov reviewed Apr 4, 2023

View reviewed changes

run_test.sh Outdated Show resolved Hide resolved

evelikov reviewed Apr 4, 2023

View reviewed changes

dkms.in Show resolved Hide resolved

evelikov mentioned this pull request Apr 4, 2023

Add tests for the interaction between BUILD_EXCLUSIVE options #327

Open

evelikov reviewed Apr 4, 2023

View reviewed changes

dkms.in Outdated Show resolved Hide resolved

anbe42 force-pushed the BUILD_EXCLUSIVE_CONFIG branch from d67671c to 8cd309f Compare April 6, 2023 12:25

anbe42 added 3 commits April 6, 2023 14:27

run_test: simplify run_with_expected_error()

2713e37

there is no point in special casing a mismatching return code of 0

run_test: make run_with_expected_output() a special case of ..._error()

b42a071

print a warning if /proc is not mounted

51bbb1f

the bash idiom <(foo) relies on the /dev/fd -> /proc/self/fd symlink if /proc is not mounted, dkms status (and other actions) may fail with /usr/sbin/dkms: line ####: /dev/fd/##: No such file or directory https://bugs.debian.org/810665

anbe42 added 5 commits April 6, 2023 14:30

Revert "run_test: reorder expected output to be stdout followed by st…

3273d12

…derr" This reverts commit 288f580.

run_test: interleave stdout with stderr in expected output, again

2de90c7

add BUILD_EXCLUSIVE_KERNEL_MIN/MAX

7af1944

skip building the module if kernelver does not satisfy BUILD_EXCLUSIVE_KERNEL_MIN <= kernelver <= BUILD_EXCLUSIVE_KERNEL_MAX Closes dell#300

add BUILD_EXCLUSIVE_CONFIG

6f41c13

support build exclusion depending on kernel features being present/absent, e.g. BUILD_EXCLUSIVE_CONFIG="CONFIG_FOO !CONFIG_BAR" Closes dell#219

sort kernel lists by version

ff1f5ed

this is a purely cosmetic change to get a "natural" processing order in case multiple kernels versions are installed, e.g. 4.1 < 4.2 < 4.10 < 5.0 instead of alphanumeric order, e.g. 4.1 < 4.10 < 4.2 < 5.0

anbe42 force-pushed the BUILD_EXCLUSIVE_CONFIG branch from 8cd309f to 40e0d85 Compare April 6, 2023 12:31

dkms_find-provides is a bash script

fdc44a1

anbe42 force-pushed the BUILD_EXCLUSIVE_CONFIG branch from 40e0d85 to 4f4d7d9 Compare April 7, 2023 12:54

evelikov reviewed Apr 19, 2023

View reviewed changes

dkms.in Show resolved Hide resolved

evelikov reviewed Apr 19, 2023

View reviewed changes

dkms_autoinstaller Show resolved Hide resolved

anbe42 added 4 commits April 19, 2023 14:23

dkms: always quote $arg in [ -n "$arg" ] (SC2070)

056f606

SC2070 (error): -n doesn't work with unquoted arguments. Quote or use [[ ]].

dkms: fix test for mktarball generated tarball (SC2157)

b8142ea

SC2157 (error): Argument to implicit -n is always true due to literal strings.

dkms: fix wrong comparison operators (SC2071)

2842261

SC2071 (error): > is for string comparisons. Use -gt instead.

dkms_autoinstaller: remove bashism from posix sh script

a2f3983

anbe42 force-pushed the BUILD_EXCLUSIVE_CONFIG branch from 4f4d7d9 to a2f3983 Compare April 19, 2023 12:29

dkms: unconditionally set $running_distribution

019ced2

this is used in multiple case "$running_distribution" in ... statements that are independent of $addon_modules_dir

evelikov reviewed Apr 20, 2023

View reviewed changes

evelikov merged commit 8606438 into dell:master Apr 20, 2023

anbe42 deleted the BUILD_EXCLUSIVE_CONFIG branch April 24, 2023 10:50

kevinoid mentioned this pull request Jan 29, 2024

Add BUILD_EXCLUSIVE_CONFIG to dkms.conf atar-axis/xpadneo#456

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add BUILD_EXCLUSIVE_CONFIG #269

add BUILD_EXCLUSIVE_CONFIG #269

anbe42 commented Oct 26, 2022

evelikov commented Oct 26, 2022

evelikov Oct 27, 2022

evelikov commented Oct 27, 2022

xuzhen commented Oct 27, 2022 •

edited

Loading

anbe42 commented Apr 3, 2023

anbe42 commented Apr 3, 2023

evelikov commented Apr 6, 2023

anbe42 commented Apr 7, 2023

evelikov Apr 20, 2023

anbe42 commented Apr 24, 2023

evelikov commented Apr 27, 2023

scaronni commented Apr 27, 2023

add BUILD_EXCLUSIVE_CONFIG #269

add BUILD_EXCLUSIVE_CONFIG #269

Conversation

anbe42 commented Oct 26, 2022

evelikov commented Oct 26, 2022

evelikov Oct 27, 2022

Choose a reason for hiding this comment

evelikov commented Oct 27, 2022

xuzhen commented Oct 27, 2022 • edited Loading

anbe42 commented Apr 3, 2023

anbe42 commented Apr 3, 2023

evelikov commented Apr 6, 2023

anbe42 commented Apr 7, 2023

evelikov Apr 20, 2023

Choose a reason for hiding this comment

anbe42 commented Apr 24, 2023

evelikov commented Apr 27, 2023

scaronni commented Apr 27, 2023

xuzhen commented Oct 27, 2022 •

edited

Loading