From patchwork Sun May 16 12:42:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1479026 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=gpNEUBYf; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FjhkS2twlz9sW1 for ; Sun, 16 May 2021 22:42:54 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 6017C60733; Sun, 16 May 2021 12:42:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QGQAanPqT78T; Sun, 16 May 2021 12:42:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 0A5546072E; Sun, 16 May 2021 12:42:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 342BC1BF232 for ; Sun, 16 May 2021 12:42:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 22CC14033F for ; Sun, 16 May 2021 12:42:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R_QG-_pkgpTs for ; Sun, 16 May 2021 12:42:43 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by smtp4.osuosl.org (Postfix) with ESMTPS id 312F540413 for ; Sun, 16 May 2021 12:42:43 +0000 (UTC) Received: by mail-wr1-x42c.google.com with SMTP id a4so3640864wrr.2 for ; Sun, 16 May 2021 05:42:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HXeBx709+tveEKWT/fq9XNG1rOjqARBD/bujnzPNmD4=; b=gpNEUBYfl7c8b1TfKrl4QKi8KD4dve9M0tDluLDk6KqNO8HvaDu/9LAInTyyB8PFmT CN18+aH/nqEk19Rsmlz8vsWnre/0Cy7FPs03jnPbUyFQPIOmCWamsWCwbY32Annf0JDa YG2O/9DJlU5XBvYw1e7iXnCyvzRG/2OhpBC8RqRQuR8DuaPFxWJCiq3U4x4dgDlXLdRk vv2rYI30TejkZjAKbnZ6S1oXQwyYl6tMPG1bNjXhfb7PNWq30dglHOg5pqZ/D8prOL0P szh2DgJ1Q9bce8lmPVBRz0SnxsUP6MZCKVRN0g8VmJDPGkpxRqUrFTCzetZA7FoMkx5l MAzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=HXeBx709+tveEKWT/fq9XNG1rOjqARBD/bujnzPNmD4=; b=UW/3m5tRtmSI3coptqD3Ctj425F7yk2dgw9cC2IeC7q4p/eepWZlBeIQwfdLNoSeyX RSg9zk8ttkmNNtKJh01wC/8UxWdwZ26OWOHX9Z0Va/2XixF7YkMI4r7yqKZcSYGfrjnQ 3E60mbITAKLdz3/l4rj9lcPj0s3c6qY/2T9LwX1ZyPoyiFonvyjGmQbuJqGUZEldyLay asX5qM/zOOxAAsyHyx2c5NwSMIzFqSw2CBjYh2tGmpx3J1wgqdTxc/HfdkG/PnULD8lz C6ijkDK8a+XU9hy8ckrvWxUHkZCXwP8I7ehQYoG56RTmT3zP4Hi8wBwqNsmi3wIgLAuJ 1ZrQ== X-Gm-Message-State: AOAM531rDAXqm0hsCZm1D0eu3QzR0OCVeDtoYOG+Ji74PWlBMRPc6Kwh ke/7eTNbF+zWT3xLcJAvWTF54mkfQpU= X-Google-Smtp-Source: ABdhPJw47oV5BePuBjOz8l11sr4ztYyq2hF5aIjOhWD+G9+XRWGTdLwF2ZRuuxey5oLMCOgX+tEhog== X-Received: by 2002:a5d:6803:: with SMTP id w3mr6005011wru.285.1621168961458; Sun, 16 May 2021 05:42:41 -0700 (PDT) Received: from scaer.home ([2a01:cb19:8b51:cb00:78d3:2e53:9015:53f]) by smtp.gmail.com with ESMTPSA id f7sm14550489wrg.34.2021.05.16.05.42.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 May 2021 05:42:40 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 16 May 2021 14:42:37 +0200 Message-Id: <20210516124237.489609-1-yann.morin.1998@free.fr> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] Makefile: remove cpe-updates on clean X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matthew Weber , "Yann E. MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Cc: Thomas Petazzoni Cc: Matthew Weber Reviewed-by: Matthew Weber Reviewed-by: Thomas Petazzoni --- 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