Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp2083427ybp; Thu, 10 Oct 2019 01:54:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqzofDZwX8PO/ZT2wvknXE+FMhIIkawWUE+jMna1i7j9FhTF7pSLUvmN6mCSHHNDdEmDiXCW X-Received: by 2002:a17:906:1f44:: with SMTP id d4mr6894917ejk.16.1570697646747; Thu, 10 Oct 2019 01:54:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570697646; cv=none; d=google.com; s=arc-20160816; b=AQt4yN/1f05CURsayzpJDYH8PxgQTQSr9leir6KCY7HwvS5DpUweJX1mIURnXVPRK7 OoQlueAqwZZRqHo7BArwlaSQikliNcYAzIGwIo7eVO1x2M2XPL5tsbDTIDJpR8pumV5y y/3JL1r3hdJCnc2U5kH3n5ZGICcvqObB6L2mK2gnvm/dM/MZmDsEojr6HxN61fDZSrji Gv6HtHDygztLc3hYhL3RJWlUSvmmwZlYQo1CQ1fSoj208HSnluOYPZaFPpaytie+1vxJ 78ns49ui9GVbxv/Q1iqU6OrZ2MWy8Zn8UjnDTXeyq49LKdE7ffWpEo4sGJtWDsXPn1GE 4Pbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=F/R6IlwpCRKr4emteZPIQBjLXtrkSp0aYN0uY3694zA=; b=e4yfGjTBm1hCWlsjJX3Q3+sFJVKqQ46Vf7eyGrnHFGQCFe4AQhdZOi00ZOa++zPJJp R9HDmFyVonsz5ImNfyDJzWbm/rT7DY8uplYGQQbAILTvitLXGeicxYPI/000QbrKyk3v yvKdizYyuKHt018KV4pGgiW6/n4A3S6jc4R2fG+B6JPBiSbE51um4+4WV4TCv2bhfOXR UGnLtKBAXn/uMpeYK++ry23D9nMoWq8UueYVDg1fVZSBIre/T1wTQulBD2m6LWXL9Do5 wN0m93Brz887csjmbJwYjB+Qx3lrPyKJRQjTEB5h1rCDBam1fWUxEZ4QFoLmf331Y0TF 7BCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="ihuO3A/v"; 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 k23si885587ejc.51.2019.10.10.01.53.43; Thu, 10 Oct 2019 01:54: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=@kernel.org header.s=default header.b="ihuO3A/v"; 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 S2389285AbfJJIv1 (ORCPT + 99 others); Thu, 10 Oct 2019 04:51:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:58700 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390094AbfJJIvS (ORCPT ); Thu, 10 Oct 2019 04:51:18 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5317A2064A; Thu, 10 Oct 2019 08:51:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570697476; bh=6FO32yOtCVloDZBsqif4npnbRKdAuNoJFjki84pFNh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ihuO3A/v6Cur8uJYqkutcuP3gK9mcqQxsdFh6ot4ZQ7Fv/u5ZsuyEMlvUtSR4TDB3 +q8PfCDNM75f87JMkkJHaXSMyq+sDjSvQc1quAGVHEKn4Bi2ziEgtE1uPUm7RH0RNk 7XmcNRWqBtqJuYUZSvc+ardoAigArowahaMMDWfE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andreas Krebbel , Thomas Richter , Arnaldo Carvalho de Melo , Heiko Carstens , Hendrik Brueckner , Vasily Gorbik , Sasha Levin Subject: [PATCH 4.14 42/61] perf build: Add detection of java-11-openjdk-devel package Date: Thu, 10 Oct 2019 10:37:07 +0200 Message-Id: <20191010083516.751061291@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191010083449.500442342@linuxfoundation.org> References: <20191010083449.500442342@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Richter [ Upstream commit 815c1560bf8fd522b8d93a1d727868b910c1cc24 ] With Java 11 there is no seperate JRE anymore. Details: https://coderanch.com/t/701603/java/JRE-JDK Therefore the detection of the JRE needs to be adapted. This change works for s390 and x86. I have not tested other platforms. Committer testing: Continues to work with the OpenJDK 8: $ rm -f ~acme/lib64/libperf-jvmti.so $ rpm -qa | grep jdk-devel java-1.8.0-openjdk-devel-1.8.0.222.b10-0.fc30.x86_64 $ git log --oneline -1 a51937170f33 (HEAD -> perf/core) perf build: Add detection of java-11-openjdk-devel package $ rm -rf /tmp/build/perf ; mkdir -p /tmp/build/perf ; make -C tools/perf O=/tmp/build/perf install > /dev/null 2>1 $ ls -la ~acme/lib64/libperf-jvmti.so -rwxr-xr-x. 1 acme acme 230744 Sep 24 16:46 /home/acme/lib64/libperf-jvmti.so $ Suggested-by: Andreas Krebbel Signed-off-by: Thomas Richter Tested-by: Arnaldo Carvalho de Melo Cc: Heiko Carstens Cc: Hendrik Brueckner Cc: Vasily Gorbik Link: http://lore.kernel.org/lkml/20190909114116.50469-4-tmricht@linux.ibm.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/Makefile.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index f362ee46506ad..b97e31498ff76 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -795,7 +795,7 @@ ifndef NO_JVMTI JDIR=$(shell /usr/sbin/update-java-alternatives -l | head -1 | awk '{print $$3}') else ifneq (,$(wildcard /usr/sbin/alternatives)) - JDIR=$(shell /usr/sbin/alternatives --display java | tail -1 | cut -d' ' -f 5 | sed 's%/jre/bin/java.%%g') + JDIR=$(shell /usr/sbin/alternatives --display java | tail -1 | cut -d' ' -f 5 | sed -e 's%/jre/bin/java.%%g' -e 's%/bin/java.%%g') endif endif ifndef JDIR -- 2.20.1