1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
|
diff -Nur a/dkms.service b/dkms.service
--- a/dkms.service 1970-01-01 01:00:00.000000000 +0100
+++ b/dkms.service 2016-10-23 13:12:58.789994401 +0100
@@ -0,0 +1,11 @@
+[Unit]
+Description=DKMS Autoinstall service
+Before=display-manager.service getty.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/lib/dkms/dkms_autoinstaller start
+
+[Install]
+WantedBy=multi-user.target
diff -Nur a/Makefile b/Makefile
--- a/Makefile 2011-12-07 18:23:51.000000000 +0000
+++ b/Makefile 2016-10-23 13:14:39.627001171 +0100
@@ -13,27 +13,17 @@
ETC = $(DESTDIR)/etc/dkms
VAR = $(DESTDIR)/var/lib/dkms
MAN = $(DESTDIR)/usr/share/man/man8
-INITD = $(DESTDIR)/etc/init.d
-INITD_RH = $(DESTDIR)/etc/rc.d/init.d
LIBDIR = $(DESTDIR)/usr/lib/dkms
BASHDIR = $(DESTDIR)/etc/bash_completion.d
KCONF = $(DESTDIR)/etc/kernel
-SHAREDIR = $(DESTDIR)/usr/share
-DOCDIR = $(SHAREDIR)/doc/dkms
+SYSTEMD_UNITDIR=$(DESTDIR)/usr/lib/systemd/system
#Define the top-level build directory
BUILDDIR := $(shell pwd)
TOPDIR := $(shell pwd)
-.PHONY = tarball
-
-all: clean tarball rpm debs
-
-clean:
- -rm -rf *~ dist/ dkms-freshmeat.txt
-
install:
- mkdir -m 0755 -p $(VAR) $(SBIN) $(MAN) $(ETC) $(BASHDIR) $(SHAREDIR) $(LIBDIR)
+ mkdir -m 0755 -p $(VAR) $(SBIN) $(MAN) $(ETC) $(BASHDIR) $(LIBDIR) $(SYSTEMD_UNITDIR)
sed -e "s/\[INSERT_VERSION_HERE\]/$(RELEASE_VERSION)/" dkms > dkms.versioned
mv -f dkms.versioned dkms
install -p -m 0755 dkms_common.postinst $(LIBDIR)/common.postinst
@@ -42,6 +32,7 @@
install -p -m 0644 dkms_framework.conf $(ETC)/framework.conf
install -p -m 0644 dkms_dbversion $(VAR)
install -p -m 0644 dkms.bash-completion $(BASHDIR)/dkms
+ install -p -m 0644 dkms.service $(SYSTEMD_UNITDIR)
# install compressed manpage with proper timestamp and permissions
gzip -c -9 dkms.8 > $(MAN)/dkms.8.gz
chmod 0644 $(MAN)/dkms.8.gz
@@ -50,90 +41,3 @@
install -p -m 0755 kernel_prerm.d_dkms $(KCONF)/prerm.d/dkms
install -p -m 0755 kernel_postinst.d_dkms $(KCONF)/postinst.d/dkms
-DOCFILES=sample.spec sample.conf AUTHORS COPYING README.dkms sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec
-
-doc-perms:
- # ensure doc file permissions ok
- chmod 0644 $(DOCFILES)
-
-install-redhat: install doc-perms
- mkdir -m 0755 -p $(INITD_RH)
- install -p -m 0755 dkms_mkkerneldoth $(LIBDIR)/mkkerneldoth
- install -p -m 0755 dkms_find-provides $(LIBDIR)/find-provides
- install -p -m 0755 lsb_release $(LIBDIR)/lsb_release
- install -p -m 0644 template-dkms-mkrpm.spec $(ETC)
- install -p -m 0644 template-dkms-redhat-kmod.spec $(ETC)
- install -p -m 0755 dkms_autoinstaller $(INITD_RH)
-
-install-doc:
- mkdir -m 0755 -p $(DOCDIR)
- install -p -m 0644 $(DOCFILES) $(DOCDIR)
-
-install-debian: install install-doc
- mkdir -p -m 0755 $(SHAREDIR)/apport/package-hooks
- install -p -m 0755 dkms_apport.py $(SHAREDIR)/apport/package-hooks/dkms_packages.py
- mkdir -p -m 0755 $(KCONF)/header_postinst.d
- install -p -m 0755 kernel_postinst.d_dkms $(KCONF)/header_postinst.d/dkms
- mkdir -p -m 0755 $(ETC)/template-dkms-mkdeb/debian
- ln -s template-dkms-mkdeb $(ETC)/template-dkms-mkdsc
- install -p -m 0664 template-dkms-mkdeb/Makefile $(ETC)/template-dkms-mkdeb/
- install -p -m 0664 template-dkms-mkdeb/debian/* $(ETC)/template-dkms-mkdeb/debian/
- chmod +x $(ETC)/template-dkms-mkdeb/debian/postinst
- chmod +x $(ETC)/template-dkms-mkdeb/debian/prerm
- chmod +x $(ETC)/template-dkms-mkdeb/debian/rules
- rm $(DOCDIR)/COPYING*
- rm $(DOCDIR)/sample*
-
-deb_destdir=$(BUILDDIR)/dist
-TARBALL=$(deb_destdir)/$(RELEASE_STRING).tar.gz
-tarball: $(TARBALL)
-
-$(TARBALL):
- mkdir -p $(deb_destdir)
- tmp_dir=`mktemp -d --tmpdir dkms.XXXXXXXX` ; \
- cp -a ../$(RELEASE_NAME) $${tmp_dir}/$(RELEASE_STRING) ; \
- sed -e "s/\[INSERT_VERSION_HERE\]/$(RELEASE_VERSION)/" dkms > $${tmp_dir}/$(RELEASE_STRING)/dkms ; \
- sed -e "s/\[INSERT_VERSION_HERE\]/$(RELEASE_VERSION)/" dkms.spec > $${tmp_dir}/$(RELEASE_STRING)/dkms.spec ; \
- find $${tmp_dir}/$(RELEASE_STRING) -depth -name .git -type d -exec rm -rf \{\} \; ; \
- find $${tmp_dir}/$(RELEASE_STRING) -depth -name dist -type d -exec rm -rf \{\} \; ; \
- find $${tmp_dir}/$(RELEASE_STRING) -depth -name \*~ -type f -exec rm -f \{\} \; ; \
- find $${tmp_dir}/$(RELEASE_STRING) -depth -name dkms\*.rpm -type f -exec rm -f \{\} \; ; \
- find $${tmp_dir}/$(RELEASE_STRING) -depth -name dkms\*.tar.gz -type f -exec rm -f \{\} \; ; \
- find $${tmp_dir}/$(RELEASE_STRING) -depth -name dkms-freshmeat.txt -type f -exec rm -f \{\} \; ; \
- rm -rf $${tmp_dir}/$(RELEASE_STRING)/debian ; \
- sync ; sync ; sync ; \
- tar cvzf $(TARBALL) -C $${tmp_dir} $(RELEASE_STRING); \
- rm -rf $${tmp_dir} ;
-
-
-rpm: $(TARBALL) dkms.spec
- tmp_dir=`mktemp -d --tmpdir dkms.XXXXXXXX` ; \
- mkdir -p $${tmp_dir}/{BUILD,RPMS,SRPMS,SPECS,SOURCES} ; \
- cp $(TARBALL) $${tmp_dir}/SOURCES ; \
- sed "s/\[INSERT_VERSION_HERE\]/$(RELEASE_VERSION)/" dkms.spec > $${tmp_dir}/SPECS/dkms.spec ; \
- pushd $${tmp_dir} > /dev/null 2>&1; \
- rpmbuild -ba --define "_topdir $${tmp_dir}" SPECS/dkms.spec ; \
- popd > /dev/null 2>&1; \
- cp $${tmp_dir}/RPMS/noarch/* $${tmp_dir}/SRPMS/* dist ; \
- rm -rf $${tmp_dir}
-
-debmagic: $(TARBALL)
- mkdir -p dist/
- ln -s $(TARBALL) $(DEB_TMP_BUILDDIR)/$(RELEASE_NAME)_$(RELEASE_VERSION).orig.tar.gz
- tar -C $(DEB_TMP_BUILDDIR) -xzf $(TARBALL)
- cp -ar debian $(DEB_TMP_BUILDDIR)/$(RELEASE_STRING)/debian
- chmod +x $(DEB_TMP_BUILDDIR)/$(RELEASE_STRING)/debian/rules
- cd $(DEB_TMP_BUILDDIR)/$(RELEASE_STRING) ; \
- dch -v $(RELEASE_VERSION)-0 "New upstream version, $(RELEASE_VERSION)"; \
- dpkg-buildpackage -D -b -rfakeroot ; \
- dpkg-buildpackage -D -S -sa -rfakeroot ; \
- mv ../$(RELEASE_NAME)_* $(TOPDIR)/dist/ ; \
- cd -
-
-debs:
- tmp_dir=`mktemp -d --tmpdir dkms.XXXXXXXX` ; \
- make debmagic DEB_TMP_BUILDDIR=$${tmp_dir} DIST=$(DIST); \
- rm -rf $${tmp_dir}
-
-fm:
- sed -e "s/\[INSERT_VERSION_HERE\]/$(RELEASE_VERSION)/" dkms-freshmeat.txt.in > dkms-freshmeat.txt
|
