Skip to content

Makefile improvements #594

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Makefile improvements #594

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de9e0c2
Remove verbose commands
albfan Feb 1, 2022
fb1b9be
Uninstall previous module on install
albfan Feb 1, 2022
60f62f5
Split correctly module and version
albfan Feb 1, 2022
846d3d3
silently run dkms status
albfan Feb 1, 2022
36714b9
dkms_reinstall target
albfan Feb 3, 2022
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
13 changes: 8 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,12 @@ depmod_conf_uninstall:
depmod -a

dracut_conf_install:
set -e -x; \
if test -e $(DRACUT_CONF_DIR); then \
install -m 0644 dracut.conf $(DRACUT_CONF); \
dracut --force; \
fi

dracut_conf_uninstall:
set -e -x; \
if test -e $(DRACUT_CONF); then \
rm -v $(DRACUT_CONF); \
dracut --force; \
Expand Down Expand Up @@ -104,13 +102,13 @@ dkms_modules_install: dkms_check
dkms add .
dkms build $(DKMS_MODULES)
dkms install $(DKMS_MODULES)
@! rmmod hid_uclogic
Copy link
Member

Choose a reason for hiding this comment

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

I'm hesitant about loading or unloading modules as part of (un)installation, since we don't really know which version of the module is loaded at that moment. At the very least this should be a part of an uninstall target, but I'd prefer, if you dropped this patch.


dkms_modules_uninstall: dkms_check
set -e -x; \
dkms status $(DKMS_MODULES_NAME) | \
@dkms status $(DKMS_MODULES_NAME) | \
while IFS=':' read -r modules status; do \
echo "$$modules" | { \
IFS=', ' read -r modules_name modules_version \
Copy link
Member

Choose a reason for hiding this comment

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

Thanks! I'm curious, though, where does that change come from? Has dkms status output format changed?

IFS=',/ ' read -r modules_name modules_version \
kernel_version kernel_arch ignore; \
if [ -z "$$kernel_version" ]; then \
dkms remove \
Expand All @@ -128,5 +126,10 @@ dkms_install: dkms_modules_install depmod_conf_install dracut_conf_install udev_

dkms_uninstall: tools_uninstall xorg_conf_uninstall udev_rules_uninstall dracut_conf_uninstall depmod_conf_uninstall dkms_modules_uninstall

enable_debug:
./digimend-debug 1

dkms_reinstall: dkms_uninstall dkms_install enable_debug
Copy link
Member

Choose a reason for hiding this comment

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

Hmm, I assume this would be useful for a development loop, to quickly test your changes. However, enabling debug shouldn't be a part of a general-purpose target. After removing it, its use for debugging becomes superficial, and you can just instead have a compound command in your history to do the same:

make dkms_uninstall dkms_install && digimend-debug 1

All-in-all, I think it's more trouble than it's worth, so could you please drop this patch?


dist:
git archive --format=tar.gz --prefix=$(PACKAGE)/ HEAD > $(PACKAGE).tar.gz