From patchwork Mon Sep 18 09:12:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 112871 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp3179507edb; Mon, 18 Sep 2017 02:44:59 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCQkBF72Z7HlC8YelGrVeBgJryAs/tSpLy5J/BiMI1ryqfUiahZkaU1Cd1SMukzFpCy3PC8 X-Received: by 10.101.72.5 with SMTP id h5mr4780993pgs.305.1505727899486; Mon, 18 Sep 2017 02:44:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505727899; cv=none; d=google.com; s=arc-20160816; b=f/xuXGg36QmgiRjXuP5iAqNd5/IW1iMzlMOk/WBNOkiAqAhz7/B6uWUTJH4He3U+1d +F0SOzRoUOeWOKH3ponrb6rEsMTYZPfrVTV3KsJn2vVJtdnimHurHP09bb8zp6VqRASs S6oznabnZe4iVirOh1TFqqTdvAzv0gpaBLk9VPS+GiUYFiljkIi9OyjjVSYtd07iQTMX mIFkRZ+4MC5E+NicpoB4+0SmwNFwyjcX06E/JFbS0ohBidnJ1T+WVRUCV/AwiFAJ7Es1 hxbqy8fOZnqNJYYkl9oUWdOi1F5kkgy+X6Mu0IIyeCnwuM8z1hvwdGt2xmBdH9n2iFsU 5oTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=O+C0X9NDzK12m3aNIFiVBr8XmksewazCcLUoM0LWyJw=; b=NOxPTHw9R0XI5ITHjVTrajAF/6jrvwyUy2vtJxK9xrdUyS7OM02d0DpVl2hJvljyD2 MLqgICJn+tfieXoJKFHSJj2TNoGIMrN6QD+te8rWeqtDAC6d5l7R3sqvKL+8llSyp/iJ YuqWzRMsi0faY/oEkcMh8kfJWC7AIBjulnkbctShq4cxJSi5eAyue/JaBTkRZZ/hxhlH bctCEPK6rjem7X3nO9ZV9wwQxLkkLMXKUyHCKbyt6hM04lJnZHM6HXiAXvS2Fs3iiIez /AR0gFLknXRmRZXd1V/A7txU3QRoiOGzKfkiKrrVHC3Q4fjle+fjagCXdD8yIE+ll3hQ +rFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=JN154eIR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d8si4217297pfh.163.2017.09.18.02.44.59; Mon, 18 Sep 2017 02:44:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=JN154eIR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754176AbdIRJo4 (ORCPT + 26 others); Mon, 18 Sep 2017 05:44:56 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:20488 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932138AbdIRJN2 (ORCPT ); Mon, 18 Sep 2017 05:13:28 -0400 Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-08.nifty.com with ESMTP id v8I9CeGD006595; Mon, 18 Sep 2017 18:12:41 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v8I9CeGD006595 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1505725961; bh=O+C0X9NDzK12m3aNIFiVBr8XmksewazCcLUoM0LWyJw=; h=From:To:Cc:Subject:Date:From; b=JN154eIRu1XRrkqEZeVrvypqYfWtwedIs7YT7d0+xzJ+sBBdXuIDKWkHfguywg8Rw QTodbzzwVjIF+smvgzUttLuuuWXfObynjk8zDQLQNIS9zKUZAbyOynr/OsobFaLnUC wBmEIf98fc6i8FObzZAD3eq79Nm2PTy9PEsy5XFkf5HTEgjoN8o4kNex2CfkT0rjUs zYeixiiUpilp9kETobppIHwXMy88NLkJWiDScynRq9b8qu526bsNnoFE8y29VpoWWy lsilViF+kNQM0IAH0yWnIfqkj9iKB1MiWR4An7Jx/kqIlURYiZ7YvAToQvrt7yzzsS kPZjqlEWPdwBA== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Markus Trippelsdorf , Greg K-H , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH] kbuild: rpm-pkg: delete firmware_install to fix build error Date: Mon, 18 Sep 2017 18:12:36 +0900 Message-Id: <1505725956-11012-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- scripts/package/mkspec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- 2.7.4 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"