From patchwork Tue Mar 21 18:36:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Locke X-Patchwork-Id: 73008 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1962439wrt; Tue, 21 Mar 2023 12:17:19 -0700 (PDT) X-Google-Smtp-Source: AK7set/Cze8GADL8TGWykR3mfweBKNed3Gx8vJdK8G4MEZTI7DIq/9oP2027ibnLcr1cqmQroc/L X-Received: by 2002:a17:902:d2cc:b0:19d:2542:96a4 with SMTP id n12-20020a170902d2cc00b0019d254296a4mr310478plc.4.1679426239403; Tue, 21 Mar 2023 12:17:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679426239; cv=none; d=google.com; s=arc-20160816; b=OpXdtwcPDtn22fe+Z9dgHjSlshNdky6YU1okyFN3ZmBS0pge7MBLixpGFxm3Qjykl4 0O44oesu5/oMUxg1VqbKxrcFwWcqSkGvslPVNH95hKnBN9sP0NIp/xdF47x9es7w2BvS Owm/vH9V+ZyF+pl0TJ4VgOVEhhNJOc5NaapsjqV/HrShFDkRSViB8tP5NgMK/LA76gtE 6Ehq36iYQiKcGXsXVlgZ4MGFIg+sfpHL5RftqRPjJmvItAIGfSd81lA8jwvnQLv8mqh6 5JzQtmocSQRcG1plALc0FfHdvrOFKKNDKekJZLbL+MUszED5KSsOoeHV4jiaaUOIll/z OGOQ== 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; bh=QS9+eHdGSOugdDsm00jM13hWPHl9WwAdK+pYTS2otgA=; b=TzBEHrO/8BCuN6qB1fyyZ2+weChfdSVUG2xDEDK8AROLnBdIvht14H/YCoFzJ8TX7v AzI/LJopMjIKcHfwpi6LfacGAzdYknfQGhzMoUNqJwCp5/kKsI6O4t33SuMIwf1F0DJH dhU4FMQbf1B/XmGTv6bBl7U6MfTn+HSZgKT5pdu3Bg4gqKSFgno0pl60vCdiCGmJeyt2 a4GvTL0LGeDvCZpQ7G18KlcUEr0L9blEp7fs3QHDcfAxOyIkQSbpblBCPYC70WEmZODz eD9qiCXh64ziNWkLivZtnwTUj4ykvf88leB9bfkaILOrazL5GAfMTSmly+qa+ghkbv7u Xv7Q== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=kevinlocke.name Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p3-20020a63f443000000b0050726756ee9si14471276pgk.92.2023.03.21.12.17.06; Tue, 21 Mar 2023 12:17:19 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=kevinlocke.name Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229683AbjCUSwI (ORCPT + 99 others); Tue, 21 Mar 2023 14:52:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229663AbjCUSwH (ORCPT ); Tue, 21 Mar 2023 14:52:07 -0400 X-Greylist: delayed 599 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 21 Mar 2023 11:52:06 PDT Received: from vulcan.kevinlocke.name (vulcan.kevinlocke.name [107.191.43.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F3932138; Tue, 21 Mar 2023 11:52:05 -0700 (PDT) Received: from kevinolos.kevinlocke.name (2600-6c67-5000-0a52-c52e-ada9-d81f-68db.res6.spectrum.com [IPv6:2600:6c67:5000:a52:c52e:ada9:d81f:68db]) (Authenticated sender: kevin@kevinlocke.name) by vulcan.kevinlocke.name (Postfix) with ESMTPSA id 07BE037D9498; Tue, 21 Mar 2023 18:36:38 +0000 (UTC) Received: by kevinolos.kevinlocke.name (Postfix, from userid 1000) id 98152130075A; Tue, 21 Mar 2023 12:36:36 -0600 (MDT) From: Kevin Locke To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Linus Torvalds , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-kernel@vger.kernel.org Subject: [PATCH] kbuild: deb-pkg: set version for linux-headers paths Date: Tue, 21 Mar 2023 12:36:25 -0600 Message-Id: <4a55805c694cff4cc9281961f2d457262bea48e6.1679423785.git.kevin@kevinlocke.name> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,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?1761006048266731932?= X-GMAIL-MSGID: =?utf-8?q?1761006048266731932?= As a result of the switch to dh_listpackages, $version is no longer set when install_kernel_headers() is called. This causes files in the linux-headers deb package to be installed to a path with an empty $version (e.g. /usr/src/linux-headers-/scripts/sign-file rather than /usr/src/linux-headers-6.3.0-rc3/scripts/sign-file). To avoid this, while continuing to use the version information from dh_listpackages, set $version from $package. Fixes: 36862e14e316 ("kbuild: deb-pkg: use dh_listpackages to know enabled packages") Signed-off-by: Kevin Locke --- scripts/package/builddeb | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index c5ae57167d7c..6fd590437f47 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -229,6 +229,7 @@ do linux-libc-dev) install_libc_headers debian/linux-libc-dev;; linux-headers-*) + version=${package#linux-headers-} install_kernel_headers debian/linux-headers;; esac done