From: "Maximilian Pasternak" <m.kbuild@bluescreen.de>
To: linux-kbuild@vger.kernel.org
Subject: kernel build issue whith "make tar-pkg" with INSTALL_FW_PATH [patch included]
Date: Tue, 24 May 2011 22:29:35 +0200 (CEST) [thread overview]
Message-ID: <20110524202935.CF171D602BD@dd12738.kasserver.com> (raw)
Hello,
i sent this some time ago to "linux-kernel" but did not get an answer
so i try it again - hopefully this is the right list.
I found "make tar-pkg" with set INSTALL_FW_PATH does not work like expected.
Initial situation:
------------------
building a kernel package with
| make tar-pkg INSTALL_FW_PATH=/somewhere
Expected result:
----------------
* tar-archive including the firmware in folder /somehere
Result:
-------
* tar-archive without firmware
* firmware on hd in folder /somewhere
Reason:
-------
Makefile:
| # Firmware install
| INSTALL_FW_PATH=$(INSTALL_MOD_PATH)/lib/firmware
| export INSTALL FW PATH
...
| firmware_install: FORCE
| @mkdir -p $(objtree)/firmware
| $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware
__fw_install
Here INSTALL_MOD_PATH is not considered but is needed for packageing.
Potential fix:
--------------
--- BEGIN PATCH -------------------------------------------------------
diff -ur linux-2.6.38_orig/Makefile linux-2.6.38/Makefile
--- linux-2.6.38_orig/Makefile 2011-03-13 18:24:19.000000000 +0200
+++ linux-2.6.38/Makefile 2011-03-13 18:31:05.000000000 +0200
@@ -1028,8 +1028,9 @@
#
---------------------------------------------------------------------------
# Firmware install
-INSTALL_FW_PATH=$(INSTALL_MOD_PATH)/lib/firmware
-export INSTALL_FW_PATH
+INSTALL_FW_PATH=/lib/firmware
+INSTALL_FW_TO_PATH=$(INSTALL_MOD_PATH)$(INSTALL_FW_PATH)
+export INSTALL_FW_TO_PATH
PHONY += firmware_install
firmware_install: FORCE
diff -ur linux-2.6.38_orig/scripts/Makefile.fwinst
linux-2.6.38/scripts/Makefile.fwinst
--- linux-2.6.38_orig/scripts/Makefile.fwinst 2011-03-13
18:25:47.000000000 +0200
+++ linux-2.6.38/scripts/Makefile.fwinst 2011-03-13
18:29:38.000000000 +0200
@@ -24,14 +24,14 @@
mod-fw += $(fw-shipped-y)
endif
-installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))
+installed-mod-fw := $(addprefix $(INSTALL_FW_TO_PATH)/,$(mod-fw))
-installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))
-installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.
+installed-fw := $(addprefix $(INSTALL_FW_TO_PATH)/,$(fw-shipped-all))
+installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_TO_PATH)/.
# Workaround for make < 3.81, where .SECONDEXPANSION doesn't work.
-PHONY += $(INSTALL_FW_PATH)/$$(%) install-all-dirs
-$(INSTALL_FW_PATH)/$$(%): install-all-dirs
+PHONY += $(INSTALL_FW_TO_PATH)/$$(%) install-all-dirs
+$(INSTALL_FW_TO_PATH)/$$(%): install-all-dirs
@true
install-all-dirs: $(installed-fw-dirs)
@true
@@ -42,7 +42,7 @@
$(installed-fw-dirs):
$(call cmd,mkdir)
-$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% |
$(INSTALL_FW_PATH)/$$(dir %)
+$(installed-fw): $(INSTALL_FW_TO_PATH)/%: $(obj)/% |
$(INSTALL_FW_TO_PATH)/$$(dir %)
$(call cmd,install)
PHONY += __fw_install __fw_modinst FORCE
--- END PATCH ---------------------------------------------------------
Thank you
Maximilian
next reply other threads:[~2011-05-24 20:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-24 20:29 Maximilian Pasternak [this message]
2011-05-25 12:30 ` kernel build issue whith "make tar-pkg" with INSTALL_FW_PATH [patch included] Michal Marek
2011-05-25 12:33 ` Michal Marek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110524202935.CF171D602BD@dd12738.kasserver.com \
--to=m.kbuild@bluescreen.de \
--cc=linux-kbuild@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.