Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2258465iof; Wed, 8 Jun 2022 00:40:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwj7j/Wo+zDLRKhKRadIgD6ZaLUbx1cDtBSXrJrWVOwt4EKyTnxbAF1Ez4wNElD7FfBQjCi X-Received: by 2002:a05:6402:1941:b0:413:2555:53e3 with SMTP id f1-20020a056402194100b00413255553e3mr37707791edz.164.1654674014687; Wed, 08 Jun 2022 00:40:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654674014; cv=none; d=google.com; s=arc-20160816; b=KEHV9gIdNGtO0nNZ4RKdbMBvQTZZJqJuRGGgWhHiHo03NH2I2VYHKr0jLPczVggXxj RYEITZycOH4c6vssqyehpnX3s7+GZqr+WPAG3FPWkz192Li9l9/gaUOjfYmcRf7Ekh+r areaoTcY8OZsdDkbY/XCbp8xBGtbViyiOfzfH/vQw/s/i0DKSxy/noZSBNWlIY+1GUBl qNHXUvJx5Emf5ngn5j4zb+4cY9G83Nb8XQuveLBTIMAoYjPjeoOAQTBhgErJ6U0ySxwB hs8MB7egtSYRLJEkiLjRzaTE9RFWRFy1L5I5ZBS5qYTj+CSIPvgsawDsdnrcmIekkZOZ BUsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kdlexVq+izwZSSgITpKH7hHAZHItQSNRNSfURoz3HUU=; b=Qafldw71YFEpcRtiGKhdCUSeAekrSVMTBJI4b9fzKM87kPVefoglzKnRsUfq1Vf6j4 u0LucorZ8RFDEHFxTt461G+lfAUpmziXf6AMeBZHrWLI1ezGs2ci9vtxVZuszIH678IS R1JLMBhN4o+urgRJMmDR+RCQ+pcZeHy6T2Ajfi9i6SmOlEvVJKABXQcrZw4PLAtT/GfS vGL9Wr2hzh0wbPv7PGpSTp3e/YeKQeZgwYYscwpmCYldXqZ5TSiY0Z37WsqJLvgsMKId Fbc2bAPBp87h6FPjC91yV1WgV1hWOTD2UzZ9f3I4P+ybVCD//OZDtTmaKifc5esDqFfQ 9DvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nWU2mNZv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s11-20020a056402164b00b0042ae36e2432si20955734edx.132.2022.06.08.00.39.48; Wed, 08 Jun 2022 00:40:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nWU2mNZv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378624AbiFGVc2 (ORCPT + 99 others); Tue, 7 Jun 2022 17:32:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378175AbiFGUez (ORCPT ); Tue, 7 Jun 2022 16:34:55 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF3CE1EA86E; Tue, 7 Jun 2022 11:37:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id A364BCE23F1; Tue, 7 Jun 2022 18:37:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90629C385A2; Tue, 7 Jun 2022 18:37:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654627057; bh=wXIZJawWrOCnO9b2OaTQyjOEM/LeOCNedPaXi6O7/l4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nWU2mNZvGmk2KNPVqh+Us33cd+CnVdvyaoV4Oh1dE9kC6p9eStoIFiKgC6J7tpoLW 8QdaKoP0lZN9Y5Fw7kH5ptDGhvxpdFltuVLwGJJVCYvQgju+q4dGViggdiRG+POfaM SW26ij2GANbevqanSajsz+1nwgUDL3iIhmW1xZQQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Bristot de Oliveria , Daniel Bristot de Oliveira , John Kacur , "Steven Rostedt (Google)" , Sasha Levin Subject: [PATCH 5.17 600/772] rtla: Dont overwrite existing directory mode Date: Tue, 7 Jun 2022 19:03:12 +0200 Message-Id: <20220607165006.622107220@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607164948.980838585@linuxfoundation.org> References: <20220607164948.980838585@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: John Kacur [ Upstream commit 39c3d84cb5b52792a7323a338334d8d65b2dbe3f ] The mode on /usr/bin is often 555 these days, but make install on rtla overwrites this with 755 Fix this by preserving the current directory if it exists. Link: https://lkml.kernel.org/r/8c294a6961080a1970fd8b73f7bcf1e3984579e2.1651247710.git.bristot@kernel.org Link: https://lore.kernel.org/r/20220402043939.6962-1-jkacur@redhat.com Cc: Daniel Bristot de Oliveria Fixes: 79ce8f43ac5a ("rtla: Real-Time Linux Analysis tool") Acked-by: Daniel Bristot de Oliveira Signed-off-by: John Kacur Signed-off-by: Daniel Bristot de Oliveira Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin --- tools/tracing/rtla/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/tracing/rtla/Makefile b/tools/tracing/rtla/Makefile index 5a1eda617992..4b635d4de018 100644 --- a/tools/tracing/rtla/Makefile +++ b/tools/tracing/rtla/Makefile @@ -23,6 +23,7 @@ $(call allow-override,LD_SO_CONF_PATH,/etc/ld.so.conf.d/) $(call allow-override,LDCONFIG,ldconfig) INSTALL = install +MKDIR = mkdir FOPTS := -flto=auto -ffat-lto-objects -fexceptions -fstack-protector-strong \ -fasynchronous-unwind-tables -fstack-clash-protection WOPTS := -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -Wno-maybe-uninitialized @@ -68,7 +69,7 @@ static: $(OBJ) .PHONY: install install: doc_install - $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) + $(MKDIR) -p $(DESTDIR)$(BINDIR) $(INSTALL) rtla -m 755 $(DESTDIR)$(BINDIR) $(STRIP) $(DESTDIR)$(BINDIR)/rtla @test ! -f $(DESTDIR)$(BINDIR)/osnoise || rm $(DESTDIR)$(BINDIR)/osnoise -- 2.35.1