Message ID | 20230117-kernel-kheaders-gitignore-v2-1-1c29b3adf04a@weissschuh.net |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1766553wrn; Tue, 17 Jan 2023 05:54:23 -0800 (PST) X-Google-Smtp-Source: AMrXdXtedRx5TyQKYLdSNWrvRXhTmyrhSuGqAfHgk2TBzttUJYnGjHFFpkdWDKN6k4l7iRgpNpJO X-Received: by 2002:a50:fa94:0:b0:493:597e:2193 with SMTP id w20-20020a50fa94000000b00493597e2193mr2998560edr.37.1673963663454; Tue, 17 Jan 2023 05:54:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673963663; cv=none; d=google.com; s=arc-20160816; b=vATJuj2J6YUdP5OKaPaMdTzf+fTowHIS6MrB3T7yCUFt6Wdv/ZWaUqm0fDIgHBRyPT crikE4lx1wZx2mfvFZNkoGevw9c+VDr5iMTqULZ1T8cv5b9xCdFZRp5xYMInvJgeAkBY 5yHZ3DPSAqGJhPdZOsatVeZCvHOpYIGX5dA4SsAZHE98sxe9AwScXzQSAhih4uUyjAfQ eYqmvI5nRfVTmqGUQN0tOxTBkDdA+6kKFhifdLoUKt6d67Nd5dDZYVTlfXWBgW7dHUI8 UpCupqkYk+cJ9LWfK8PZxw8PEzbs48qK+uvP7J12gyDkNfFrEzfhUoiwUQU5JkTyLc0l zXIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:dkim-signature:from; bh=YNxXpHznV71lNm1QdbHaKOPbM4OiBlNhHTszKscGNHQ=; b=qNkzJlDaA4Mmno/5mz6ty8+H7nlJZWAm5WOZrMrJMxtav9xSFIBh9umwPE5OYjhn1g JYXFLLh0bvMTvnQ83LqL9TblKwYtv2p1c4EkKvU5YbhWChRFVX1qXwLSyTWlH2SMOJcB oNL2UcO+JqG4ds4Zy6lSj5ZK0VFOzUWD8+9huh2Rsp1WJRQP+cI6sJH5rhJKBxV6p2pt GKhRIS0YgTkTqWnG8O/JgS0fzK165VVBASzzwaie7DKfNUlRhVS8r3uoCEoakbSE2ovi xHpBYEo3uRlFH8bqNYNjgb7wutHvQyxM/7WHNQicco+5U/nYYFo9J+Uu/tkElQJMKy6c fU+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=UhqV2wpk; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q10-20020a056402518a00b0046c0f2a94dbsi40205551edd.353.2023.01.17.05.53.58; Tue, 17 Jan 2023 05:54:23 -0800 (PST) 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=fail header.i=@weissschuh.net header.s=mail header.b=UhqV2wpk; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231358AbjAQNu4 (ORCPT <rfc822;pfffrao@gmail.com> + 99 others); Tue, 17 Jan 2023 08:50:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230123AbjAQNua (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 17 Jan 2023 08:50:30 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FC0C3C287; Tue, 17 Jan 2023 05:50:19 -0800 (PST) From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= <linux@weissschuh.net> DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1673963417; bh=D+WIpPKO1tzWEKcHNm5FaPvH2YY7yBdSjW/F8oRxpfE=; h=From:Date:Subject:To:Cc:From; b=UhqV2wpkBg7JIyTo4myy4ktRyYfR06Nz8R1uF6uM1CaJgfacgKHchk/nqC27AQE0k nyQKb7JOykW7uD0xfNezJavEkYnc0orf2yXqiE8+TKTHhEvulwCIy0n6LlbIFmEXBL AjfgXNJeSrX0veqdcIF+jzQePrwEU5qW7zFMWxCg= Date: Tue, 17 Jan 2023 13:50:05 +0000 Subject: [PATCH v2] kheaders: ignore and clean temporary kheaders_data directory MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20230117-kernel-kheaders-gitignore-v2-1-1c29b3adf04a@weissschuh.net> X-B4-Tracking: v=1; b=H4sIAI2nxmMC/42NQQ6CMBBFr0K6dkxbFBJX3sOwKO1AJ5BiZgA1h LtbOYHL95L/36YEmVDUrdgU40pCU8pgT4Xy0aUegUJmZbUttTE1DMgJRxgiuoAs0NNMfZoYodO hLi/XyrdVq/K+dYLQsks+5oe0jGOWT8aO3kfw0WSOJPPEn6O/mp/9J7UaMGBd6XStsQs63F9II uLjEs8JZ9Xs+/4FvleBjtwAAAA= To: Masahiro Yamada <masahiroy@kernel.org> Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, Nicolas Schier <n.schier@avm.de>, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= <linux@weissschuh.net> X-Mailer: b4 0.12-dev-77e06 X-Developer-Signature: v=1; a=ed25519-sha256; t=1673963415; l=1408; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=D+WIpPKO1tzWEKcHNm5FaPvH2YY7yBdSjW/F8oRxpfE=; b=6UEwZKX3VGE0NwmWZA8xvqXK6JVPUgfrjVFjfJZftUB8zrOtwbUhgz2o1Z1ozyv3TTmP7lK8dvlj cmENqVniByK/lqKQGAIwu5WepMMJVngdqsdTfZM2WOY/Rho7lYxn X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755278122801811815?= X-GMAIL-MSGID: =?utf-8?q?1755278122801811815?= |
Series |
[v2] kheaders: ignore and clean temporary kheaders_data directory
|
|
Commit Message
Thomas Weißschuh
Jan. 17, 2023, 1:50 p.m. UTC
If the kheaders archive generation is interrupted then this directory
may be left.
Ignore it, it will be deleted by the next run of kernel/gen_kheaders.sh.
Also add it to clean-files so it can be cleaned up by make.
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
Changes in v2:
- Also add the directory to clean-files
- Link to v1: https://lore.kernel.org/r/20230117-kernel-kheaders-gitignore-v1-1-2a3a070efd0d@weissschuh.net
---
kernel/.gitignore | 1 +
kernel/Makefile | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---
base-commit: d532dd102151cc69fcd00b13e5a9689b23c0c8d9
change-id: 20230117-kernel-kheaders-gitignore-f0d73456cb6b
Best regards,
Comments
On Tue, Jan 17, 2023 at 10:50 PM Thomas Weißschuh <linux@weissschuh.net> wrote: > > If the kheaders archive generation is interrupted then this directory > may be left. > Ignore it, it will be deleted by the next run of kernel/gen_kheaders.sh. > Also add it to clean-files so it can be cleaned up by make. > > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Or, just rename the temporary directory. For example, cpio_dir=$outdir/$(dirname $tarfile)/.tmp_cpio_dir Dot files are ignored. 'make clean' removes the .tmp_* pattern. > --- > Changes in v2: > - Also add the directory to clean-files > - Link to v1: https://lore.kernel.org/r/20230117-kernel-kheaders-gitignore-v1-1-2a3a070efd0d@weissschuh.net > --- > kernel/.gitignore | 1 + > kernel/Makefile | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/kernel/.gitignore b/kernel/.gitignore > index c6b299a6b786..57ab1d703763 100644 > --- a/kernel/.gitignore > +++ b/kernel/.gitignore > @@ -1,3 +1,4 @@ > # SPDX-License-Identifier: GPL-2.0-only > /config_data > /kheaders.md5 > +/kheaders_data.tar.xz.tmp/ > diff --git a/kernel/Makefile b/kernel/Makefile > index 10ef068f598d..f3535944f635 100644 > --- a/kernel/Makefile > +++ b/kernel/Makefile > @@ -156,4 +156,4 @@ quiet_cmd_genikh = CHK $(obj)/kheaders_data.tar.xz > $(obj)/kheaders_data.tar.xz: FORCE > $(call cmd,genikh) > > -clean-files := kheaders_data.tar.xz kheaders.md5 > +clean-files := kheaders_data.tar.xz kheaders.md5 kheaders_data.tar.xz.tmp > > --- > base-commit: d532dd102151cc69fcd00b13e5a9689b23c0c8d9 > change-id: 20230117-kernel-kheaders-gitignore-f0d73456cb6b > > Best regards, > -- > Thomas Weißschuh <linux@weissschuh.net> > -- Best Regards Masahiro Yamada
On Tue, Jan 17, 2023 at 11:24:47PM +0900 Masahiro Yamada wrote: > On Tue, Jan 17, 2023 at 10:50 PM Thomas Weißschuh <linux@weissschuh.net> wrote: > > > > If the kheaders archive generation is interrupted then this directory > > may be left. > > Ignore it, it will be deleted by the next run of kernel/gen_kheaders.sh. > > Also add it to clean-files so it can be cleaned up by make. > > > > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> > > > Or, just rename the temporary directory. > For example, > > cpio_dir=$outdir/$(dirname $tarfile)/.tmp_cpio_dir > > > > Dot files are ignored. > 'make clean' removes the .tmp_* pattern. yes, almost unbeatable. Can we use '${tarfile%/*}' instead of '$(dirname $tarfile)'? Kind regards, Nicolas > > --- > > Changes in v2: > > - Also add the directory to clean-files > > - Link to v1: https://lore.kernel.org/r/20230117-kernel-kheaders-gitignore-v1-1-2a3a070efd0d@weissschuh.net > > --- > > kernel/.gitignore | 1 + > > kernel/Makefile | 2 +- > > 2 files changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/kernel/.gitignore b/kernel/.gitignore > > index c6b299a6b786..57ab1d703763 100644 > > --- a/kernel/.gitignore > > +++ b/kernel/.gitignore > > @@ -1,3 +1,4 @@ > > # SPDX-License-Identifier: GPL-2.0-only > > /config_data > > /kheaders.md5 > > +/kheaders_data.tar.xz.tmp/ > > diff --git a/kernel/Makefile b/kernel/Makefile > > index 10ef068f598d..f3535944f635 100644 > > --- a/kernel/Makefile > > +++ b/kernel/Makefile > > @@ -156,4 +156,4 @@ quiet_cmd_genikh = CHK $(obj)/kheaders_data.tar.xz > > $(obj)/kheaders_data.tar.xz: FORCE > > $(call cmd,genikh) > > > > -clean-files := kheaders_data.tar.xz kheaders.md5 > > +clean-files := kheaders_data.tar.xz kheaders.md5 kheaders_data.tar.xz.tmp > > > > --- > > base-commit: d532dd102151cc69fcd00b13e5a9689b23c0c8d9 > > change-id: 20230117-kernel-kheaders-gitignore-f0d73456cb6b > > > > Best regards, > > -- > > Thomas Weißschuh <linux@weissschuh.net> > > > > > -- > Best Regards > > > Masahiro Yamada
On Tue, Jan 17, 2023 at 11:24:47PM +0900, Masahiro Yamada wrote: > On Tue, Jan 17, 2023 at 10:50 PM Thomas Weißschuh <linux@weissschuh.net> wrote: > > > > If the kheaders archive generation is interrupted then this directory > > may be left. > > Ignore it, it will be deleted by the next run of kernel/gen_kheaders.sh. > > Also add it to clean-files so it can be cleaned up by make. > > > > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> > > > Or, just rename the temporary directory. > For example, > > cpio_dir=$outdir/$(dirname $tarfile)/.tmp_cpio_dir > > > > Dot files are ignored. > 'make clean' removes the .tmp_* pattern. This sounds great. Unfortunately 'make clean' only cleans files and not directories based on this pattern. Should it be extended? > > --- > > Changes in v2: > > - Also add the directory to clean-files > > - Link to v1: https://lore.kernel.org/r/20230117-kernel-kheaders-gitignore-v1-1-2a3a070efd0d@weissschuh.net > > --- > > kernel/.gitignore | 1 + > > kernel/Makefile | 2 +- > > 2 files changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/kernel/.gitignore b/kernel/.gitignore > > index c6b299a6b786..57ab1d703763 100644 > > --- a/kernel/.gitignore > > +++ b/kernel/.gitignore > > @@ -1,3 +1,4 @@ > > # SPDX-License-Identifier: GPL-2.0-only > > /config_data > > /kheaders.md5 > > +/kheaders_data.tar.xz.tmp/ > > diff --git a/kernel/Makefile b/kernel/Makefile > > index 10ef068f598d..f3535944f635 100644 > > --- a/kernel/Makefile > > +++ b/kernel/Makefile > > @@ -156,4 +156,4 @@ quiet_cmd_genikh = CHK $(obj)/kheaders_data.tar.xz > > $(obj)/kheaders_data.tar.xz: FORCE > > $(call cmd,genikh) > > > > -clean-files := kheaders_data.tar.xz kheaders.md5 > > +clean-files := kheaders_data.tar.xz kheaders.md5 kheaders_data.tar.xz.tmp > > > > --- > > base-commit: d532dd102151cc69fcd00b13e5a9689b23c0c8d9 > > change-id: 20230117-kernel-kheaders-gitignore-f0d73456cb6b > > > > Best regards, > > -- > > Thomas Weißschuh <linux@weissschuh.net>
On Wed, Jan 18, 2023 at 10:10 AM Thomas Weißschuh <linux@weissschuh.net> wrote: > > On Tue, Jan 17, 2023 at 11:24:47PM +0900, Masahiro Yamada wrote: > > On Tue, Jan 17, 2023 at 10:50 PM Thomas Weißschuh <linux@weissschuh.net> wrote: > > > > > > If the kheaders archive generation is interrupted then this directory > > > may be left. > > > Ignore it, it will be deleted by the next run of kernel/gen_kheaders.sh. > > > Also add it to clean-files so it can be cleaned up by make. > > > > > > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> > > > > > > Or, just rename the temporary directory. > > For example, > > > > cpio_dir=$outdir/$(dirname $tarfile)/.tmp_cpio_dir > > > > > > > > Dot files are ignored. > > 'make clean' removes the .tmp_* pattern. > > This sounds great. > > Unfortunately 'make clean' only cleans files and not directories based > on this pattern. Agh, you are right. Can you extend .tmp_* to match any file type? Maybe, something like this? \( -name '*.[aios]' -o [snip] '*.*.symversions' \) -type f -print -o -name '.tmp_*' -print > > Should it be extended? > > > > --- > > > Changes in v2: > > > - Also add the directory to clean-files > > > - Link to v1: https://lore.kernel.org/r/20230117-kernel-kheaders-gitignore-v1-1-2a3a070efd0d@weissschuh.net > > > --- > > > kernel/.gitignore | 1 + > > > kernel/Makefile | 2 +- > > > 2 files changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/kernel/.gitignore b/kernel/.gitignore > > > index c6b299a6b786..57ab1d703763 100644 > > > --- a/kernel/.gitignore > > > +++ b/kernel/.gitignore > > > @@ -1,3 +1,4 @@ > > > # SPDX-License-Identifier: GPL-2.0-only > > > /config_data > > > /kheaders.md5 > > > +/kheaders_data.tar.xz.tmp/ > > > diff --git a/kernel/Makefile b/kernel/Makefile > > > index 10ef068f598d..f3535944f635 100644 > > > --- a/kernel/Makefile > > > +++ b/kernel/Makefile > > > @@ -156,4 +156,4 @@ quiet_cmd_genikh = CHK $(obj)/kheaders_data.tar.xz > > > $(obj)/kheaders_data.tar.xz: FORCE > > > $(call cmd,genikh) > > > > > > -clean-files := kheaders_data.tar.xz kheaders.md5 > > > +clean-files := kheaders_data.tar.xz kheaders.md5 kheaders_data.tar.xz.tmp > > > > > > --- > > > base-commit: d532dd102151cc69fcd00b13e5a9689b23c0c8d9 > > > change-id: 20230117-kernel-kheaders-gitignore-f0d73456cb6b > > > > > > Best regards, > > > -- > > > Thomas Weißschuh <linux@weissschuh.net>
diff --git a/kernel/.gitignore b/kernel/.gitignore index c6b299a6b786..57ab1d703763 100644 --- a/kernel/.gitignore +++ b/kernel/.gitignore @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only /config_data /kheaders.md5 +/kheaders_data.tar.xz.tmp/ diff --git a/kernel/Makefile b/kernel/Makefile index 10ef068f598d..f3535944f635 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -156,4 +156,4 @@ quiet_cmd_genikh = CHK $(obj)/kheaders_data.tar.xz $(obj)/kheaders_data.tar.xz: FORCE $(call cmd,genikh) -clean-files := kheaders_data.tar.xz kheaders.md5 +clean-files := kheaders_data.tar.xz kheaders.md5 kheaders_data.tar.xz.tmp