From patchwork Tue Apr 5 13:57:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Arnaud Patard (Rtp)" X-Patchwork-Id: 686791 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p35ETEBG011305 for ; Tue, 5 Apr 2011 14:29:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752611Ab1DEOHg (ORCPT ); Tue, 5 Apr 2011 10:07:36 -0400 Received: from lebrac.rtp-net.org ([88.191.135.105]:47984 "EHLO lebrac.rtp-net.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752571Ab1DEOHf (ORCPT ); Tue, 5 Apr 2011 10:07:35 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 05 Apr 2011 14:29:15 +0000 (UTC) X-Greylist: delayed 434 seconds by postgrey-1.27 at vger.kernel.org; Tue, 05 Apr 2011 10:07:35 EDT Received: by lebrac.rtp-net.org (Postfix, from userid 1000) id A3B1D29262; Tue, 5 Apr 2011 16:00:14 +0200 (CEST) Message-Id: <20110405135751.825663425@rtp-net.org> User-Agent: quilt/0.48-1 Date: Tue, 05 Apr 2011 15:57:45 +0200 From: Arnaud Patard (Rtp) To: linux-kbuild@vger.kernel.org Cc: Michal Marek Subject: [patch 1/1] Fix firmware installation Content-Disposition: inline; filename=toto.patch Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org When installing modules which have their firmware only in firmware/ (no subdirectory), the build fails with: $ make INSTALL_MOD_PATH=/home/rtp/devel/kernel/BUILD/kernel-x86_64/temp-root KERNELRELEASE=2.6.38.2-desktop-2.mga modules_install INSTALL drivers/usb/serial/usbserial.ko INSTALL drivers/usb/serial/whiteheat.ko make[1]: *** No rule to make target `/home/rtp/devel/kernel/BUILD/kernel-x86_64/temp-root/lib/firmware/./', needed by `/home/rtp/devel/kernel/BUILD/kernel-x86_64/temp-root/lib/firmware/whiteheat_loader.fw'. Stop. make: *** [_modinst_post] Error 2 If one is building a kernel with a module like 3c359, which has its firmware in firmware/3com/, the mkdir -p firmware/3com/ will create the firmware/ directory, allowing to install firmwares in firmware/, masking the error. I noticed it while building with make 3.82, so this problem may be related to that. Signed-off-by: Arnaud Patard --- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6.38/scripts/Makefile.fwinst =================================================================== --- linux-2.6.38.orig/scripts/Makefile.fwinst +++ linux-2.6.38/scripts/Makefile.fwinst @@ -27,7 +27,7 @@ endif installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw)) installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all)) -installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/. +installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/./ # Workaround for make < 3.81, where .SECONDEXPANSION doesn't work. PHONY += $(INSTALL_FW_PATH)/$$(%) install-all-dirs