From patchwork Thu Jul 14 05:02:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12917303 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1817C43334 for ; Thu, 14 Jul 2022 05:07:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229745AbiGNFHn (ORCPT ); Thu, 14 Jul 2022 01:07:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230435AbiGNFHT (ORCPT ); Thu, 14 Jul 2022 01:07:19 -0400 Received: from conuserg-07.nifty.com (conuserg-07.nifty.com [210.131.2.74]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBBD2193D8; Wed, 13 Jul 2022 22:03:55 -0700 (PDT) Received: from grover.sesame (133-32-177-133.west.xps.vectant.ne.jp [133.32.177.133]) (authenticated) by conuserg-07.nifty.com with ESMTP id 26E52j5E024585; Thu, 14 Jul 2022 14:02:46 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 26E52j5E024585 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1657774966; bh=gh5qXSnB7guosq/2r/U6NMm7kNaH/f1eCk7aqtUJfk0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M8JY7j55M1Um364xUI0/jUYbdBs9CQkvcsQsO4BwF5lq3903GLEa3WOkLqkpQk0ol nLoR4RO4qr9HvfB7SN+4aKG8WHVgtRaQHjbPaWwZN8e+gutKEM5b1sT7HiJxJOoKFU hu6ht2cdmx1rYIJUb6/9b3MiNRG8jTNCsRi8MvLuEqmGghhuk8VvpZmb4xyA5R2YGU C1qPJ0HwQlf56R5HPfmPTk/V6tEH5ekps1EQMm4Qadj5D+ikkiWEmgHN0BouFchwyM W/qECXndV55bIfHoyyFLkY8f1sT0QJVXRNuoX5T2KxAw4O4JH5HMwkUnqngJUP7uRh q6PmdDPs6H2/Q== X-Nifty-SrcIP: [133.32.177.133] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Michal Marek , Nick Desaulniers , linux-kernel@vger.kernel.org Subject: [PATCH 2/4] kbuild: rpm-pkg: pass 'linux' to --target option of rpmbuild Date: Thu, 14 Jul 2022 14:02:41 +0900 Message-Id: <20220714050243.16411-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220714050243.16411-1-masahiroy@kernel.org> References: <20220714050243.16411-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Presumably, _target_os is defined even if the --target flag does not specify it, but it is better to make it explicit. Signed-off-by: Masahiro Yamada --- scripts/Makefile.package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.package b/scripts/Makefile.package index 77b612183c08..5017f6b2da80 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -56,7 +56,7 @@ rpm-pkg: $(MAKE) clean $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec $(call cmd,src_tar,$(KERNELPATH),kernel.spec) - +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz \ + +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE)-linux -ta $(KERNELPATH).tar.gz \ --define='_smp_mflags %{nil}' # binrpm-pkg @@ -66,7 +66,7 @@ binrpm-pkg: $(MAKE) -f $(srctree)/Makefile $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \ - $(UTS_MACHINE) -bb $(objtree)/binkernel.spec + $(UTS_MACHINE)-linux -bb $(objtree)/binkernel.spec PHONY += deb-pkg deb-pkg: