From 2d5180f4ab572c5e9b381e1680835ed579c07039 Mon Sep 17 00:00:00 2001 From: MestreLion Date: Sun, 3 Nov 2019 02:41:39 -0300 Subject: [PATCH 1/2] properly ignore in git files generated and modified by 'make dkms' - Add VERSION to .gitignore - Changes made by make in dkms.conf triggered 'uncommited changes' because being in the repository it is considered by git as a versioned file regardless of .gitignore. So: -- Rename dkms.conf to dkms.conf.am, indicating it is a template and effectively removing dkms.conf from the repository -- Copy dkms.conf.am to dkms.conf during 'make dkms' --- .gitignore | 3 ++- Makefile | 1 + dkms.conf => dkms.conf.am | 0 3 files changed, 3 insertions(+), 1 deletion(-) rename dkms.conf => dkms.conf.am (100%) diff --git a/.gitignore b/.gitignore index f6bc04f..f52bca6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ Module.symvers modules.order .tmp_versions -dkms.conf \ No newline at end of file +dkms.conf +VERSION diff --git a/Makefile b/Makefile index 0c30154..ca77a61 100644 --- a/Makefile +++ b/Makefile @@ -88,6 +88,7 @@ endif depmod -a -F $(SYSTEM_MAP) $(TARGET) dkms: + @cp `pwd`/dkms.conf.am `pwd`/dkms.conf @sed -i -e '/^PACKAGE_VERSION=/ s/=.*/=\"$(DRIVER_VERSION)\"/' dkms.conf @echo "$(DRIVER_VERSION)" >VERSION @mkdir $(DKMS_ROOT_PATH) diff --git a/dkms.conf b/dkms.conf.am similarity index 100% rename from dkms.conf rename to dkms.conf.am From aca60d44fb26420b31a1fa873bd30ff6be3247e2 Mon Sep 17 00:00:00 2001 From: MestreLion Date: Sun, 3 Nov 2019 09:00:23 -0300 Subject: [PATCH 2/2] improve Makefile - Preserve user file ownership when copying the template dkms.conf.am to dkms.conf, as 'make dkms' requires running as root - Clean up generated files VERSION and dkms.conf on 'make dkms_clean' - Remove redundant `pwd`/ from cp calls --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ca77a61..8b76a72 100644 --- a/Makefile +++ b/Makefile @@ -88,14 +88,14 @@ endif depmod -a -F $(SYSTEM_MAP) $(TARGET) dkms: - @cp `pwd`/dkms.conf.am `pwd`/dkms.conf + @cp --preserve dkms.conf.am dkms.conf @sed -i -e '/^PACKAGE_VERSION=/ s/=.*/=\"$(DRIVER_VERSION)\"/' dkms.conf @echo "$(DRIVER_VERSION)" >VERSION @mkdir $(DKMS_ROOT_PATH) - @cp `pwd`/dkms.conf $(DKMS_ROOT_PATH) - @cp `pwd`/VERSION $(DKMS_ROOT_PATH) - @cp `pwd`/Makefile $(DKMS_ROOT_PATH) - @cp `pwd`/asus-wmi-sensors.c $(DKMS_ROOT_PATH) + @cp dkms.conf $(DKMS_ROOT_PATH) + @cp VERSION $(DKMS_ROOT_PATH) + @cp Makefile $(DKMS_ROOT_PATH) + @cp asus-wmi-sensors.c $(DKMS_ROOT_PATH) @dkms add -m $(DRIVER) -v $(DRIVER_VERSION) @dkms build -m $(DRIVER) -v $(DRIVER_VERSION) @dkms install --force -m $(DRIVER) -v $(DRIVER_VERSION) @@ -107,3 +107,4 @@ dkms_clean: fi @dkms remove -m $(DRIVER) -v $(DRIVER_VERSION) --all @rm -rf $(DKMS_ROOT_PATH) + @rm -- VERSION dkms.conf