diff --git a/README.md b/README.md index b1b51f6..5633890 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ QEMU opens up, and you can run: rmmod hello rmmod hello2 -Each module comes from a C file under `kernel_module/package/kernel_module/src/`. +Each module comes from a C file under `kernel_module/`. `head *.c` for module usage. The Linux kernel version can be found with: @@ -28,6 +28,6 @@ The Linux kernel version can be found with: 1. Examples 1. [Host](host/) 1. Buildroot - 1. [hello](kernel_module/package/kernel_module/src/hello.c) - 1. [hello2](kernel_module/package/kernel_module/src/hello2.c) - 1. [debugfs](kernel_module/package/kernel_module/src/debugfs.c) + 1. [hello](kernel_module/hello.c) + 1. [hello2](kernel_module/hello2.c) + 1. [debugfs](kernel_module/debugfs.c) diff --git a/kernel_module/Config.in b/kernel_module/Config.in index 83e3f89..71a0421 100644 --- a/kernel_module/Config.in +++ b/kernel_module/Config.in @@ -1 +1,5 @@ -source "$BR2_EXTERNAL_KERNEL_MODULE_PATH/package/kernel_module/Config.in" +config BR2_PACKAGE_KERNEL_MODULE + bool "kernel_module" + depends on BR2_LINUX_KERNEL + help + Linux Kernel Module Cheat. diff --git a/kernel_module/package/kernel_module/src/Makefile b/kernel_module/Makefile similarity index 100% rename from kernel_module/package/kernel_module/src/Makefile rename to kernel_module/Makefile diff --git a/kernel_module/package/kernel_module/src/debugfs.c b/kernel_module/debugfs.c similarity index 100% rename from kernel_module/package/kernel_module/src/debugfs.c rename to kernel_module/debugfs.c diff --git a/kernel_module/external.mk b/kernel_module/external.mk index 3841755..a26eb55 100644 --- a/kernel_module/external.mk +++ b/kernel_module/external.mk @@ -1 +1,20 @@ -include $(sort $(wildcard $(BR2_EXTERNAL_KERNEL_MODULE_PATH)/package/*/*.mk)) +################################################################################ +# +# kernel_module +# +################################################################################ + +KERNEL_MODULE_VERSION = 1.0 +KERNEL_MODULE_SITE = $(BR2_EXTERNAL_KERNEL_MODULE_PATH) +KERNEL_MODULE_SITE_METHOD = local + +define KERNEL_MODULE_BUILD_CMDS + $(MAKE) -C '$(@D)' LINUX_DIR='$(LINUX_DIR)' PWD='$(@D)' CC='$(TARGET_CC)' LD='$(TARGET_LD)' +endef + +define KERNEL_MODULE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/*.ko '$(TARGET_DIR)' +endef + +$(eval $(kernel-module)) +$(eval $(generic-package)) diff --git a/kernel_module/package/kernel_module/src/hello.c b/kernel_module/hello.c similarity index 100% rename from kernel_module/package/kernel_module/src/hello.c rename to kernel_module/hello.c diff --git a/kernel_module/package/kernel_module/src/hello2.c b/kernel_module/hello2.c similarity index 100% rename from kernel_module/package/kernel_module/src/hello2.c rename to kernel_module/hello2.c diff --git a/kernel_module/package/kernel_module/Config.in b/kernel_module/package/kernel_module/Config.in deleted file mode 100644 index 825e370..0000000 --- a/kernel_module/package/kernel_module/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_KERNEL_MODULE - bool "kernel_module" - depends on BR2_LINUX_KERNEL - help - Linux Kernel Module Cheat. diff --git a/kernel_module/package/kernel_module/kernel_module.mk b/kernel_module/package/kernel_module/kernel_module.mk deleted file mode 100644 index def28d0..0000000 --- a/kernel_module/package/kernel_module/kernel_module.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# kernel_module -# -################################################################################ - -KERNEL_MODULE_VERSION = 1.0 -KERNEL_MODULE_SITE = $(BR2_EXTERNAL_KERNEL_MODULE_PATH)/package/kernel_module/src -KERNEL_MODULE_SITE_METHOD = local - -define KERNEL_MODULE_BUILD_CMDS - $(MAKE) -C '$(@D)' LINUX_DIR='$(LINUX_DIR)' PWD='$(@D)' CC='$(TARGET_CC)' LD='$(TARGET_LD)' -endef - -define KERNEL_MODULE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/*.ko '$(TARGET_DIR)' -endef - -$(eval $(kernel-module)) -$(eval $(generic-package))