From patchwork Wed May 9 07:23:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 135208 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp5309792lji; Wed, 9 May 2018 00:26:06 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoaZrtIhMBiWUn36e7vqylc8Qoe3TI7MIJD7FRMy1AZvkmuuoX8oKp55QhlURh+LbJMTR0G X-Received: by 2002:a65:64d0:: with SMTP id t16-v6mr17666739pgv.9.1525850766839; Wed, 09 May 2018 00:26:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525850766; cv=none; d=google.com; s=arc-20160816; b=LDShpcnUN7tbuv9x/0QnfGwy42HW1/DgGYkoJzQbh9hXwN+hy4ZMSKFnSZR1QUv0Om Gf6ahUMxUIU/enaqjIsoPemMzIKevK3TmVH4HycZFvaLlSGbZcMWiGNO1MavG6wXNj9b n/5xldyYZWS/kTxvZPVWS7dOo06Kx36KlZAxntdkFYMjODMqRLEyqUvqrWngLBgpb+Yw IPsU77lB8ebyFdSydbskka9DTjiUAFbvmaD73p2le1MbWmC0zqOBHLsYPlkt760M364G ff+HycsHnujxwWzm66g5x5+eyK5vDyO3q0E+TqWJccYeAlGeqcqDAjFOKfCJpTB48r6O TT6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=NELkMiFmO1gHCrH3vhHu9mDakdpUlm6U7Gv2PhE7ssA=; b=zmyqZitzL+cVRvCUONwxRZCNi5gDyinNlrQssznpSQDRCpeKBg3VNZjmpBzDyCEXdT CnU7JYme04p7qH8Ge6f5VlL+ZwhHa0yFgGhdj0b1pfd6nEHIqTFLZt9wkVax0D3Qj1V9 vs6b/duSuvN438LM0BVqrycTH/NibhSUf1ie57MsdB0M+ztQL+dgeSbBR/NRBz8XTmk4 mBZpfJB2w4kEAhDQWBq/qp6XzSDYdciOdJBh6x1XFy4fHKydbUs9UtD6r0tQFgAvb6Pf QnGQy1KPm3CTkQf5QX/iZdqlOcnRO/HttgaaA3UXq+unlyCxhqjUBHvTIQatbRcRrlDE awRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=uJQGMMz1; 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 i33-v6si17645871pld.546.2018.05.09.00.26.06; Wed, 09 May 2018 00:26:06 -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=uJQGMMz1; 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 S1756138AbeEIHYs (ORCPT + 29 others); Wed, 9 May 2018 03:24:48 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:50568 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753242AbeEIHYq (ORCPT ); Wed, 9 May 2018 03:24:46 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w497O36G028852; Wed, 9 May 2018 16:24:06 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w497O36G028852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1525850646; bh=NELkMiFmO1gHCrH3vhHu9mDakdpUlm6U7Gv2PhE7ssA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uJQGMMz1cXw1fdKGskdZLUIDV793UDrz6i3hfJKY6weVvyqtEcw0UZt9kP6A6dY0U eGLDdBfptCce7Jt61K0QUSTDdcK0/9j67j7bp8uxVzUwrs81CDQZmT4ugmtaUBJncc y7rHLsjRE5toYkErkVbFM/OO151fMimVVM8mMWQDnHZB1UX4MqZXAi3PJiRMsXmJ5U sRjyiYbBed3RTdjHN0MxJdBvPMUdbVD3BO6iSFlGNaYV7+EHU4J0KnhZW+BRshL+BH DZsoRNVwyZJpS+e8XA6/qSZ/2a9gGZVxKgoovoHLHWd70zGKcBbstTpL15pYyDn88C dhfSZkOXfMc/A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Arnd Bergmann , Joe Perches , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 4/8] depmod.sh: remove symbol prefix support Date: Wed, 9 May 2018 16:23:48 +0900 Message-Id: <1525850632-10921-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> References: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX was selected by BLACKFIN, METAG. They were removed by commit 4ba66a976072 ("arch: remove blackfin port"), commit bb6fb6dfcc17 ("metag: Remove arch/metag/"), respectively. No more architecture enables CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX, hence the last argument of scripts/depmod.sh can be removed. Signed-off-by: Masahiro Yamada --- Makefile | 2 +- scripts/depmod.sh | 21 +-------------------- 2 files changed, 2 insertions(+), 21 deletions(-) -- 2.7.4 diff --git a/Makefile b/Makefile index 4cb8531..52ea534 100644 --- a/Makefile +++ b/Makefile @@ -1760,7 +1760,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) # Run depmod only if we have System.map and depmod is executable quiet_cmd_depmod = DEPMOD $(KERNELRELEASE) cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \ - $(KERNELRELEASE) "$(patsubst y,_,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))" + $(KERNELRELEASE) # Create temporary dir for module support files # clean it up only when building all modules diff --git a/scripts/depmod.sh b/scripts/depmod.sh index 9831cca..421d1aa 100755 --- a/scripts/depmod.sh +++ b/scripts/depmod.sh @@ -9,30 +9,11 @@ if test $# -ne 3; then fi DEPMOD=$1 KERNELRELEASE=$2 -SYMBOL_PREFIX=$3 if ! test -r System.map -a -x "$DEPMOD"; then exit 0 fi -# older versions of depmod don't support -P -# support was added in module-init-tools 3.13 -if test -n "$SYMBOL_PREFIX"; then - release=$("$DEPMOD" --version) - package=$(echo "$release" | cut -d' ' -f 1) - if test "$package" = "module-init-tools"; then - version=$(echo "$release" | cut -d' ' -f 2) - later=$(printf '%s\n' "$version" "3.13" | sort -V | tail -n 1) - if test "$later" != "$version"; then - # module-init-tools < 3.13, drop the symbol prefix - SYMBOL_PREFIX="" - fi - fi - if test -n "$SYMBOL_PREFIX"; then - SYMBOL_PREFIX="-P $SYMBOL_PREFIX" - fi -fi - # older versions of depmod require the version string to start with three # numbers, so we cheat with a symlink here depmod_hack_needed=true @@ -55,7 +36,7 @@ set -- -ae -F System.map if test -n "$INSTALL_MOD_PATH"; then set -- "$@" -b "$INSTALL_MOD_PATH" fi -"$DEPMOD" "$@" "$KERNELRELEASE" $SYMBOL_PREFIX +"$DEPMOD" "$@" "$KERNELRELEASE" ret=$? if $depmod_hack_needed; then