| Message ID | b83c94f8a4484928bd45a9b4ed55c6c7d9f2751c.1433628825.git.yann.morin.1998@free.fr |
|---|---|
| State | Changes Requested |
| Headers | show |
Yann, On Sun, 7 Jun 2015 00:20:41 +0200, Yann E. MORIN wrote: > define KTAP_BUILD_CMDS > $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) $(KTAP_FLAGS) ktap > - $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_SRC=$(LINUX_DIR) KVERSION=$(LINUX_VERSION_PROBED) mod > endef > > define KTAP_INSTALL_TARGET_CMDS > $(INSTALL) -D -m755 $(@D)/ktap $(TARGET_DIR)/usr/bin/ktap > - $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_SRC=$(LINUX_DIR) KVERSION=$(LINUX_VERSION_PROBED) modules_install > endef I think you are effectively getting rid of the KERNEL_SRC definition here. Did you test that it was working OK without this variable? Thomas
Thomas, All, On 2015-06-08 23:25 +0200, Thomas Petazzoni spake thusly: > On Sun, 7 Jun 2015 00:20:41 +0200, Yann E. MORIN wrote: > > define KTAP_BUILD_CMDS > > $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) $(KTAP_FLAGS) ktap > > - $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_SRC=$(LINUX_DIR) KVERSION=$(LINUX_VERSION_PROBED) mod > > endef > > > > define KTAP_INSTALL_TARGET_CMDS > > $(INSTALL) -D -m755 $(@D)/ktap $(TARGET_DIR)/usr/bin/ktap > > - $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_SRC=$(LINUX_DIR) KVERSION=$(LINUX_VERSION_PROBED) modules_install > > endef > > I think you are effectively getting rid of the KERNEL_SRC definition > here. Did you test that it was working OK without this variable? Well, it does build a kernel module, yes. Regards, Yann E. MORIN.
Thomas, All, On 2015-06-08 23:31 +0200, Yann E. MORIN spake thusly: > On 2015-06-08 23:25 +0200, Thomas Petazzoni spake thusly: > > On Sun, 7 Jun 2015 00:20:41 +0200, Yann E. MORIN wrote: > > > define KTAP_BUILD_CMDS > > > $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) $(KTAP_FLAGS) ktap > > > - $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_SRC=$(LINUX_DIR) KVERSION=$(LINUX_VERSION_PROBED) mod > > > endef > > > > > > define KTAP_INSTALL_TARGET_CMDS > > > $(INSTALL) -D -m755 $(@D)/ktap $(TARGET_DIR)/usr/bin/ktap > > > - $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_SRC=$(LINUX_DIR) KVERSION=$(LINUX_VERSION_PROBED) modules_install > > > endef > > > > I think you are effectively getting rid of the KERNEL_SRC definition > > here. Did you test that it was working OK without this variable? > > Well, it does build a kernel module, yes. Sorry, I sent too early, forgot to say: KERNEL_SRC is used i ktap's Makefile only to run commands like: $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules So, since that's our infra now doing that, KERNEL_SRC is no longer needed. Regards, Yann E. MORIN.
Dear Yann E. MORIN, On Mon, 8 Jun 2015 23:34:13 +0200, Yann E. MORIN wrote: > Sorry, I sent too early, forgot to say: > > KERNEL_SRC is used i ktap's Makefile only to run commands like: > > $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules > > So, since that's our infra now doing that, KERNEL_SRC is no longer > needed. Ok, makes sense. Might be worth mentioning in the commit log. Thanks! Thomas
diff --git a/package/ktap/ktap.mk b/package/ktap/ktap.mk index 4a0e51c..966b51c 100644 --- a/package/ktap/ktap.mk +++ b/package/ktap/ktap.mk @@ -9,8 +9,6 @@ KTAP_SITE = $(call github,ktap,ktap,$(KTAP_VERSION)) KTAP_LICENSE = GPLv2 KTAP_LICENSE_FILES = LICENSE-GPL -KTAP_DEPENDENCIES = linux - ifeq ($(BR2_PACKAGE_ELFUTILS),y) KTAP_DEPENDENCIES += elfutils else @@ -19,12 +17,13 @@ endif define KTAP_BUILD_CMDS $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) $(KTAP_FLAGS) ktap - $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_SRC=$(LINUX_DIR) KVERSION=$(LINUX_VERSION_PROBED) mod endef define KTAP_INSTALL_TARGET_CMDS $(INSTALL) -D -m755 $(@D)/ktap $(TARGET_DIR)/usr/bin/ktap - $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_SRC=$(LINUX_DIR) KVERSION=$(LINUX_VERSION_PROBED) modules_install endef +KTAP_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) + +$(eval $(kernel-module)) $(eval $(generic-package))
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> --- package/ktap/ktap.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)