From patchwork Fri Jul 28 13:38:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1814300 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=rh5jYLt9; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RC7yP3mylz1ybX for ; Fri, 28 Jul 2023 23:38:52 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qPNg0-0001Wq-Dr; Fri, 28 Jul 2023 13:38:40 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qPNfw-0001V8-TW for kernel-team@lists.ubuntu.com; Fri, 28 Jul 2023 13:38:36 +0000 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 414283F078 for ; Fri, 28 Jul 2023 13:38:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1690551515; bh=qjmJhT9QgZhqGZsk9kumLizPVoDUJXHkHvmRRF5mkAw=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=rh5jYLt9AVoCrwFM91uKyrWHuyNrgfyAXdC98XIbSdK+RId28TJGFCJM/BT6veYog N1nW9r3wfmFuP1hwSj7JFi/hHc/IGDRUjtmPTfvMG2OPbdgM1vmpXpTi8Q0j6xsNql dahSM9WEbLdXBsYqlJ7qituOp5xIlwUngoTwqqPmMxwAALnIJNHx0B/48y8HPyJzm4 Sxgf153LcCcj1jkYMiHD2sJjUujrafEOclZltjzOiA7e2F0kd0TUtgZHhPJjSvdGCv 6/akIIQnfalX7tllZ205DwSuFwDw+Yp7Qj3/xfqXRDwLvryH5eKkLHhN4PkGUx7mLT u2LcbMMlMmTEQ== Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-1bbce3d48d9so21388805ad.0 for ; Fri, 28 Jul 2023 06:38:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690551514; x=1691156314; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qjmJhT9QgZhqGZsk9kumLizPVoDUJXHkHvmRRF5mkAw=; b=bl7kLUmRnIeJaNktWyJLfrIUbWOFjVzgpfIN5ymsZoWYXi6IgT6O2F7A+cDgIhe5E1 dAMNL9A1buToAsIGjQWmUymmWPsozpjD9L1FaTTX9MwRc3LEhTMPZIF/mMbcDc58UthP Z2QuoKWpgRehJS6Z3K6KCQQ/JHiArE6D70AO53CPzpeHH21+JWLFmgCl76omQbUkbn8T NqpspJsfGwbvFtMUFBgAyFI+46kWOhFclF53KixNbqldoVwhIXKhWJ0AEQzljvMQr+zm DpR7tcuKx6026UHv3O9xgdVMF+gNdjQCoYM2LxfvbLoBZzI4G4dnORvzUqI6iKL6SjfM 19oQ== X-Gm-Message-State: ABy/qLZb6I/+yQ6BXtgF2op+rzqn5rc2406Qq3viZFq32Tnr9kaEtMAj w08CYhbX1TG+eIBl4LUUggmaOvRKhXuIP738JjvtIsyWQ3tnSfKxU1inO0NaTWnmTRt2F3RHxCb e2gFoPU1+8rfHOV2ycJZoNSyZAktBaH0fIxn2QoPyxa7CCJCTXA== X-Received: by 2002:a17:902:7894:b0:1bb:c7b6:493a with SMTP id q20-20020a170902789400b001bbc7b6493amr1738982pll.21.1690551513747; Fri, 28 Jul 2023 06:38:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlGRo0qcIK2onO5rC98elS1+Jyp6dRiZt8tYZ2syPQUC5pmidA55Gw4K9kg7DQ3BpZI500/yrA== X-Received: by 2002:a17:902:7894:b0:1bb:c7b6:493a with SMTP id q20-20020a170902789400b001bbc7b6493amr1738963pll.21.1690551513291; Fri, 28 Jul 2023 06:38:33 -0700 (PDT) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1002]) by smtp.gmail.com with ESMTPSA id e8-20020a170902b78800b001b6740207d2sm3561794pls.215.2023.07.28.06.38.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 06:38:33 -0700 (PDT) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [Mantic 1/6] UBUNTU: [Packaging] Add .NOTPARALLEL Date: Fri, 28 Jul 2023 22:38:12 +0900 Message-Id: <20230728133817.893883-1-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" The targets in debian/rules are not intended to run in parallel. Add .NOTPARALLEL like the Debian kernel. Signed-off-by: Masahiro Yamada --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index 034aa2b789a6..99d91078f7db 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,8 @@ # (this increases performance and avoids hard-to-debug behaviour) MAKEFLAGS += -rR +.NOTPARALLEL: + DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' X-Patchwork-Id: 1814296 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=PLeJUYQp; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RC7yP4s9Xz20G2 for ; Fri, 28 Jul 2023 23:38:52 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qPNfy-0001WI-8L; Fri, 28 Jul 2023 13:38:38 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qPNfw-0001V9-Ga for kernel-team@lists.ubuntu.com; Fri, 28 Jul 2023 13:38:36 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 39FA53F18E for ; Fri, 28 Jul 2023 13:38:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1690551516; bh=vd1PPjM4SZ/ed/9dx7nhmRdS49gJeqxx8vVKzWyp9ag=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PLeJUYQpsQhMBtxL57A2xAqTuNkSwvutFDQP+cfRVhQe8X6vGVNqSrTjidQ3Ot9nT d08vvHdsVpJiY+uBIH+d+8hHQVZcZhZBsSNk0CDaX2MnrBrKE7XsPfeq3vuXftB9JV pd+nj8t4P9zniG9059vv0DE/cD9GbwsamiJYLA4PbkNOtyoOfkj75COzNNn4Jn+Zl/ 5rNwbMASCQdawaWxoYCo4bNolCVupZ24uUGAqBY0JHM2zyccnFJxTs1R0uxlQI8A5o kaIKs8+8CRsNeGemK/hw8AMrSFS7o6Wpz1UAr2XdqIOiugDGK2ju4WNqZfWkcXr6gT 9Bg9eniAsY8Kw== Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-1bbcbba5af8so21077525ad.0 for ; Fri, 28 Jul 2023 06:38:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690551515; x=1691156315; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vd1PPjM4SZ/ed/9dx7nhmRdS49gJeqxx8vVKzWyp9ag=; b=eBhQGU3PCMvNPbhS6R9+c/5Kh5uTlO/HBfmGkXzOgOSBhilDasKpBQOeGxwBZ/p7u9 G84Og3I2NPAIYKVCXFXxEiWpSd+xppKyxRZgjLPXk+OEf9mFbKDNxzBDXdZ81H9365nv 5QiOe2lCJ6SOv94/GMNmNqF9tvODLJC6cDTW0wHx2SPcyfzmARstNgOhSUf9mig2LaH3 UkkLO5Diulb/fvdnOQG0dlC9LQTG7lHdQ/2px+wfq5shA9BJZJl6PjnPHs3XKVYRXKsD S25j3tWgsD6tmJ+feEgP+3gte77zClb7+5IiOySCsxkbZU4yF3B/HJQ8L6N55GHju+Gm kj7w== X-Gm-Message-State: ABy/qLZwO4x+aFxHme+L1HC8U+J32eMQ0pboz17MiXF9vaiBzGls+Xu6 UCvR0AL1jPr9Vy5BMDeXLr4iY0OfLHEgolUYkuonLpjjuGGXRdlUbU8HLcqg6ho0JStMjo6Gn9y QcpIAKx+JS3CTiW4vohrj7bL/7/g2a4ROLIFg0OjjNbncTmEHzA== X-Received: by 2002:a17:902:e314:b0:1b8:862:74ee with SMTP id q20-20020a170902e31400b001b8086274eemr1502380plc.11.1690551514749; Fri, 28 Jul 2023 06:38:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlEel4/KIjZKsB43A+oCHFdjGSfYb/01meds4fXo2F/QB3Tal2cUnPUI4dtFoOqPe+sZj/U7lQ== X-Received: by 2002:a17:902:e314:b0:1b8:862:74ee with SMTP id q20-20020a170902e31400b001b8086274eemr1502367plc.11.1690551514430; Fri, 28 Jul 2023 06:38:34 -0700 (PDT) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1002]) by smtp.gmail.com with ESMTPSA id e8-20020a170902b78800b001b6740207d2sm3561794pls.215.2023.07.28.06.38.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 06:38:34 -0700 (PDT) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [Mantic 2/6] UBUNTU: [Packaging] Remove meaningless $(header_arch) Date: Fri, 28 Jul 2023 22:38:13 +0900 Message-Id: <20230728133817.893883-2-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230728133817.893883-1-masahiro.yamada@canonical.com> References: <20230728133817.893883-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" $(build_arch) and $(header_arch) are always the same. As far as I know, there is no situation where 'make headers_install' uses a different ARCH=. Signed-off-by: Masahiro Yamada --- debian.master/rules.d/amd64.mk | 1 - debian.master/rules.d/arm64.mk | 1 - debian.master/rules.d/armhf.mk | 1 - debian.master/rules.d/i386.mk | 1 - debian.master/rules.d/ppc64el.mk | 1 - debian.master/rules.d/riscv64.mk | 1 - debian.master/rules.d/s390x.mk | 1 - debian.master/rules.d/x32.mk | 1 - debian/rules.d/2-binary-arch.mk | 2 +- 9 files changed, 1 insertion(+), 9 deletions(-) diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index afed3e50966b..a005382134aa 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -1,6 +1,5 @@ human_arch = 64 bit x86 build_arch = x86 -header_arch = $(build_arch) defconfig = defconfig flavours = generic build_image = bzImage diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk index d215e1bda1fe..3306ccfce186 100644 --- a/debian.master/rules.d/arm64.mk +++ b/debian.master/rules.d/arm64.mk @@ -1,6 +1,5 @@ human_arch = ARMv8 build_arch = arm64 -header_arch = arm64 defconfig = defconfig flavours = generic generic-64k build_image = Image.gz diff --git a/debian.master/rules.d/armhf.mk b/debian.master/rules.d/armhf.mk index 87abb7cc6570..3a1303c4f12a 100644 --- a/debian.master/rules.d/armhf.mk +++ b/debian.master/rules.d/armhf.mk @@ -1,6 +1,5 @@ human_arch = ARM (hard float) build_arch = arm -header_arch = arm defconfig = defconfig flavours = generic build_image = zImage diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk index c2e41a076823..a9327adb7052 100644 --- a/debian.master/rules.d/i386.mk +++ b/debian.master/rules.d/i386.mk @@ -1,6 +1,5 @@ human_arch = 32 bit x86 build_arch = i386 -header_arch = $(build_arch) defconfig = defconfig flavours = generic build_image = bzImage diff --git a/debian.master/rules.d/ppc64el.mk b/debian.master/rules.d/ppc64el.mk index 786e7beae016..2ceed4eaba9d 100644 --- a/debian.master/rules.d/ppc64el.mk +++ b/debian.master/rules.d/ppc64el.mk @@ -1,6 +1,5 @@ human_arch = PowerPC 64el build_arch = powerpc -header_arch = $(build_arch) defconfig = pseries_le_defconfig flavours = generic build_image = vmlinux.strip diff --git a/debian.master/rules.d/riscv64.mk b/debian.master/rules.d/riscv64.mk index 425537f83142..2fa468ae8c1e 100644 --- a/debian.master/rules.d/riscv64.mk +++ b/debian.master/rules.d/riscv64.mk @@ -1,6 +1,5 @@ human_arch = RISC-V build_arch = riscv -header_arch = $(build_arch) defconfig = defconfig flavours = generic build_image = Image diff --git a/debian.master/rules.d/s390x.mk b/debian.master/rules.d/s390x.mk index 4569e6e94a2e..c8675a41cd31 100644 --- a/debian.master/rules.d/s390x.mk +++ b/debian.master/rules.d/s390x.mk @@ -1,6 +1,5 @@ human_arch = System 390x build_arch = s390 -header_arch = $(build_arch) defconfig = defconfig flavours = generic build_image = bzImage diff --git a/debian.master/rules.d/x32.mk b/debian.master/rules.d/x32.mk index 84918880e252..fc6c4179a67e 100644 --- a/debian.master/rules.d/x32.mk +++ b/debian.master/rules.d/x32.mk @@ -1,6 +1,5 @@ human_arch = 64 bit x86 (32 bit userspace) build_arch = x86 -header_arch = $(build_arch) defconfig = defconfig flavours = build_image = bzImage diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 182ad2afa554..1f77a787000e 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -551,7 +551,7 @@ headers_dir := $(CURDIR)/debian/linux-libc-dev hmake := $(MAKE) -C $(CURDIR) O=$(headers_tmp) \ INSTALL_HDR_PATH=$(headers_tmp)/install \ - SHELL="$(SHELL)" ARCH=$(header_arch) + SHELL="$(SHELL)" ARCH=$(build_arch) .PHONY: install-arch-headers install-arch-headers: From patchwork Fri Jul 28 13:38: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: 1814297 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=sqbDajPO; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RC7yP45fKz20G0 for ; Fri, 28 Jul 2023 23:38:52 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qPNg5-0001Zk-49; Fri, 28 Jul 2023 13:38:45 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qPNfy-0001Vi-TW for kernel-team@lists.ubuntu.com; Fri, 28 Jul 2023 13:38:38 +0000 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 600833F078 for ; Fri, 28 Jul 2023 13:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1690551517; bh=ZVs35hW+5CqafFauOkYNLKjAY3s7KFn++cb2B7X2Sm4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sqbDajPOxqGLd7DMloiaTamR2/hFCfenI1AUu4fCLQO1/jpyoSqQljijtQTUZL2nZ 9vktGVHLoZbN5ROTvxyuQE+4Erud5Q+VIRoaSLXkSsDPvytIAhV3ehMx/1BqJbXkZH pOqkGssNMu0Fd1SQpiWvbtSXk6OmkNXEM3WpuHsDyrm4t0MxSfKzG7I2c9LI+G2yQ4 mBtFy+pHq8WypbwuihCmChyzBWv/2JZASEfUqaerXyYZmxPwNXx9BRvfhQkwqF87Mm 3sCAp6wDGQWdT649sI2x4rbpk7CisxlC5G8jspAci9pOo/xPhErLrcAkl3WHrJYea2 zSsDeNRS6ZELg== Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-1bb962ada0dso13359805ad.2 for ; Fri, 28 Jul 2023 06:38:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690551516; x=1691156316; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZVs35hW+5CqafFauOkYNLKjAY3s7KFn++cb2B7X2Sm4=; b=KW4eE1RDyh11Ev1DAFVl8dcIhXDQSAyftJ+6ebsQSyYBY1+QPReOxDNyGcoV6fzVuK in8P5YeK3NFvGf/4lQAKWKZ/vReVfJA8QGbOap0RHupeNuqOm0VOKgaT4KIxhw0HSWNf Fhec2pnU66jfsoUTCBTxEoAa/wVq+ksK4/us0zHgHpb/ktshBVCiPtuWWza5BqFdr/48 7hBY0xnQ0m/+nMqhb4xDA8ZRXa24J8Nw6iuaIuWnpnTyAk3r3mSZWf1DdiflgaQOh9Dl MqTxq0PELwqtLwNzP+0GsizxleX4f85ySJXDyFQ0gtko8QMSbbgtY2I13fFqjmL+Iq8z 80Yw== X-Gm-Message-State: ABy/qLbkic/RI/93UF8dB+l0T5QKHo0O1RvkkDQYUN3gsMnKjIhPoFg/ 2vXMLj6VNCXUe9Y+fbGAy/eSHbVCI/hmwIPA4JA1GZxuU/x5b+QnvhlHjZo0zDOjzzCBJyI2YEO GHfo+8kNGGweQ9BFX7MruHvReMQ057DZUwbDXjFk0aHyZmMcF8w== X-Received: by 2002:a17:902:ea05:b0:1bb:809d:ae72 with SMTP id s5-20020a170902ea0500b001bb809dae72mr1303091plg.33.1690551515906; Fri, 28 Jul 2023 06:38:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlFEjv5dBcaPUTzB/yIDHyzlwI3LKX/rQHKE3Ds4UflCNj+UZLbm0YAKeaMKWre9nhh0DB7ZXw== X-Received: by 2002:a17:902:ea05:b0:1bb:809d:ae72 with SMTP id s5-20020a170902ea0500b001bb809dae72mr1303074plg.33.1690551515503; Fri, 28 Jul 2023 06:38:35 -0700 (PDT) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1002]) by smtp.gmail.com with ESMTPSA id e8-20020a170902b78800b001b6740207d2sm3561794pls.215.2023.07.28.06.38.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 06:38:35 -0700 (PDT) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [Mantic 3/6] UBUNTU: [Packaging] Fix File exists error in install-arch-headers Date: Fri, 28 Jul 2023 22:38:14 +0900 Message-Id: <20230728133817.893883-3-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230728133817.893883-1-masahiro.yamada@canonical.com> References: <20230728133817.893883-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Our debian build scripts only work in a pristine source tree. If you build the packages second time, the following code mkdir $(headers_dir)/usr/include/$(DEB_HOST_MULTIARCH) ... will fail with this message: mkdir: cannot create directory '...': File exists Irrespective of the error, $(headers_dir) should be removed because garbage files from the previous build might be remaining. Signed-off-by: Masahiro Yamada --- debian/rules.d/2-binary-arch.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 1f77a787000e..7af0287b6535 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -561,7 +561,7 @@ install-arch-headers: ifeq ($(do_libc_dev_package),true) dh_prep -plinux-libc-dev endif - rm -rf $(headers_tmp) + rm -rf $(headers_tmp) $(headers_dir) install -d $(headers_tmp) $(headers_dir)/usr/include/ $(hmake) $(conc_level) headers_install ( cd $(headers_tmp)/install/include/ && \ From patchwork Fri Jul 28 13:38:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1814295 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=G+vHe6Vh; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RC7yP42jnz20Fy for ; Fri, 28 Jul 2023 23:38:52 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qPNg1-0001XI-KC; Fri, 28 Jul 2023 13:38:41 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qPNg0-0001Wd-5t for kernel-team@lists.ubuntu.com; Fri, 28 Jul 2023 13:38:40 +0000 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 5379A3F078 for ; Fri, 28 Jul 2023 13:38:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1690551519; bh=xmfW4kbG6eNE+2AtFjMY4AHx2M5Cg/id8rwh07/3K8k=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=G+vHe6VhVpNvbXJnSw5IRKTGq2RWExnvX8XDeHtq9Jja8IpNB2Q0fZ6b5ff89I4Bf zFeSQLJNsrM723Oenga/vS6kqe0jo+ZijTHdtmmPkDRjoUdOnxwo2qZTNd5C1wzvRx cyl/W7H9p0bEB0me4/wsy8qhxeaQSTR0l3Pv2s37HC4vZUOcuL0Hjp0vpJOAVOjVAJ Ja1bEaqGor52ayakiLt0omlNavdVvpSp/A2w6hmJkO0fq6V9nVvomn078M7Ba8TrPm sTIbHANOjmmPn4zw9zOHmVFWf1fbGkrKKPSnF6DWxKOtQ15Gmz/6vCoj9E7Q3o0vtm NWtCmKG0WKV9w== Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-1bbcbba5af8so21077875ad.0 for ; Fri, 28 Jul 2023 06:38:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690551517; x=1691156317; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xmfW4kbG6eNE+2AtFjMY4AHx2M5Cg/id8rwh07/3K8k=; b=JP8119+M/15omeZdbpJ4ptrHt2TnqIr2+3fOli2QBFdA2s/kqHNixA/j9dmsl1iftw 5mfnY+bEIuuLKeloIcIAkbWrwTJmJ/8YIMn6M00BHMkG//1mtkk09znBjQcpf/am0PRZ PjE2TpQW2BLG2RrqrQ+Tjhtjco5Uz9Td0oBhJcOBg5SVkeAjuGM0vk3dgugEgx9+YFY+ /4QbPGNvzTX0Dc22qz7vyieiFBH7ye7MZbnclJIwrgPAvuLFkP+7RexFBGH0XfwA/6XP V/nomC/HDZY1gMZjtpwECsUSgbSYo4ZniyCTJnEXZnI7MKxvZD26z+RFB9SIPUaTyWWc HmdA== X-Gm-Message-State: ABy/qLYBbtlI1QUeHmiMRRy4cBbmgIgdBhNLnNnkfMdXo68EmBhcE1f+ tQWtW3Z9gHraqgt9GzjKAANg20lDwXAccALXBwhEkFK78SqJUP8Lq4s/TkiA7gdE0dPNMdhRAzX pYcFtfYosANwLe086iO5G01+8UFtqmDrEAWQ2wfPNo9uq9PG4CQ== X-Received: by 2002:a17:902:9a8e:b0:1bb:bc6d:466 with SMTP id w14-20020a1709029a8e00b001bbbc6d0466mr1721017plp.48.1690551516976; Fri, 28 Jul 2023 06:38:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlEmXFpzpyW5fG3YROGlesMAO1ONnNZXncQadensnuZlDc+rYVnmU08r6x860u1FqBDZMt0enQ== X-Received: by 2002:a17:902:9a8e:b0:1bb:bc6d:466 with SMTP id w14-20020a1709029a8e00b001bbbc6d0466mr1720993plp.48.1690551516648; Fri, 28 Jul 2023 06:38:36 -0700 (PDT) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1002]) by smtp.gmail.com with ESMTPSA id e8-20020a170902b78800b001b6740207d2sm3561794pls.215.2023.07.28.06.38.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 06:38:36 -0700 (PDT) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [Mantic 4/6] UBUNTU: [Packaging] clean debian/linux-* directories Date: Fri, 28 Jul 2023 22:38:15 +0900 Message-Id: <20230728133817.893883-4-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230728133817.893883-1-masahiro.yamada@canonical.com> References: <20230728133817.893883-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 'rm -rf $(DEBIAN)/linux-*' does not clean up anything because the staging directories are created in debian/, not in debian.*/. Fix it to 'rm -rf debian/linux-*/'. The trailing slash is needed because the regular files debian/linux*.{service,udev,upstart} are check-in. Signed-off-by: Masahiro Yamada --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 99d91078f7db..b78aff60ce24 100755 --- a/debian/rules +++ b/debian/rules @@ -138,7 +138,7 @@ clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs. rm -rf $(DEBIAN)/abi/$(release)-$(revision) rm -rf $(builddir) rm -f $(stampdir)/stamp-* - rm -rf $(DEBIAN)/linux-* + rm -rf debian/linux-*/ cp $(DEBIAN)/changelog debian/changelog From patchwork Fri Jul 28 13:38:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1814299 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=iGhl6Tuz; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RC7yP4j2yz20G1 for ; Fri, 28 Jul 2023 23:38:52 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qPNg5-0001aL-E2; Fri, 28 Jul 2023 13:38:45 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qPNg0-0001Wc-AT for kernel-team@lists.ubuntu.com; Fri, 28 Jul 2023 13:38:40 +0000 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 6760E3F18E for ; Fri, 28 Jul 2023 13:38:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1690551519; bh=NMia085kUns/fgaeqJMSbRxevsXdmTPAYLd3pbYmx5A=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iGhl6TuzXc9bv2AvFtyLVfRrNKN8mooH0TaFEvgQ6vhZXH0BvDM/l2xUErYVapuji stlvs9hcaTWr8zyjhWq/QChkyJldrlb/A7tXUC7onD1spkI8hPGtKBa7dYX9xYiLVE 1OlmMkZaI4pQUSzA5VUT91JjCn8i8KeLT4NrjbYd6ddM3d6bbuuLDLzKiQmutx6OZx GrI64Pct+GQbxN0fDalLQZ75RFwBpvew3fctcQq8v8y21dxybJNMYOKrsxu1GNindn izLX19tYhHn/qmAfSVMgDN38AvPny8UIh9vMRaYw5NuVvok79xvluMACJia0O0FDeb UmOL+iMIUmxBg== Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-1bbac333f2cso14332245ad.1 for ; Fri, 28 Jul 2023 06:38:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690551518; x=1691156318; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NMia085kUns/fgaeqJMSbRxevsXdmTPAYLd3pbYmx5A=; b=jpH6/pLSMa5T3MU7vxslFXOKe3NMlbwNvwmoRl6RGzNMI5N80gbcpc8j6yUk1KoizH JZiu6a34djSi7T++C7w0efJnMTTfw6scg+twpRz9nZzVHsBh/p19oL19d/E1KTNmmRGn 6AXTwT/PjQlhoepZlHD9458/Lc8dEzIXMpNowdYUdedi5JjtE4PoCgIRMcUWKrifma/y AwmybLqWqmbH3OJEd2lYLEglMxN1kUVOyfyjeRZ9+uSj0RZHnpqiJ2m1NKYR6+biwfLx D7FyPQ/90tHHmQT+uNvcoT1qS5Fc5bZ1iNfTXZ356cTRehh14TlYS4GsPOJhiSDR/YRl GB0A== X-Gm-Message-State: ABy/qLYeLrmRshF5AgM3YRwQLwub7uyGtpQ5MRdiW+4s54zRvtS5QWDo DzPCmBB8H/DR+xx4aJncStfXZRPviJtR8o8L5RBwqNRLMd1TmyoLIeS0KRODqAS1JVVf47zazcB 0BHzSdFUoSKeR7DGXq0UEcUL3Z91EIsqgo4AfNUsgZ1SLq/XM9w== X-Received: by 2002:a17:902:ec89:b0:1b3:8862:9823 with SMTP id x9-20020a170902ec8900b001b388629823mr1524302plg.28.1690551517965; Fri, 28 Jul 2023 06:38:37 -0700 (PDT) X-Google-Smtp-Source: APBJJlH82t3AAyBlUjuGb3xhzGtAKgOZ7Yadd5g2ffQRMHP/veqz5PiwDmy2MiqzuH2jK8CP99Ma+A== X-Received: by 2002:a17:902:ec89:b0:1b3:8862:9823 with SMTP id x9-20020a170902ec8900b001b388629823mr1524285plg.28.1690551517682; Fri, 28 Jul 2023 06:38:37 -0700 (PDT) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1002]) by smtp.gmail.com with ESMTPSA id e8-20020a170902b78800b001b6740207d2sm3561794pls.215.2023.07.28.06.38.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 06:38:37 -0700 (PDT) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [Mantic 5/6] UBUNTU: [Packaging] remove hmake Date: Fri, 28 Jul 2023 22:38:16 +0900 Message-Id: <20230728133817.893883-5-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230728133817.893883-1-masahiro.yamada@canonical.com> References: <20230728133817.893883-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" There is no good reason to use a different variable only for 'make headers_install'. Just use $(kmake) like the other targets. Signed-off-by: Masahiro Yamada --- debian/rules.d/2-binary-arch.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 7af0287b6535..4242875fe71b 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -549,10 +549,6 @@ endif headers_tmp := $(CURDIR)/debian/tmp-headers headers_dir := $(CURDIR)/debian/linux-libc-dev -hmake := $(MAKE) -C $(CURDIR) O=$(headers_tmp) \ - INSTALL_HDR_PATH=$(headers_tmp)/install \ - SHELL="$(SHELL)" ARCH=$(build_arch) - .PHONY: install-arch-headers install-arch-headers: @echo Debug: $@ @@ -563,7 +559,7 @@ ifeq ($(do_libc_dev_package),true) endif rm -rf $(headers_tmp) $(headers_dir) install -d $(headers_tmp) $(headers_dir)/usr/include/ - $(hmake) $(conc_level) headers_install + $(kmake) O=$(headers_tmp) INSTALL_HDR_PATH=$(headers_tmp)/install $(conc_level) headers_install ( cd $(headers_tmp)/install/include/ && \ find . -name '.' -o -name '.*' -prune -o -print | \ cpio -pvd --preserve-modification-time \ From patchwork Fri Jul 28 13:38:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1814298 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=JW/yaIHs; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RC7yP3r4qz1ydx for ; Fri, 28 Jul 2023 23:38:52 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qPNg2-0001Xe-QM; Fri, 28 Jul 2023 13:38:42 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qPNg0-0001X5-Qu for kernel-team@lists.ubuntu.com; Fri, 28 Jul 2023 13:38:40 +0000 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 91A9C3F078 for ; Fri, 28 Jul 2023 13:38:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1690551520; bh=9CVzV27Yt4DCVdKVzQljk3MMd23yPvag5HgcwRDWT28=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JW/yaIHsP8Oo7oMgMCPKlLCbXK+tLQpFy9qyCLkaCSKT/yz7AvfVzHIlTz4nJddOf JKfPE+ZJ8yI7XmkrDtG/BhI57Elrvm2IOJuNKidLQN188GB/kwd+FFW5CT3FhObQS2 PS1Hz+tkn4Us8XebaUFyiBJ9pg3bX9w2DaQyIoDjNvOj+Bc3H9adx0tMzSR3inc7rR 0Ssp2MLmW9tGYPwLoCaYICV+2NlcLjWibnCl3mRA4OQ39IPrA0KGHxpwi0nIRdRF/b WjABJQ+AMJJSxI8OQMfihWWDoFoP5OTquARda/WnM1y67XMsp96JxftRwnFRw30bw/ x+I2t0jIZNSZA== Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-1bb83eb84e5so19307545ad.1 for ; Fri, 28 Jul 2023 06:38:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690551519; x=1691156319; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9CVzV27Yt4DCVdKVzQljk3MMd23yPvag5HgcwRDWT28=; b=PZSl9OiEkgzAqNZ9gsdrNcvIE6hWH5saADx6ZcEhozH/OQK3KJB6dMxjM5siDK34aW jtlkoSb4UKwr2oKtf8+sXbxDSxvEQUNC7kAJqzDW7BcGFZeRRjphewfHqi9HTtlPq/bL e25w4dVFoyO42B2emVsFlMyd6L16bHg8JMMxyMHMpn+O4rJ5yCCoQtDcEL0V9A0EzQEf 0vZJaZT182owPAaIuVIhvk/AwHxMOlY6UQoIm3cj+tnyxuczPR1Ky18MTIuezKEbSTLG ho7+0MNNQk3gkGlJL+VapqWQL2ERPAPM5QG1Ui11s2ntYTG8xELtdZFFPokwBo9R3B31 fp2A== X-Gm-Message-State: ABy/qLapBLd+2l+DS4NhQcy/jzNrM1b7/4Bxfrgxo+TK4+LjADCYN/qF Q8oC+vDMCD0cSqwSs6acPMqORzhqxT+QKIdSmgpWAwbmkXzIRFi035DENbfAWYHuOK0i3gK4iKq 2k7KyC0QJ5FkJTXsMODBgmCa1fjYhrIoerfVWafPDhjpQBKSoxw== X-Received: by 2002:a17:903:444:b0:1b8:b29e:b47b with SMTP id iw4-20020a170903044400b001b8b29eb47bmr1644444plb.44.1690551519135; Fri, 28 Jul 2023 06:38:39 -0700 (PDT) X-Google-Smtp-Source: APBJJlGcQemNgyrm6eKbyyLnRY9OZfQOFTBvhDfROvCiqDq2hxoOTczplGlTt4aRuH8pk6th3hUZWg== X-Received: by 2002:a17:903:444:b0:1b8:b29e:b47b with SMTP id iw4-20020a170903044400b001b8b29eb47bmr1644429plb.44.1690551518796; Fri, 28 Jul 2023 06:38:38 -0700 (PDT) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1002]) by smtp.gmail.com with ESMTPSA id e8-20020a170902b78800b001b6740207d2sm3561794pls.215.2023.07.28.06.38.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 06:38:38 -0700 (PDT) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [Mantic 6/6] UBUNTU: [Packaging] install headers to debian/linux-libc-dev directly Date: Fri, 28 Jul 2023 22:38:17 +0900 Message-Id: <20230728133817.893883-6-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230728133817.893883-1-masahiro.yamada@canonical.com> References: <20230728133817.893883-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" The header installation is somewhat complex; 'make headers_install' installs headers to debian/tmp-headers, then cpio copies them to debian/linux-libc-dev, pruning '.*' files. My best guess for the reason of this indirection is to avoid garbage files contained in the packages. In fact, "make headers_install" used to create dot files '.install' and '.check' in the install destination. Since Linux 5.3 (or more specifically since commit 59b2bd05f5f4), headers_install does not install any dot files. Specify the final destination to INSTALL_HDR_PATH, and you can get clean installation. Signed-off-by: Masahiro Yamada --- I submitted a similar patch before: https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/lunar/commit/?id=a5ddd0de7d8b2159fc5f8df55527e0e447328953 I made a dumb mistake, and broke linux-libc-dev package. https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2009355 This time, I tested that the linux-libc-dev still has the same content. debian/rules.d/2-binary-arch.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 4242875fe71b..53fbb55c198a 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -558,12 +558,7 @@ ifeq ($(do_libc_dev_package),true) dh_prep -plinux-libc-dev endif rm -rf $(headers_tmp) $(headers_dir) - install -d $(headers_tmp) $(headers_dir)/usr/include/ - $(kmake) O=$(headers_tmp) INSTALL_HDR_PATH=$(headers_tmp)/install $(conc_level) headers_install - ( cd $(headers_tmp)/install/include/ && \ - find . -name '.' -o -name '.*' -prune -o -print | \ - cpio -pvd --preserve-modification-time \ - $(headers_dir)/usr/include/ ) + $(kmake) O=$(headers_tmp) INSTALL_HDR_PATH=$(headers_dir)/usr $(conc_level) headers_install mkdir $(headers_dir)/usr/include/$(DEB_HOST_MULTIARCH) mv $(headers_dir)/usr/include/asm $(headers_dir)/usr/include/$(DEB_HOST_MULTIARCH)/ rm -rf $(headers_tmp)