Merge branch 'release/v0.9.1'

fafdc14c · Federico Vaga · a3ee514c · dcb2a51c · fafdc14c · fafdc14c
Commit fafdc14c authored Sep 09, 2019 by Federico Vaga
6 changed files
--- a/distribution/.gitignore
+++ b/distribution/.gitignore
+build
--- a/distribution/Makefile
+++ b/distribution/Makefile
+TOP_DIR ?= $(shell pwd)/../
+
+DRIVER_NAME := fmc
+VERSION := $(shell git describe --abbrev=0)
+DIR_NAME := $(DRIVER_NAME)-$(VERSION)
+KEEP_TEMP ?= n
+BUILD ?= $(abspath build)
+BUILD_DKMS := $(BUILD)/dkms
+BUILD_DKMSSOURCE := $(BUILD_DKMS)/source
+BUILD_DKMSTREE := $(BUILD_DKMS)/tree
+
+
+DKMS_OPT := --dkmstree $(BUILD_DKMSTREE) -m $(DRIVER_NAME)/$(VERSION)
+
+all: kernel
+
+kernel: dkms-tar dkms-rpm
+
+dkms-tree:
+	@mkdir -p $(BUILD_DKMSSOURCE)
+	@mkdir -p $(BUILD_DKMSTREE)
+
+dkms-src: dkms-tree
+	$(eval $@_src := $(shell git ls-tree -r --name-only HEAD $(TOP_DIR) | grep -E "drivers|include" | tr '\n' ' '))
+	$(eval $@_dir := $(BUILD_DKMSSOURCE)/$(DRIVER_NAME)-$(VERSION))
+
+	@mkdir -p $($@_dir)/include/linux
+	@cp -a $($@_src) $(TOP_DIR)/distribution/dkms.conf $($@_dir)
+	@mv $($@_dir)/ipmi-fru.h $($@_dir)/fmc.h $($@_dir)/include/linux
+	@cp $(TOP_DIR)/distribution/module-symvers-save $($@_dir)
+	@cp -a $(TOP_DIR)/LICENSES/GPL-2.0.txt $($@_dir)/LICENSE
+	@sed -r -i -e "s/@PKGNAME@/$(DRIVER_NAME)/" $($@_dir)/dkms.conf
+	@sed -r -i -e "s/@PKGVER@/$(VERSION)/" $($@_dir)/dkms.conf
+
+
+dkms-add: dkms-src
+	@dkms add $(DKMS_OPT) --sourcetree $(BUILD_DKMSSOURCE)
+
+dkms-tar: dkms-add
+	@dkms mktarball $(DKMS_OPT) --source-only
+
+dkms-rpm: dkms-add
+	@dkms mkrpm $(DKMS_OPT) --source-only
+
+clean:
+	@rm -rf $(BUILD)
+
+.PHONY: dkmstree dkms-add kernel-dkms-tar
--- a/distribution/dkms.conf
+++ b/distribution/dkms.conf
+PACKAGE_NAME="@PKGNAME@"
+PACKAGE_VERSION="@PKGVER@"
+CLEAN="make KVERSION=$kernelver DKMSTREE=$dkms_tree DKMS=1 clean"
+MAKE[0]="make KVERSION=$kernelver DKMSTREE=$dkms_tree DKMS=1 all"
+BUILT_MODULE_NAME[0]="@PKGNAME@"
+DEST_MODULE_LOCATION[0]="/updates"
+AUTOINSTALL="yes"
+POST_BUILD="module-symvers-save $dkms_tree"
\ No newline at end of file
--- a/distribution/module-symvers-save
+++ b/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
--- a/drivers/fmc/Kbuild
+++ b/drivers/fmc/Kbuild
@@ -11,7 +11,7 @@ endif

 # The library includes <sdb.h>, so point -I directtly there
 # include our header before to avoid conflicts with the kernel
-LINUXINCLUDE :=  -I$(src)/../../include -I$(src)/../../include/linux $(LINUXINCLUDE)
+LINUXINCLUDE := -I$(src)/include -I$(src)/../../include -I$(src)/../../include/linux $(LINUXINCLUDE)

 ccflags-y += -I$(src)/../../include


--- a/drivers/fmc/fmc-compat.h
+++ b/drivers/fmc/fmc-compat.h
@@ -6,13 +6,7 @@
 * Author: Federico Vaga <federico.vaga@vaga.pv.it>
 */
 #include <linux/version.h>
-
-
-#if KERNEL_VERSION(3, 11, 0) <= LINUX_VERSION_CODE
 #include <linux/ipmi-fru.h>
-#else
-#include "ipmi-fru.h"
-#endif

 #if KERNEL_VERSION(3, 11, 0) > LINUX_VERSION_CODE
 #define __ATTR_RW(_name) __ATTR(_name, (S_IWUSR | S_IRUGO),	\