Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp4897158ybe; Mon, 9 Sep 2019 16:55:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqyyD0SJeCTyIXFeCd+FbRp/Nxcgrt5gi/OQX74Jfis8IDLi0Lcji3YzCb3+Q7oOzJhunbU0 X-Received: by 2002:a05:6402:1447:: with SMTP id d7mr27113925edx.146.1568073308795; Mon, 09 Sep 2019 16:55:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568073308; cv=none; d=google.com; s=arc-20160816; b=M30PeoLnVxCnXbPo2/msG/3rdJNwD8vafI0Fn6sRvnE/VsBCPjyb4f2IvBv4bBXtIP ilVo6asshQ7vRw+DOB+ap8iXY7jQY2W4NfnQ5O426W6HhyA5fwbvOiXylOfdd1+kWX+Z ZvhPvDQzAwIqCDxTWBhwfYN2jts5CNN8maawjNm3Ho488h0eNs35Pbfiyx/8KRPjvhkx ayteRqyo3TxzZJbJ/7HJreuoXYYeht+HbF6VAh9WShc9eTwWqkmP2gvjY/TzgqURB2/L uzY4bnhED9mOjJSRu0ojvqym5qdlU83ABY3HRh8aVRCwO50SJ4w8BYIa772rrl6d9Ot3 Ce7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from; bh=eo2s+gg7vYjxC2w4y4WrjDtgC+bQ6EpQu//o+qpIwCQ=; b=z+VsSO+r+4ZOSoHXgW+kBaqegtuXjJpRQeDC0vM//2YVdM1cCL/MrTsIR5bdbVqWIA 6PAAmsmRFx1Has/Ksc9BCCk9aBLRXyXX9kakOclLZE2fOtxMcyD+a6CtM4g+eN4IPAcF JyGqZWtbix+0btJkiQRCy8nGXdSrIVkqIreQ6jvYbb982aW4lJaGmRhReogKXgrHb02m CijkpZeTtl3vYQYxbn/qdMyiY4KfD5izKLk02dMmBKEHRcfFMRwfPq6Oq8inwPm4N+bM l/eZagKuQ/wwxibAUeJBGZXDOxZ2BJtO6aQBVJ/piFAx2l+JOFHfOGQ8Zi7G6upZKxOW UsmQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b5si8076896ejd.158.2019.09.09.16.54.44; Mon, 09 Sep 2019 16:55:08 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404273AbfIILlq (ORCPT + 99 others); Mon, 9 Sep 2019 07:41:46 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:16204 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2404242AbfIILln (ORCPT ); Mon, 9 Sep 2019 07:41:43 -0400 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x89BRH0j077225 for ; Mon, 9 Sep 2019 07:41:42 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2uwmbfvxnb-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 09 Sep 2019 07:41:41 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 9 Sep 2019 12:41:40 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 9 Sep 2019 12:41:37 +0100 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x89BfZqj27131912 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 9 Sep 2019 11:41:35 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6899EA4051; Mon, 9 Sep 2019 11:41:35 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 23BECA4053; Mon, 9 Sep 2019 11:41:35 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 9 Sep 2019 11:41:35 +0000 (GMT) From: Thomas Richter To: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, acme@kernel.org Cc: brueckner@linux.ibm.com, gor@linux.ibm.com, heiko.carstens@de.ibm.com, Thomas Richter Subject: [PATCH 3/3] perf/java: Add detection of java-11-openjdk-devel package Date: Mon, 9 Sep 2019 13:41:16 +0200 X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190909114116.50469-1-tmricht@linux.ibm.com> References: <20190909114116.50469-1-tmricht@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19090911-0020-0000-0000-00000369BF83 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19090911-0021-0000-0000-000021BF400F Message-Id: <20190909114116.50469-4-tmricht@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-09-09_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1909090121 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Suggested-by: Andreas Krebbel Signed-off-by: Thomas Richter --- 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 89ac5a1f1550..3da374911852 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -908,7 +908,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.21.0