diff --git a/.gitignore b/.gitignore index 3e181af..0adeb91 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,8 @@ modules.order Module.symvers Mkfile.old +*.mk + .vscode/ # Packaging diff --git a/Makefile b/Makefile index 69e2631..a91b6bf 100644 --- a/Makefile +++ b/Makefile @@ -31,8 +31,8 @@ install: make -C $(KDIR) M=$(PWD) modules_install # Package version and name from dkms.conf -VER := $(shell sed -n 's/^PACKAGE_VERSION=\([^\n]*\)/\1/p' dkms.conf) -MODULE_NAME := $(shell sed -n 's/^PACKAGE_NAME=\([^\n]*\)/\1/p' dkms.conf) +VER := $(shell sed -n 's/^PACKAGE_VERSION=\([^\n]*\)/\1/p' dkms.conf 2>&1 /dev/null) +MODULE_NAME := $(shell sed -n 's/^PACKAGE_NAME=\([^\n]*\)/\1/p' dkms.conf 2>&1 /dev/null) dkmsinstall: cp -R . /usr/src/$(MODULE_NAME)-$(VER) @@ -99,7 +99,7 @@ package-deb-clean: RPM_PACKAGE_NAME := $(MODULE_NAME)-$(VER) RPM_PACKAGE_SRC := rpm/SOURCES/$(RPM_PACKAGE_NAME) RPM_SPEC := rpm/SPECS/$(MODULE_NAME).spec -RELEASE := 0 +RELEASE := 1 package-rpm: # Create folder source structure according to current version diff --git a/deb/module-name/usr/share/doc/module-name/changelog.gz b/deb/module-name/usr/share/doc/module-name/changelog.gz index 8166d67..124ede6 100644 Binary files a/deb/module-name/usr/share/doc/module-name/changelog.gz and b/deb/module-name/usr/share/doc/module-name/changelog.gz differ diff --git a/dkms.conf b/dkms.conf index 1c4ab76..6312e3f 100644 --- a/dkms.conf +++ b/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME=tuxedo-keyboard -PACKAGE_VERSION=2.0.2 +PACKAGE_VERSION=2.0.3 DEST_MODULE_LOCATION[0]="/kernel/lib/" BUILT_MODULE_NAME[0]="tuxedo_keyboard" diff --git a/src/tuxedo_keyboard.c b/src/tuxedo_keyboard.c index a687910..d8c9175 100644 --- a/src/tuxedo_keyboard.c +++ b/src/tuxedo_keyboard.c @@ -36,7 +36,7 @@ MODULE_AUTHOR("TUXEDO Computers GmbH "); MODULE_DESCRIPTION("TUXEDO Computers Keyboard & Backlight Driver"); MODULE_LICENSE("GPL"); -MODULE_VERSION("2.0.2"); +MODULE_VERSION("2.0.3"); MODULE_ALIAS("wmi:" CLEVO_EVENT_GUID); MODULE_ALIAS("wmi:" CLEVO_GET_GUID); diff --git a/src_pkg/rpm_pkg.spec b/src_pkg/rpm_pkg.spec index 44cb093..5344445 100644 --- a/src_pkg/rpm_pkg.spec +++ b/src_pkg/rpm_pkg.spec @@ -100,6 +100,10 @@ exit 0 %changelog +* Tue May 19 2020 C Sandberg 2.0.3-1 +- General key event mapping support +- Events added for backlight and touchpad +- Fix not removing module on rpm update * Tue Apr 14 2020 C Sandberg 2.0.2-0 - Mark old named packages as conflicting and obsolete - Fix not restoring state on resume