From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] Makefile: remove cpe-updates on clean
Date: Mon, 17 May 2021 22:45:53 +0200 [thread overview]
Message-ID: <20210517204553.GI2506@scaer> (raw)
In-Reply-To: <20210516124237.489609-1-yann.morin.1998@free.fr>
All,
On 2021-05-16 14:42 +0200, Yann E. MORIN spake thusly:
> Commit fd7312940aef (Makefile: add new missing-cpe target) added the
> rule to generate a set of files to update the NVD.
>
> For an in-tree build, 'make clean' remove the output directory, so
> those files are removed. But for an out-of-tree build, the output
> directory is not removed, so those files still linger around after a
> clean.
>
> Explicitly remove them on clean, to cater for both cases.
>
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Cc: Matthew Weber <matthew.weber@rockwellcollins.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> Makefile | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 75ef7f5eb5..c3305f46e9 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -229,6 +229,8 @@ LEGAL_MANIFEST_CSV_HOST = $(LEGAL_INFO_DIR)/host-manifest.csv
> LEGAL_WARNINGS = $(LEGAL_INFO_DIR)/.warnings
> LEGAL_REPORT = $(LEGAL_INFO_DIR)/README
>
> +CPE_UPDATES_DIR = $(BASE_DIR)/cpe-updates
> +
> BR2_CONFIG = $(CONFIG_DIR)/.config
>
> # Pull in the user's configuration file
> @@ -947,11 +949,11 @@ pkg-stats:
>
> .PHONY: missing-cpe
> missing-cpe:
> - $(Q)mkdir -p $(O)/cpe-updates
> + $(Q)mkdir -p $(CPE_UPDATES_DIR)
> $(Q)cd "$(CONFIG_DIR)" ; \
> $(TOPDIR)/support/scripts/gen-missing-cpe \
> --nvd-path $(DL_DIR)/buildroot-nvd \
> - --output $(O)/cpe-updates
> + --output $(CPE_UPDATES_DIR)
>
> else # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
>
> @@ -1087,7 +1089,7 @@ printvars:
> clean:
> rm -rf $(BASE_TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) $(HOST_DIR_SYMLINK) \
> $(BUILD_DIR) $(BASE_DIR)/staging \
> - $(LEGAL_INFO_DIR) $(GRAPHS_DIR) $(PER_PACKAGE_DIR)
> + $(LEGAL_INFO_DIR) $(GRAPHS_DIR) $(PER_PACKAGE_DIR) $(CPE_UPDATES_DIR)
>
> .PHONY: distclean
> distclean: clean
> --
> 2.25.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
prev parent reply other threads:[~2021-05-17 20:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-16 12:42 [Buildroot] [PATCH] Makefile: remove cpe-updates on clean Yann E. MORIN
2021-05-17 15:43 ` Weber, Matthew L Collins
2021-05-17 20:43 ` Thomas Petazzoni
2021-05-17 20:45 ` Yann E. MORIN [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210517204553.GI2506@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox