From patchwork Sat Jul 22 04:48:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124221 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp627890vqg; Fri, 21 Jul 2023 22:15:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlEgxKlNzi2YSUPJJczdSsQkLTUZM5qJDPE5o0yhpE5mkAvkQ+rso7StQgO4CP339aU1BCaH X-Received: by 2002:a05:620a:f8c:b0:76a:dd4f:a61 with SMTP id b12-20020a05620a0f8c00b0076add4f0a61mr1509492qkn.22.1690002957576; Fri, 21 Jul 2023 22:15:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690002957; cv=none; d=google.com; s=arc-20160816; b=XJ7wvf6UHGfOSqx2YtN3IPjk/ieF2haQ/1ZRqH172M7xB7lDbjA6tT9lan43CR6CQk NQgLiOnGFlm6zvm3TyVp2Mu5iO0N8zx6/OB51JoB++Y40AsJcyS2f1lMQdoYCXFGWHpb mYf6pSGA9P3DzyDL8DCOIaz0y62wtc61P891Gt6gA7HsHE71UBY01lyyyhNUKYfUeI0e FRA+QP8orSzl4GDZFQFfDzNR1CaoWXfkA2aTvCreH+mfBPStxVUdngaW/uOz0xkMGccR GIaMsXFipdzjdvzQ4e0VH4XSVhXA3wOld7slaG3hBvesXgSRt9hdNEtV3afQtYpQG5db hWDQ== 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=qy8KDxUpmLOfOd7+F+y1wjTXVfax6SnfYBS0xmaOhcs=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=kO6PxggjxNEX6Bzx8W5MDY+lqwqwdcjvpCMQ0ZDWU5ZQImkNfRL3nSpARVpUtwSp5s sKiyFgyYIAt0eJwQeFjojosXa9cW6M8ZeRpZRuXeAMU6WLIchwq0kxbUWGeRhyNBjl1I LPj+3xY3AiJjPT6B+fF/5wHyCfD9sA+2M5FNEr46tqzFahRWl6GCtiUOzbLbijhTaEuR 36NpSvE/H02WYLBC5GRRPBVH6S1kwDxOsOSbfI09QiwHenZstymcO8MBR1FXBA0Ac9YL woLWTZHmkCQup0t7BGkKZl7hm+H5Lyp4Bjb9evmUXrexZ2l1sHPSLQo3LnAnHWm3Ox6t qbCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YoU0nAY1; 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 be3-20020a656e43000000b0055bef93b8fbsi4337955pgb.75.2023.07.21.22.15.44; Fri, 21 Jul 2023 22:15:57 -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=@kernel.org header.s=k20201202 header.b=YoU0nAY1; 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 S231407AbjGVEus (ORCPT + 99 others); Sat, 22 Jul 2023 00:50:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229557AbjGVEuC (ORCPT ); Sat, 22 Jul 2023 00:50:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F82F46AC; Fri, 21 Jul 2023 21:48:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F0DFD60A64; Sat, 22 Jul 2023 04:48:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52774C433CB; Sat, 22 Jul 2023 04:48:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690001321; bh=48TYLXDk2TZk+T1Fx9XPl8wRZKrGD3cF6zfP4SYoA0M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YoU0nAY1eP4T61+9clSYpSNgSfwWWh5UlvXHQA//yjU3npmsHTTOKSvm94lha13Oz VlQR+ktlhlf2gImIIzl4WuCm3bwrzllNjw1HT93s9YXAW/b3nJdMoKSdZSJ85c3Quz I/m6oaHdjG3haE1snv63ELmDYLmC3bxtdl1YhBLbX434PIqwU7SoAQA1rrb3Ykfek6 PCl4jK408qph6rby2DCGuCbOYY9onlVrywe+VW+ZoMyhUB621OEviungDsh/gJtF6G AmDAwQ6gafSHqU2SVT7k4BsYvnTrDTFUSjhiBTlMSu27sDFLjSNomBlchLc5PQHWul 30V1JW4Jha8Qg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH 18/19] kbuild: rpm-pkg: refactor *rpm-pkg targets Date: Sat, 22 Jul 2023 13:48:05 +0900 Message-Id: <20230722044806.3867434-18-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230722044806.3867434-1-masahiroy@kernel.org> References: <20230722044806.3867434-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772096541431999178 X-GMAIL-MSGID: 1772096541431999178 Merge the similar build targets. Also, make the output location consistent. Previously, source packages were created in the build directory, while binary packages under ~/rpmbuild/RPMS/. Now, Kbuild creates the rpmbuild/ directory in the build directory, and saves all packages under it. Signed-off-by: Masahiro Yamada --- scripts/Makefile.package | 52 +++++++++++++++++++++------------------- scripts/package/mkspec | 8 ------- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/scripts/Makefile.package b/scripts/Makefile.package index bf2da97f29d0..0ace3973a0d1 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -11,7 +11,6 @@ TAR_CONTENT := Documentation LICENSES arch block certs crypto drivers fs \ samples scripts security sound tools usr virt \ .config Makefile \ Kbuild Kconfig COPYING $(wildcard localversion*) -MKSPEC := $(srctree)/scripts/package/mkspec quiet_cmd_src_tar = TAR $(2).tar.gz cmd_src_tar = \ @@ -66,32 +65,37 @@ $(linux-tarballs): archive-args = --prefix=linux/ $$(cat $<) $(linux-tarballs): .tmp_HEAD FORCE $(call if_changed,archive) -# rpm-pkg +# rpm-pkg srcrpm-pkg binrpm-pkg # --------------------------------------------------------------------------- -PHONY += rpm-pkg -rpm-pkg: srpm = $(shell rpmspec --srpm --query --queryformat='%{name}-%{VERSION}-%{RELEASE}.src.rpm' kernel.spec) -rpm-pkg: srcrpm-pkg - +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE)-linux -rb $(srpm) \ - --build-in-place --noprep \ - --define='_smp_mflags %{nil}' --define='make $(MAKE)' -# srcrpm-pkg -# --------------------------------------------------------------------------- -PHONY += srcrpm-pkg -srcrpm-pkg: linux.tar.gz - $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec - +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE)-linux -bs kernel.spec \ - --define='_smp_mflags %{nil}' --define='_sourcedir rpmbuild/SOURCES' --define='_srcrpmdir .' +quiet_cmd_mkspec = GEN $@ + cmd_mkspec = $(srctree)/scripts/package/mkspec > $@ -# binrpm-pkg -# --------------------------------------------------------------------------- -PHONY += binrpm-pkg -binrpm-pkg: - $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/kernel.spec - +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \ - $(UTS_MACHINE)-linux -bb $(objtree)/kernel.spec \ - --build-in-place --noprep --define='_smp_mflags %{nil}' --without devel \ - --define='make $(MAKE)' +kernel.spec: FORCE + $(call cmd,mkspec) + +PHONY += rpm-sources +rpm-sources: linux.tar.gz + $(Q)mkdir -p rpmbuild/SOURCES + $(Q)ln -f linux.tar.gz rpmbuild/SOURCES/linux.tar.gz + $(Q)cp $(KCONFIG_CONFIG) rpmbuild/SOURCES/config + $(Q)$(srctree)/scripts/package/gen-diff-patch rpmbuild/SOURCES/diff.patch + +PHONY += rpm-pkg srcrpm-pkg binrpm-pkg + +rpm-pkg: private build-type := a +srcrpm-pkg: private build-type := s +binrpm-pkg: private build-type := b + +rpm-pkg srcrpm-pkg: rpm-sources +rpm-pkg srcrpm-pkg binrpm-pkg: kernel.spec + +$(strip rpmbuild -b$(build-type) kernel.spec \ + --define='_topdir $(abspath rpmbuild)' \ + $(if $(filter a b, $(build-type)), \ + --target $(UTS_MACHINE)-linux --build-in-place --noprep --define='_smp_mflags %{nil}') \ + $(if $(filter b, $(build-type)), \ + --without devel) \ + $(RPMOPTS)) # deb-pkg srcdeb-pkg bindeb-pkg # --------------------------------------------------------------------------- diff --git a/scripts/package/mkspec b/scripts/package/mkspec index c08567ae7fb1..d41608efb747 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec @@ -9,14 +9,6 @@ # Patched for non-x86 by Opencon (L) 2002 # -# how we were called determines which rpms we build and how we build them -if [ -z "$1" ]; then - mkdir -p rpmbuild/SOURCES - cp linux.tar.gz rpmbuild/SOURCES - cp "${KCONFIG_CONFIG}" rpmbuild/SOURCES/config - "${srctree}/scripts/package/gen-diff-patch" rpmbuild/SOURCES/diff.patch -fi - if grep -q CONFIG_MODULES=y include/config/auto.conf; then echo '%define with_devel %{?_without_devel: 0} %{?!_without_devel: 1}' else