From patchwork Thu Feb 2 03:37:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 51663 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp17135wrn; Wed, 1 Feb 2023 19:42:57 -0800 (PST) X-Google-Smtp-Source: AK7set/J6LfbcGUDKKfyXc4LJ8vlKO/b/9X0d/W489tW3c+np5d89uhF/SyVg/AireFwAiNpS5Ti X-Received: by 2002:a05:6402:5295:b0:4a2:3637:5be2 with SMTP id en21-20020a056402529500b004a236375be2mr4395377edb.39.1675309377209; Wed, 01 Feb 2023 19:42:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675309377; cv=none; d=google.com; s=arc-20160816; b=z747O4Zhyl2dJUoXJBDsOmVHBoVLCnKHm49eFHVld7oRdlommYzs+1V1++DMGYezb5 uMBh7p6hDUj/l5paB3dRQJeXBIPD+r6fay4CMyYcoab3oHlNPSF4i2mnRG2u7qRj9Bcr Ea1UAbt0SvHNCL0mnPqJ129BeFMPS0KfOI493Mrppjgoohesub0NjsVS+njZcavdU/SL 8tzAUZ0TjqzbsJ7Lxk/xqZg+NLxVxBVToMlxyYAV0zS9KM18j67Y9ynF0cJ6Ovg5UugM 9uKHcEgqu4OnVBozO4TS16Y7nF6t2Q1FQnt3O8QjOeHX08UR7gfol4Oq0q1btLLvvyxM U8Bg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=z1egM9lXLaVI6SWp1XVjkt1LmgC+pwHseAm9oWTNOqQ=; b=FHvO0gdmHddSaRGjxD9cxHMu1elCNhWEwsLGPIZuzAD6jUzKAPW3qFQplnAM0jkDZf t/Bi1/6+9YYI/z5fJR+zVuGdBOUDauS8r+CSseihzp/+d6oIT3Hd+FjSh1bpJQ7Q4kDw 2G/4kBUubTmut1sGLu/noVGLAEKJIxTlr3MkjKDMLWBDEdnpmaZImc85z8t/trBmajeE cR6r8EO72yyqNV6PnujPbjA11JgYmi6zRpgncsKrb2MhMGRq7sSN28kcbzILc7SF07cV fgfI1brr+4xVkRUn5thBouBytRpxD7Rcs4eMOxbAkjFnPQjZ2yn9jVH6/0lBXN2ZMlEF 3KgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YbddWuwl; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j3-20020a170906104300b0088de3d552e0si4715498ejj.859.2023.02.01.19.42.33; Wed, 01 Feb 2023 19:42:57 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=YbddWuwl; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232282AbjBBDji (ORCPT + 99 others); Wed, 1 Feb 2023 22:39:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232063AbjBBDjL (ORCPT ); Wed, 1 Feb 2023 22:39:11 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AF247BBDF; Wed, 1 Feb 2023 19:38:35 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id 068ECB823F4; Thu, 2 Feb 2023 03:38:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E279C4339B; Thu, 2 Feb 2023 03:38:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675309112; bh=AUM4G/NznoutwHp2zakKErj/+py6ZVYqFif0aaYonoc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YbddWuwlrwf6dZveTVYnfBrks8e4vES4xJI2PEttABMEZbBxaP57tHYqmfJ1zpB0D 2VpawxhMYAi8Otd8a8YCDTT51tIkFDdZP+Cq8gmRxsAs61ulKY8xwMmxwKt4v8uye8 JvrEWrFNsP3my4OXTZj/fjRYboQ4ZARU24q2M8Rw1f7gD1jiybOUNoSfnJIxoKFxui Nlc31P9ec2qjGq9AjWubzYewaI/4NBlr0njpKELIkfnxZV0EsFfRv/xaYOL8Q/z1IT J1nXP6H9zd5Lm9xY7k6G+EomVqjFgcZ1T+XulbQno8UOWmIwBv3PD8+CB5cVRJkB4h dT1rQBPSUQE8A== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Nicolas Schier , Ben Hutchings , Masahiro Yamada Subject: [PATCH v4 4/6] kbuild: srcrpm-pkg: create source package without cleaning Date: Thu, 2 Feb 2023 12:37:14 +0900 Message-Id: <20230202033716.341858-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230202033716.341858-1-masahiroy@kernel.org> References: <20230202033716.341858-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756689205795856153?= X-GMAIL-MSGID: =?utf-8?q?1756689205795856153?= If you run 'make (src)rpm-pkg', all objects are lost due to 'make clean', which makes the incremental builds impossible. Instead of cleaning, pass the exclude list to tar's --exclude-from option. Previously, the .config was contained in the source tarball. With this commit, the source rpm consists of separate linux.tar.gz and .config. Remove stale comments. Now, 'make (src)rpm-pkg' works with O= option. Signed-off-by: Masahiro Yamada --- Changes in v4: - Do not delete the old tar command because it is still used by snap-pkg although snap-pkg is broken, and it does not work at all. scripts/Makefile.package | 29 +++-------------------------- scripts/package/mkspec | 8 ++++---- 2 files changed, 7 insertions(+), 30 deletions(-) diff --git a/scripts/Makefile.package b/scripts/Makefile.package index ebf3db81b994..6732632a0259 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -3,27 +3,6 @@ include $(srctree)/scripts/Kbuild.include -# RPM target -# --------------------------------------------------------------------------- -# The rpm target generates two rpm files: -# /usr/src/packages/SRPMS/kernel-2.6.7rc2-1.src.rpm -# /usr/src/packages/RPMS/i386/kernel-2.6.7rc2-1..rpm -# The src.rpm files includes all source for the kernel being built -# The .rpm includes kernel configuration, modules etc. -# -# Process to create the rpm files -# a) clean the kernel -# b) Generate .spec file -# c) Build a tar ball, using symlink to make kernel version -# first entry in the path -# d) and pack the result to a tar.gz file -# e) generate the rpm files, based on kernel.spec -# - Use /. to avoid tar packing just the symlink - -# Note that the rpm-pkg target cannot be used with KBUILD_OUTPUT, -# but the binrpm-pkg target can; for some reason O= gets ignored. - -# Remove hyphens since they have special meaning in RPM filenames KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE)) KDEB_SOURCENAME ?= linux-upstream KBUILD_PKG_ROOTCMD ?="fakeroot -u" @@ -87,12 +66,10 @@ rpm-pkg: srcrpm-pkg # srcrpm-pkg # --------------------------------------------------------------------------- PHONY += srcrpm-pkg -srcrpm-pkg: - $(MAKE) clean +srcrpm-pkg: linux.tar.gz $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec - $(call cmd,src_tar,$(KERNELPATH),kernel.spec) - +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE)-linux -ts $(KERNELPATH).tar.gz \ - --define='_smp_mflags %{nil}' --define='_srcrpmdir $(srctree)' + +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE)-linux -bs kernel.spec \ + --define='_smp_mflags %{nil}' --define='_sourcedir .' --define='_srcrpmdir .' # binrpm-pkg # --------------------------------------------------------------------------- diff --git a/scripts/package/mkspec b/scripts/package/mkspec index 108c0cb95436..83a64d9d7372 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec @@ -47,7 +47,8 @@ sed -e '/^DEL/d' -e 's/^\t*//' <