From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B8B0ECE58A for ; Tue, 1 Oct 2019 16:55:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CFD1F2168B for ; Tue, 1 Oct 2019 16:55:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569948941; bh=mzEWVmCzDzk3Hf6JP35BoydyehFPyUmjHoYwXHYpf5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vsY2WHdJpZTjhiItnEpyPsBDsRRsY/76u0P5fYo3nvyTg98awKvtBPK0sNKi1U2Ef SD1YAec2GwlZRypt0ipQvAz1oUu+gfyXwkb2pZJkGfAfek9Q5CmuW3bJb3UsQrV51t XKY1qO9nD7na2Ld91Pjbz2U3/NPmBQX/gSnyKUBc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732077AbfJAQmk (ORCPT ); Tue, 1 Oct 2019 12:42:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:54458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732017AbfJAQmb (ORCPT ); Tue, 1 Oct 2019 12:42:31 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DF1AF21D79; Tue, 1 Oct 2019 16:42:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569948150; bh=mzEWVmCzDzk3Hf6JP35BoydyehFPyUmjHoYwXHYpf5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t41KtSRHge6rv1+ZvJC5EiiMHX8lvqTwd4ZP+kQcbScnm+fI7I/tSuqjNaKbL0F/P 9wqWBLIAbFC1KlJf1Bfqp1Cu0LclBN/BOjSnFG2lP26Gsh0sIeAaFmZNP6Y8oGwj3d 2+1oTk7YfYX4ylyNrHdHlRqE79DuYeeNHjQ7BTLo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Richter , Andreas Krebbel , Arnaldo Carvalho de Melo , Heiko Carstens , Hendrik Brueckner , Vasily Gorbik , Sasha Levin Subject: [PATCH AUTOSEL 5.2 44/63] perf build: Add detection of java-11-openjdk-devel package Date: Tue, 1 Oct 2019 12:41:06 -0400 Message-Id: <20191001164125.15398-44-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191001164125.15398-1-sashal@kernel.org> References: <20191001164125.15398-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 17b81bc403e46..f7115501435f5 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -902,7 +902,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