diff --git a/Kbuild b/Kbuild new file mode 100644 index 0000000..d44f743 --- /dev/null +++ b/Kbuild @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +obj-y += src/ diff --git a/Makefile b/Makefile index e151d35..3908fa8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ -obj-m := system76.o +# SPDX-License-Identifier: GPL-2.0-or-later + KERNEL_DIR = /lib/modules/$(shell uname -r)/build all: diff --git a/README.md b/README.md index 2efa364..178760a 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ make # Remove any old instances sudo modprobe -r system76 # Insert the new module -sudo insmod system76.ko +sudo insmod src/system76.ko # View log messages dmesg | grep system76 ``` diff --git a/debian/rules b/debian/rules index bba04bb..4f8927f 100755 --- a/debian/rules +++ b/debian/rules @@ -6,9 +6,9 @@ include /usr/share/dpkg/pkg-info.mk dh $@ --with dkms override_dh_install: - dh_install Makefile *.c usr/src/system76-$(DEB_VERSION_UPSTREAM)/ + dh_install Makefile Kbuild src/Kbuild src/*.c usr/src/system76-$(DEB_VERSION_UPSTREAM)/ override_dh_dkms: dh_dkms -V $(DEB_VERSION_UPSTREAM) -override_dh_auto_configure override_dh_auto_build override_dh_auto_test override_dh_auto_install override_dh_auto_clean: \ No newline at end of file +override_dh_auto_configure override_dh_auto_build override_dh_auto_test override_dh_auto_install override_dh_auto_clean: diff --git a/src/Kbuild b/src/Kbuild new file mode 100644 index 0000000..b426c19 --- /dev/null +++ b/src/Kbuild @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +obj-m += system76.o diff --git a/system76_ap-led.c b/src/ap-led.c similarity index 100% rename from system76_ap-led.c rename to src/ap-led.c diff --git a/system76_hwmon.c b/src/hwmon.c similarity index 100% rename from system76_hwmon.c rename to src/hwmon.c diff --git a/system76_input.c b/src/input.c similarity index 100% rename from system76_input.c rename to src/input.c diff --git a/system76_kb-led.c b/src/kb-led.c similarity index 100% rename from system76_kb-led.c rename to src/kb-led.c diff --git a/system76_nv_hda.c b/src/nv_hda.c similarity index 100% rename from system76_nv_hda.c rename to src/nv_hda.c diff --git a/system76.c b/src/system76.c similarity index 98% rename from system76.c rename to src/system76.c index 15c7526..926f842 100644 --- a/system76.c +++ b/src/system76.c @@ -104,11 +104,11 @@ static int s76_wmbb(u32 method_id, u32 arg, u32 *retval) { return 0; } -#include "system76_ap-led.c" -#include "system76_input.c" -#include "system76_kb-led.c" -#include "system76_hwmon.c" -#include "system76_nv_hda.c" +#include "ap-led.c" +#include "input.c" +#include "kb-led.c" +#include "hwmon.c" +#include "nv_hda.c" #if LINUX_VERSION_CODE >= KERNEL_VERSION(6,12,0) static void s76_wmi_notify(union acpi_object *obj, void *context) {