From patchwork Sun Oct 1 12:38:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 147085 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp849849vqb; Sun, 1 Oct 2023 05:38:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGGXfHk+zFBtEFDuOvsl5SBugd03CDvouc79gEKSwX3w/yFVtBkKTKZoHPrq8mkCa5d6kaj X-Received: by 2002:a05:6a20:7f8a:b0:131:b3fa:eaaa with SMTP id d10-20020a056a207f8a00b00131b3faeaaamr9989562pzj.61.1696163916902; Sun, 01 Oct 2023 05:38:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696163916; cv=none; d=google.com; s=arc-20160816; b=nBFvY2aZlkDky8zh/rEYpQxIv388ZmDGTcnWwD+hUOSKxyC+OrFDgXJtpnL57FlXiM ZM8m8ILHc7FvBbuNkf2PLd5SUy80sEp10HWDqplkggVp24qPB1MGKj3xWbx9E0kkn4Ih qlPkESvMYatluZdWxyYMkfV27eXZFULkVswdC990BoM9o9uKAb6lSc1SJl9yOlmQfLsC 4GfZZ7NBZfBCShUfBcXGnzHqSWmaSoVV892XFyfEq1UGE9XJdZq+5OrZwni9NYmV1lii W80gU/GjdXR7USziRG1fwqo3cAJB9Ym2viSA4Yd91O4+QLvseTMQjHMOTKqT5y/k+uEM kz0w== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=XHYx+Bt6k8iYBSS132yC54Wm+A7GihWL+iD89T+hdYw=; fh=wKrPioF+0wPaktGqmf0aQvlk8PY4Pc32rTAsBSAiP8I=; b=rduQLgAR9f/OuJAreDzmAx6bayUB4o154GJdAJ/ih9QNdHWvqgs++HpUk8aphSfOJN 7SHw/6dqzSBKnwtVBgsPgMmrxwC8g2ROv7urOhI2naKwa6yO5dUlFaJQbvV4CYpwe95C 11mcpXnOpFsefhiTz4IUWDk5JEPA0tHBzDXHVLi1SDohz3pNX2ITLel1dMilwjq8B7gL oDjKvenWtIWvs4H+t9crmMqz2OjBVQex1sUAkl3usPY7tDW1xIhMC9Di8Wim0RlYPE8P vaFlmqIZdwHFToa5ToSD2M8Hpi/x6mYAg6D/wP/rx7sSA1DcK0kl26ucTaK2SsXG+QLh rH/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fpPkvQIz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id h185-20020a636cc2000000b005652bd3d3absi24144585pgc.43.2023.10.01.05.38.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 05:38:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fpPkvQIz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 2AD2E8028E71; Sun, 1 Oct 2023 05:38:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234956AbjJAMie (ORCPT + 18 others); Sun, 1 Oct 2023 08:38:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229556AbjJAMid (ORCPT ); Sun, 1 Oct 2023 08:38:33 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D70C94; Sun, 1 Oct 2023 05:38:31 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17380C433C7; Sun, 1 Oct 2023 12:38:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696163910; bh=KEq0sb1sATCnOmr6JZBWJrk3Ia06CKo6O9cePk2xNA0=; h=From:To:Cc:Subject:Date:From; b=fpPkvQIzkuzvHKi+AOjEeMXdXpMfDC0HgQdMe1hoXfco2RpUEnMf+W5uJFjTxGQlQ +aufWVlwkDD0KcCEaX2WtRRDkvK+dTa0fNob1KSzxPZIrP8WM+47xVcrUh3vnFMGej hprruBaBT+wAdHU+e8/sTZoQaYbXQ9+5oWDHF6R+HlgTO1K2ofYlGl9Gk0vYgxlJhc HBdBwn2QvZM2ym6GVNHE0HOlXU1plMPUZmMI6lpQNwwVH/1WVDgC5yY8zZiFfv1zZN mGnRvxM+Ef3OwF4yUN7eAB+SzmbgDzMhZfMIJ67LccNThKW4AO7pVZ5r77IR0AJ1+A 0WU9RB1mhTI8w== 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] kbuild: make binrpm-pkg always produce kernel-devel package Date: Sun, 1 Oct 2023 21:38:22 +0900 Message-Id: <20231001123822.1659773-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 01 Oct 2023 05:38:36 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778556775304373333 X-GMAIL-MSGID: 1778556775304373333 The generation of the kernel-devel package is disabled for binrpm-pkg presumably because it was quite big (>= 200MB) and took a long time to package. Commit fe66b5d2ae72 ("kbuild: refactor kernel-devel RPM package and linux-headers Deb package") reduced the package size to 12MB, and now it is quick to build. It won't hurt to have binrpm-pkg generate it by default. If you want to skip the kernel-devel package generation, you can pass RPMOPTS='--without devel': $ make binrpm-pkg RPMOPTS='--without devel' Signed-off-by: Masahiro Yamada Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor --- scripts/Makefile.package | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/Makefile.package b/scripts/Makefile.package index 05b8c3e29aac..3addd1c0b989 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -94,8 +94,6 @@ rpm-pkg srcrpm-pkg binrpm-pkg: rpmbuild/SPECS/kernel.spec $(if $(filter a b, $(build-type)), \ --target $(UTS_MACHINE)-linux --build-in-place --noprep --define='_smp_mflags %{nil}' \ $$(rpm -q rpm >/dev/null 2>&1 || echo --nodeps)) \ - $(if $(filter b, $(build-type)), \ - --without devel) \ $(RPMOPTS)) # deb-pkg srcdeb-pkg bindeb-pkg