From 7b5c2e658f3c35a6378a02736d1057ed1bef464b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Jul 2015 02:21:39 +0200 Subject: [PATCH] package/owl-linux: use kernel-module helper The owl-linux' Makefile is only calling the Linux buildsystem, so switch do using the new kernel-module infra. Get rid of first patch, no longer needed; rename remaining patch. Signed-off-by: "Yann E. MORIN" Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- ...001-fix-CROSS_COMPILE-usage-in-Makefile.patch | 16 ---------------- ....3.x.patch => 0001-fix-for-linux-3.3.x.patch} | 0 package/owl-linux/owl-linux.mk | 11 +---------- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 package/owl-linux/0001-fix-CROSS_COMPILE-usage-in-Makefile.patch rename package/owl-linux/{0002-fix-for-linux-3.3.x.patch => 0001-fix-for-linux-3.3.x.patch} (100%) diff --git a/package/owl-linux/0001-fix-CROSS_COMPILE-usage-in-Makefile.patch b/package/owl-linux/0001-fix-CROSS_COMPILE-usage-in-Makefile.patch deleted file mode 100644 index 14b4631624..0000000000 --- a/package/owl-linux/0001-fix-CROSS_COMPILE-usage-in-Makefile.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix the owl-linux Makefile so that it protects spaces in the CROSS_COMPILE -variable. For example, this variable will contain spaces if ccache is used. - -Signed-off-by: Simon Dawson -diff -Nurp a/Makefile b/Makefile ---- a/Makefile 2012-06-14 10:51:45.000000000 +0100 -+++ b/Makefile 2012-07-20 10:46:41.636752148 +0100 -@@ -35,7 +35,7 @@ else - PWD := $(shell pwd) - - default: -- $(MAKE) -C $(KERNELDIR) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) M=$(PWD) MODE=$(MODE) modules -+ $(MAKE) -C $(KERNELDIR) ARCH=$(ARCH) CROSS_COMPILE="$(CROSS_COMPILE)" M=$(PWD) MODE=$(MODE) modules - - clean: - -rm -f *.o *.mod.c *.ko modules.order Module.symvers diff --git a/package/owl-linux/0002-fix-for-linux-3.3.x.patch b/package/owl-linux/0001-fix-for-linux-3.3.x.patch similarity index 100% rename from package/owl-linux/0002-fix-for-linux-3.3.x.patch rename to package/owl-linux/0001-fix-for-linux-3.3.x.patch diff --git a/package/owl-linux/owl-linux.mk b/package/owl-linux/owl-linux.mk index 371cc02722..1262425249 100644 --- a/package/owl-linux/owl-linux.mk +++ b/package/owl-linux/owl-linux.mk @@ -10,14 +10,5 @@ OWL_LINUX_LICENSE = PROPRIETARY OWL_LINUX_LICENSE_FILES = LICENSE OWL_LINUX_REDISTRIBUTE = NO -OWL_LINUX_DEPENDENCIES = linux - -define OWL_LINUX_BUILD_CMDS - $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNELDIR=$(LINUX_DIR) -endef - -define OWL_LINUX_INSTALL_TARGET_CMDS - $(MAKE) -C $(LINUX_DIR) $(LINUX_MAKE_FLAGS) M="$(@D)" modules_install -endef - +$(eval $(kernel-module)) $(eval $(generic-package)) -- 2.30.2