Skip to content

Commit 2952423

Browse files
committed
Move depmod/udev conf reload to respective targets
Move depmod and udev configuration reload to the respective targets for simplicity and to make sure configuration reload happens when it's updated, so the next target gets it.
1 parent a4c257f commit 2952423

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

Makefile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ modules modules_install clean:
2525

2626
depmod_conf_install:
2727
install -D -m 0644 depmod.conf $(DEPMOD_CONF)
28+
depmod -a
2829

2930
depmod_conf_uninstall:
3031
rm -vf $(DEPMOD_CONF)
32+
depmod -a
3133

3234
dracut_conf_install:
3335
set -e -x; \
@@ -49,26 +51,28 @@ xorg_conf_install:
4951
xorg_conf_uninstall:
5052
rm -vf $(XORG_CONF)
5153

52-
udev_rules_install:
54+
udev_rules_install_files:
5355
install -D -m 0755 hid-rebind $(HID_REBIND)
5456
install -D -m 0644 udev.rules $(UDEV_RULES)
5557

56-
udev_rules_uninstall:
58+
udev_rules_install: udev_rules_install_files
59+
udevadm control --reload
60+
61+
udev_rules_uninstall_files:
5762
rm -vf $(UDEV_RULES) $(HID_REBIND)
5863

64+
udev_rules_uninstall: udev_rules_uninstall_files
65+
udevadm control --reload
66+
5967
modules_uninstall:
6068
rm -vf /lib/modules/*/extra/hid-kye.ko \
6169
/lib/modules/*/extra/hid-polostar.ko \
6270
/lib/modules/*/extra/hid-uclogic.ko \
6371
/lib/modules/*/extra/hid-viewsonic.ko
6472

6573
install: modules modules_install depmod_conf_install dracut_conf_install udev_rules_install xorg_conf_install
66-
udevadm control --reload
67-
depmod -a
6874

6975
uninstall: xorg_conf_uninstall udev_rules_uninstall dracut_conf_uninstall depmod_conf_uninstall modules_uninstall
70-
udevadm control --reload
71-
depmod -a
7276

7377
dkms_check:
7478
@if ! which dkms >/dev/null; then \
@@ -114,10 +118,8 @@ dkms_modules_uninstall: dkms_check
114118
done
115119

116120
dkms_install: dkms_modules_install dracut_conf_install udev_rules_install xorg_conf_install
117-
udevadm control --reload
118121

119122
dkms_uninstall: xorg_conf_uninstall udev_rules_uninstall dracut_conf_uninstall dkms_modules_uninstall
120-
udevadm control --reload
121123

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

debian/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ override_dh_auto_build:
3131
override_dh_auto_test:
3232

3333
override_dh_auto_install:
34-
$(MAKE) DESTDIR=$(CURDIR)/debian/digimend-dkms dkms_source_install udev_rules_install xorg_conf_install
34+
$(MAKE) DESTDIR=$(CURDIR)/debian/digimend-dkms dkms_source_install udev_rules_install_files xorg_conf_install
3535

3636
override_dh_dkms:
3737
dh_dkms -p digimend-dkms -V -- dkms.conf

0 commit comments

Comments
 (0)