From patchwork Tue Nov 3 16:52:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 539549 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 51EB21413CA for ; Wed, 4 Nov 2015 03:52:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B1CE632B92; Tue, 3 Nov 2015 16:52:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CTS2BIm+1vb9; Tue, 3 Nov 2015 16:52:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 8AF2932B7D; Tue, 3 Nov 2015 16:52:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 74F2B1C0FAE for ; Tue, 3 Nov 2015 16:52:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 69EB889C7E for ; Tue, 3 Nov 2015 16:52:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FgWWq1POyUed for ; Tue, 3 Nov 2015 16:52:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by whitealder.osuosl.org (Postfix) with ESMTP id CC32C89D44 for ; Tue, 3 Nov 2015 16:52:32 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 7D10F2C3; Tue, 3 Nov 2015 17:52:32 +0100 (CET) Received: from localhost (nat1.foo.tf [195.154.42.251]) by mail.free-electrons.com (Postfix) with ESMTPSA id AAF5B1F0; Tue, 3 Nov 2015 17:52:14 +0100 (CET) From: Antoine Tenart To: buildroot@busybox.net Date: Tue, 3 Nov 2015 17:52:13 +0100 Message-Id: <1446569533-25368-1-git-send-email-antoine.tenart@free-electrons.com> X-Mailer: git-send-email 2.6.2 Cc: Matthew Starr Subject: [Buildroot] [PATCH] wf111: fix overwriting module files during install X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Matthew Starr When installing the WF111 modules, the module.* files generated during the kernel compilation were overrided. This ended up having the wrong information about the modules compiled in a given image (and only the one about the WF111 module). This could be verified using the "modprobe -l" command, with only the wf111 module showing up. This patch fixes this, by removing the manual copy of the generated files (in WF111_INSTALL_TARGET_CMDS) and by instead using the build command to populate our target directory, containing the module.* files. This way the files are not overrided but instead updated with the additional WF111 informations. Signed-off-by: Antoine Tenart Tested-by: Antoine Tenart --- package/wf111/wf111.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/wf111/wf111.mk b/package/wf111/wf111.mk index 479d665760b1..e63a1d2a19c7 100644 --- a/package/wf111/wf111.mk +++ b/package/wf111/wf111.mk @@ -24,11 +24,7 @@ endif define WF111_BUILD_CMDS $(MAKE) -C $(@D) PWD=$(@D) \ $(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) \ - install_static -endef - -define WF111_INSTALL_TARGET_CMDS - cp -dpfr $(@D)/output/* $(TARGET_DIR) + OUTPUT=$(TARGET_DIR) install_static endef $(eval $(generic-package))