* [PATCH] kbuild: rpm-pkg: delete firmware_install to fix build error
@ 2017-09-18 9:12 Masahiro Yamada
2017-09-18 9:24 ` Greg K-H
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Masahiro Yamada @ 2017-09-18 9:12 UTC (permalink / raw)
To: linux-kbuild
Cc: Markus Trippelsdorf, Greg K-H, Masahiro Yamada, Michal Marek,
linux-kernel
Commit 5620a0d1aacd ("firmware: delete in-kernel firmware") deleted
in-kernel firmware support, including "make firmware_install".
Since then, "make rpm-pkg" / "make binrpm-pkg" fails to build with
the error:
make[2]: *** No rule to make target `firmware_install'. Stop.
Commit df85b2d767aa ("firmware: Restore support for built-in firmware")
restored the build infrastructure for CONFIG_EXTRA_FIRMWARE, but this
is out of the scope of "make firmware_install". So, the right thing to
do is to kill the use of "make firmware_install".
Fixes: 5620a0d1aacd ("firmware: delete in-kernel firmware")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
scripts/package/mkspec | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index bb43f15..bf3e9ab 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -88,11 +88,8 @@ echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib/modules'
echo "%else"
echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules'
echo "%endif"
-echo 'mkdir -p $RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE"
-echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= mod-fw= modules_install'
-echo 'INSTALL_FW_PATH=$RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE"
-echo 'make INSTALL_FW_PATH=$INSTALL_FW_PATH' firmware_install
+echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= modules_install'
echo "%ifarch ia64"
echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
@@ -119,7 +116,7 @@ if ! $PREBUILT; then
echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/build"
echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/source"
echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"
-echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmlinux* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude=firmware --exclude .config.old --exclude .missing-syscalls.d\""
+echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmlinux* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude .config.old --exclude .missing-syscalls.d\""
echo "tar "'$EXCLUDES'" -cf- . | (cd "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE;tar xvf -)"
echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
@@ -154,7 +151,6 @@ echo '%defattr (-, root, root)'
echo "/lib/modules/$KERNELRELEASE"
echo "%exclude /lib/modules/$KERNELRELEASE/build"
echo "%exclude /lib/modules/$KERNELRELEASE/source"
-echo "/lib/firmware/$KERNELRELEASE"
echo "/boot/*"
echo ""
echo "%files headers"
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] kbuild: rpm-pkg: delete firmware_install to fix build error
2017-09-18 9:12 [PATCH] kbuild: rpm-pkg: delete firmware_install to fix build error Masahiro Yamada
@ 2017-09-18 9:24 ` Greg K-H
2017-09-18 9:24 ` Greg K-H
2017-09-20 15:53 ` Masahiro Yamada
2 siblings, 0 replies; 4+ messages in thread
From: Greg K-H @ 2017-09-18 9:24 UTC (permalink / raw)
To: Masahiro Yamada
Cc: linux-kbuild, Markus Trippelsdorf, Michal Marek, linux-kernel
On Mon, Sep 18, 2017 at 06:12:36PM +0900, Masahiro Yamada wrote:
> Commit 5620a0d1aacd ("firmware: delete in-kernel firmware") deleted
> in-kernel firmware support, including "make firmware_install".
>
> Since then, "make rpm-pkg" / "make binrpm-pkg" fails to build with
> the error:
>
> make[2]: *** No rule to make target `firmware_install'. Stop.
>
> Commit df85b2d767aa ("firmware: Restore support for built-in firmware")
> restored the build infrastructure for CONFIG_EXTRA_FIRMWARE, but this
> is out of the scope of "make firmware_install". So, the right thing to
> do is to kill the use of "make firmware_install".
>
> Fixes: 5620a0d1aacd ("firmware: delete in-kernel firmware")
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> scripts/package/mkspec | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
Nice find, what's the odds the debian package "script" also needs this
fix?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] kbuild: rpm-pkg: delete firmware_install to fix build error
2017-09-18 9:12 [PATCH] kbuild: rpm-pkg: delete firmware_install to fix build error Masahiro Yamada
2017-09-18 9:24 ` Greg K-H
@ 2017-09-18 9:24 ` Greg K-H
2017-09-20 15:53 ` Masahiro Yamada
2 siblings, 0 replies; 4+ messages in thread
From: Greg K-H @ 2017-09-18 9:24 UTC (permalink / raw)
To: Masahiro Yamada
Cc: linux-kbuild, Markus Trippelsdorf, Michal Marek, linux-kernel
On Mon, Sep 18, 2017 at 06:12:36PM +0900, Masahiro Yamada wrote:
> Commit 5620a0d1aacd ("firmware: delete in-kernel firmware") deleted
> in-kernel firmware support, including "make firmware_install".
>
> Since then, "make rpm-pkg" / "make binrpm-pkg" fails to build with
> the error:
>
> make[2]: *** No rule to make target `firmware_install'. Stop.
>
> Commit df85b2d767aa ("firmware: Restore support for built-in firmware")
> restored the build infrastructure for CONFIG_EXTRA_FIRMWARE, but this
> is out of the scope of "make firmware_install". So, the right thing to
> do is to kill the use of "make firmware_install".
>
> Fixes: 5620a0d1aacd ("firmware: delete in-kernel firmware")
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] kbuild: rpm-pkg: delete firmware_install to fix build error
2017-09-18 9:12 [PATCH] kbuild: rpm-pkg: delete firmware_install to fix build error Masahiro Yamada
2017-09-18 9:24 ` Greg K-H
2017-09-18 9:24 ` Greg K-H
@ 2017-09-20 15:53 ` Masahiro Yamada
2 siblings, 0 replies; 4+ messages in thread
From: Masahiro Yamada @ 2017-09-20 15:53 UTC (permalink / raw)
To: Linux Kbuild mailing list
Cc: Markus Trippelsdorf, Greg K-H, Masahiro Yamada, Michal Marek,
Linux Kernel Mailing List
2017-09-18 18:12 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> Commit 5620a0d1aacd ("firmware: delete in-kernel firmware") deleted
> in-kernel firmware support, including "make firmware_install".
>
> Since then, "make rpm-pkg" / "make binrpm-pkg" fails to build with
> the error:
>
> make[2]: *** No rule to make target `firmware_install'. Stop.
>
> Commit df85b2d767aa ("firmware: Restore support for built-in firmware")
> restored the build infrastructure for CONFIG_EXTRA_FIRMWARE, but this
> is out of the scope of "make firmware_install". So, the right thing to
> do is to kill the use of "make firmware_install".
>
> Fixes: 5620a0d1aacd ("firmware: delete in-kernel firmware")
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
Applied to linux-kbuild/fixes.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-09-20 15:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-18 9:12 [PATCH] kbuild: rpm-pkg: delete firmware_install to fix build error Masahiro Yamada
2017-09-18 9:24 ` Greg K-H
2017-09-18 9:24 ` Greg K-H
2017-09-20 15:53 ` Masahiro Yamada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox