From patchwork Sat Sep 30 01:10:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 114526 Delivered-To: patch@linaro.org Received: by 10.140.104.133 with SMTP id a5csp1414815qgf; Fri, 29 Sep 2017 18:11:15 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBOAKOOF4dZItzAxgkKOihk9MnBU9MZsSdefBritgG4v52WozMi9w+VOQlen9FOPETsCvr6 X-Received: by 10.98.31.80 with SMTP id f77mr840199pff.7.1506733875859; Fri, 29 Sep 2017 18:11:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506733875; cv=none; d=google.com; s=arc-20160816; b=lRjSp6FQmMi4/uzz741QhtPAUWeZw5jcjqGjUcfhpXKOIc4ZxNJTJNUyRMFyyeG8p0 Z/FzUTVtWP4usa0gevc1r0Z38Z7BJO+tv2tDLmZCMHigDxkRiljSUWqwr4PN0z6i97OD Wxadt+LtLEH+Y/iGpGHAk6Ab0EVGQ5zsyA9ctHM71AjNwvXckd3BLpNKw1pMzQEeROyJ Muer7RiPNtgQlyDLwh5AqhUcSdX7xwDFONa4ftbI89WVkMbObYWoJXgug4FRSJ3JHTf/ aiHMxuIn6y5U+LL+2yBYVBuMmx6qV3xtp17cNIi0FS1uNHtHAePO93x7F9F8TKX0qWOp pUjA== 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=yUREH0llxdcMYM3WOKGZEadE9mMFawhrMvVI5I41wFY=; b=P75G7Ol0RilUDk5XmmmtfrtbgR+6Ehc02k49emFN+8Ip2c4saBknwE+2t+YiVlYk/Q pUSBF5w77QaSyPP9oLpc9HDjI7gXVmB2sPmXS9weZkF619WFNur3CeUhH5w0FrIbD8nI zPxbM7ftYJL6OPzQVe1AMVNwUT5LF8M74la3Kp9JiJ36Qcu6kAbmsG+PANdKDGzmWC1q FW93WRiqWJjMrijL9cIj1sAuW9Txj5wuOHMLzLVsW9XzKyr38yoeo/y/Kzzb6OQ5/igb oW+88Til1x31hbkj14xt+yPzimjxoRCjLpQ2tsxonXIVmVxTDaP8hOL6J751Aw3UOjHS Ms5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=zBNijJ9u; 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 e22si4020075pgn.561.2017.09.29.18.11.15; Fri, 29 Sep 2017 18:11:15 -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=zBNijJ9u; 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 S1752686AbdI3BLN (ORCPT + 26 others); Fri, 29 Sep 2017 21:11:13 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:25324 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752732AbdI3BKf (ORCPT ); Fri, 29 Sep 2017 21:10:35 -0400 Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-07.nifty.com with ESMTP id v8U1AOK5030198; Sat, 30 Sep 2017 10:10:24 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v8U1AOK5030198 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1506733824; bh=yUREH0llxdcMYM3WOKGZEadE9mMFawhrMvVI5I41wFY=; h=From:To:Cc:Subject:Date:From; b=zBNijJ9uZ10k3YP/TCMXI/qUHXAMlwyrC4zh/sy2Nk1HxtnchV3caLzbuoNpITiC3 pJguAtDGJCEihPA7qOTgIaVr/vx272fzxl6m2+TJ20YCbv+Shwww8bLhn0HaBHQoKr qWOSrWiAMyhT1zwjSwsHuFJ/l/5epYdvj/QCD0dLJH3F2PhY/KvSnlpnq+LA7C8xt/ K8eXNjaaB3/tTpYq4oO82jRKg+kyFwWwZoVHOIWMh6+6uMZpz8XtuR3WWZiVlYpR8B oNKRZZDSSPq3PXGLSJghHMOTm7WnDv7A7icGgJvSD4EAhfp8TSHLcFb8DxO8hITsmu qwfNhsWQJjgSQ== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 1/9] kbuild: rpm-pkg: remove ppc64 specific image handling Date: Sat, 30 Sep 2017 10:10:03 +0900 Message-Id: <1506733811-24636-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 This conditional was added by commit 1a0f3d422bb9 ("kbuild: fix make rpm for powerpc"). Its git-log explains the default kernel image is zImage, but obviously the current arch/powerpc/Makefile does not set KBUILD_IMAGE, so the image file is actually vmlinux. Moreover, since commit 09549aa1baa9 ("deb-pkg: Remove the KBUILD_IMAGE workaround"), all architectures are supposed to set the full path to the image in KBUILD_IMAGE. I see no good reason to differentiate ppc64 from others. Rip off the conditional. Signed-off-by: Masahiro Yamada --- scripts/package/mkspec | 5 ----- 1 file changed, 5 deletions(-) -- 2.7.4 diff --git a/scripts/package/mkspec b/scripts/package/mkspec index f47f17a..ef00750 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec @@ -92,13 +92,8 @@ echo "%ifarch ia64" echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE" echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/" echo "%else" -echo "%ifarch ppc64" -echo "cp vmlinux arch/powerpc/boot" -echo "cp arch/powerpc/boot/"'$KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE" -echo "%else" echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE" echo "%endif" -echo "%endif" echo 'make %{?_smp_mflags} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr KBUILD_SRC= headers_install' echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$KERNELRELEASE"