Received: by 10.223.176.5 with SMTP id f5csp700055wra; Fri, 9 Feb 2018 05:55:30 -0800 (PST) X-Google-Smtp-Source: AH8x227TOeNi9IRbuaA5s/lAv/IsKZycj4ThroWaY8OUqJEOmI4+Uu/w7AXkLlw8jRlUthEjvueo X-Received: by 10.99.113.11 with SMTP id m11mr2476310pgc.57.1518184530822; Fri, 09 Feb 2018 05:55:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518184530; cv=none; d=google.com; s=arc-20160816; b=LBLO41bilMZYkHufvn5TcJcrnM2POfiSbsrUNPJ2Q1tb5cp0u0HfetfNMgf1lPdynl idNic75JtvfjD7uJsg7DDfFsc2OWV1yGgjy1E/hv5ED8Mbg4Qr1kCE3oCIAn4ZgP6Qaw IdwcjLgTnFOjVao0vyUbT+6MsNW7DBOzhNKltjnqyvDiAsDMl8b0txNfFmChjQTkuBRM QsuD7dG84cU333UmoD/Yfl3yLdKSs2uOZIbUuPt6fml9gNJ+iVXlNAJkb5edoC0XxV2j hja7HMNxQxY8X030oMA87yi+3WmIYoiapAsbrk+v38OZ2zM+R+FSdOJohsGgSPolwlSh AkNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=rlwzqN9COqSJKnJBZ6R6ZZvf1x3Mm3mtqGe8l+w3QWY=; b=lb3tOr25BoxFhqTy+RH5cttJZdIAVhbBNBJo8FavCnZInjIde5quGAQYUQzxWlwWGs hfL+EGgPL8LZqSw2FMIIkSyePTNszPhs/W0KS9peISeztWqjwO+y8hLc3xiov8hb+r9h PFgGiUbpyd7ZoTtCKQVGQrXtqZ2ZYfTI6+AgYVJF0VrzeTafCmAWP1/8KMJ8JSc9AiEV kY/qyNQn2Agj08jAY3muBABjH10V2wFsKBGnRR5DuP7Xv3drydV31y+eCUi22jO8bKqY vZnKVqYjQbcIcQuyG5pgLiZFIVWSS62be6E+kxiumNFGR6fQJFIOliEFoC7ynOYb2Mjh 33KA== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p15si1412218pgr.423.2018.02.09.05.55.16; Fri, 09 Feb 2018 05:55:30 -0800 (PST) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753699AbeBINpt (ORCPT + 99 others); Fri, 9 Feb 2018 08:45:49 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:51934 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932095AbeBINpl (ORCPT ); Fri, 9 Feb 2018 08:45:41 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id B334310F7; Fri, 9 Feb 2018 13:45:40 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masahiro Yamada Subject: [PATCH 4.14 03/22] kbuild: rpm-pkg: keep spec file until make mrproper Date: Fri, 9 Feb 2018 14:39:52 +0100 Message-Id: <20180209133934.282959969@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180209133934.024795822@linuxfoundation.org> References: <20180209133934.024795822@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Masahiro Yamada commit af60e207087975d069858741c44ed4f450330ac4 upstream. If build fails during (bin)rpm-pkg, the spec file is not cleaned by anyone until the next successful build of the package. We do not have to immediately delete the spec file in case somebody may want to take a look at it. Instead, make them ignored by git, and cleaned up by make mrproper. Signed-off-by: Masahiro Yamada Signed-off-by: Greg Kroah-Hartman --- .gitignore | 5 +++++ scripts/package/Makefile | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,11 @@ modules.builtin /Module.markers # +# RPM spec file (make rpm-pkg) +# +/*.spec + +# # Debian directory (make deb-pkg) # /debian/ --- a/scripts/package/Makefile +++ b/scripts/package/Makefile @@ -50,7 +50,6 @@ rpm-pkg rpm: FORCE $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec $(call cmd,src_tar,$(KERNELPATH),kernel.spec) +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz - rm $(KERNELPATH).tar.gz kernel.spec # binrpm-pkg # --------------------------------------------------------------------------- @@ -59,7 +58,8 @@ binrpm-pkg: FORCE $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \ $(UTS_MACHINE) -bb $(objtree)/binkernel.spec - rm binkernel.spec + +clean-files += $(objtree)/*.spec # Deb target # ---------------------------------------------------------------------------