]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
greybus: build: android: replace hard-coded build destination with variable
authorMichael Scott <michael.scott@linaro.org>
Fri, 23 Jan 2015 00:22:20 +0000 (16:22 -0800)
committerGreg Kroah-Hartman <greg@kroah.com>
Fri, 23 Jan 2015 02:18:06 +0000 (10:18 +0800)
Make sure destination for greybus modules is consistent and easier to maintain

Signed-off-by: Michael Scott <michael.scott@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
drivers/staging/greybus/Android.mk

index 924099b42c06adce66b7870151000b83913ba7d6..5d96a24c683881c6ead3853024c83c749189c7af 100644 (file)
@@ -2,13 +2,15 @@
 
 $(PRODUCT_OUT)/ramdisk.img: build-greybus
 
+GREYBUS_MODULE_OUT_PATH := $(PRODUCT_OUT)/root/lib/modules
+
 include $(CLEAR_VARS)
 GREYBUS_SRC_PATH := $(ANDROID_BUILD_TOP)/external/greybus/
 LOCAL_PATH := $(GREYBUS_SRC_PATH)
 LOCAL_SRC_FILES := greybus.ko
 LOCAL_MODULE := $(LOCAL_SRC_FILES)
 LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/root/lib/modules
+LOCAL_MODULE_PATH := $(GREYBUS_MODULE_OUT_PATH)
 $(LOCAL_PATH)/$(LOCAL_SRC_FILES): build-greybus
 include $(BUILD_PREBUILT)
 
@@ -26,5 +28,5 @@ build-greybus: android_kernel
        make clean -C $(GREYBUS_SRC_PATH)
        cd $(GREYBUS_SRC_PATH) &&\
        $(MAKE) -j$(MAKE_JOBS) CROSS_COMPILE=$(KERNEL_TOOLS_PREFIX) $(ARGS)
-       mkdir -p $(PRODUCT_OUT)/root/lib/modules
-       cp $(GREYBUS_SRC_PATH)/greybus.ko $(PRODUCT_OUT)/root/lib/modules
+       mkdir -p $(GREYBUS_MODULE_OUT_PATH)
+       cp $(GREYBUS_SRC_PATH)/greybus.ko $(GREYBUS_MODULE_OUT_PATH)