Merge branch 'develop'

distribution/Makefile

@@ -29,21 +29,16 @@ dkms-src: dkms-tree
 	@mkdir -p $($@_dir)/triggers
 
 	@cp $(TOP_DIR)/distribution/dkms.conf $($@_dir)
-	@cp $(TOP_DIR)/drivers/zio/buffers/zio-buf-kmalloc.c $($@_dir)/buffers/
-	@cp $(TOP_DIR)/drivers/zio/triggers/zio-trig-user.c $($@_dir)/triggers/
+	@cp $(TOP_DIR)/distribution/module-symvers-save $($@_dir)
+	@$(MAKE) -C $(TOP_DIR)/drivers/zio/ clean
 	@cp -a $(TOP_DIR)/include $($@_dir)
-	@cp $(TOP_DIR)/drivers/zio/*.[ch] $($@_dir)
-	@cp $(TOP_DIR)/drivers/zio/Makefile $($@_dir)
-	@cp $(TOP_DIR)/drivers/zio/Kbuild $($@_dir)
+	@cp -a $(TOP_DIR)/drivers/zio/* $($@_dir)
 
 	@cp $(TOP_DIR)/LICENSES/GPL-2.0-or-later.txt $($@_dir)/LICENSE
 	@sed -r -i -e "s/^GIT_VERSION\s:=\s.*/GIT_VERSION = $(VERSION)/" $($@_dir)/Makefile
-	@sed -r -i -e "s/^DKMS\s[?]=\s0/DKMS ?= 1/" $($@_dir)/Makefile
-	@sed -r -i -e "s/^obj-[$$][(]CONFIG.*//" $($@_dir)/Kbuild
-	@sed -r -i -e "s/\.\.\/\.\.\/include/include/" $($@_dir)/Kbuild
+	@sed -r -i -e "s/\.\.\/\.\.\/include/include/" $($@_dir)/Kbuild $($@_dir)/devices/Makefile $($@_dir)/buffers/Makefile $($@_dir)/triggers/Makefile
 
-	@sed -r -i -e "s/@PKGNAME@/$(DRIVER_NAME)/" $($@_dir)/dkms.conf
-	@sed -r -i -e "s/@PKGVER@/$(VERSION)/" $($@_dir)/dkms.conf
+	@sed -r -i -e "s/@PKGNAME@/$(DRIVER_NAME)/g" -e "s/@PKGVER@/$(VERSION)/g" $($@_dir)/dkms.conf
 
 
 dkms-add: dkms-src

distribution/dkms.conf

@@ -2,6 +2,21 @@ PACKAGE_NAME="@PKGNAME@"
 PACKAGE_VERSION="@PKGVER@"
 CLEAN="make clean"
 MAKE[0]="make KVERSION=$kernelver all"
+BUILT_MODULE_LOCATION[0]=""
 BUILT_MODULE_NAME[0]="@PKGNAME@"
-DEST_MODULE_LOCATION[0]="/updates"
+DEST_MODULE_LOCATION[0]="/extra"
+
+BUILT_MODULE_LOCATION[1]="buffers"
+BUILT_MODULE_NAME[1]="@PKGNAME@-buf-vmalloc"
+DEST_MODULE_LOCATION[1]="/extra"
+
+BUILT_MODULE_LOCATION[2]="triggers"
+BUILT_MODULE_NAME[2]="@PKGNAME@-trig-timer"
+DEST_MODULE_LOCATION[2]="/extra"
+
+BUILT_MODULE_LOCATION[3]="triggers"
+BUILT_MODULE_NAME[3]="@PKGNAME@-trig-hrt"
+DEST_MODULE_LOCATION[3]="/extra"
+
 AUTOINSTALL="yes"
+POST_BUILD="module-symvers-save $dkms_tree"
\ No newline at end of file

distribution/module-symvers-save

+#!/bin/sh
+
+dkms_tree=$1
+SRC_DIR=$dkms_tree/$module/$module_version/build/
+DST_DIR=$dkms_tree/$module/$module_version/$kernelver/$arch/module/
+
+cp -f ${SRC_DIR}/Module.symvers ${DST_DIR} > /dev/null

drivers/zio/Makefile

@@ -26,5 +26,5 @@ export CONFIG_ZIO_TRIGGERS
 
 all: modules
 
-modules coccicheck modules_install:
+modules coccicheck modules_install clean:
 	$(MAKE) -C $(LINUX) M=$(shell /bin/pwd) $@