From patchwork Mon Nov 16 12:30:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Bilas X-Patchwork-Id: 1400886 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=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=grinn-global.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CZT265QMYz9sSn for ; Mon, 16 Nov 2020 23:30:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E8FDE85E2B; Mon, 16 Nov 2020 12:30:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eN_vlCjuOi2d; Mon, 16 Nov 2020 12:30:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 902A985DDC; Mon, 16 Nov 2020 12:30:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0AF5F1BF41C for ; Mon, 16 Nov 2020 12:30:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 02A3186256 for ; Mon, 16 Nov 2020 12:30:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JOjOSVNUitmH for ; Mon, 16 Nov 2020 12:30:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtp2.megiteam.pl (smtp2.megiteam.pl [213.189.52.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id C93A58614D for ; Mon, 16 Nov 2020 12:30:42 +0000 (UTC) Received: from host-81-161-192-38.oxylion.net.pl ([81.161.192.38] helo=bartekk-pc.grinndev.ovh) by smtp.megiteam.pl with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86.2_XX) (envelope-from ) id 1kedeX-00027U-Pj; Mon, 16 Nov 2020 13:30:40 +0100 From: Bartosz Bilas To: buildroot@buildroot.org Date: Mon, 16 Nov 2020 13:30:35 +0100 Message-Id: <20201116123035.993106-1-b.bilas@grinn-global.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] packages: prevent occurring the error when directory exists 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: Bartosz Bilas Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add -p argument that ignore that specified directory already exists. Signed-off-by: Bartosz Bilas --- package/luarocks/luarocks.mk | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- package/systemd/systemd.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 670e7487af..a8188685d3 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -17,7 +17,7 @@ LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/luarocks/config.lua HOST_LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/luarocks/host-config.lua define LUAROCKS_ADDON_EXTRACT - mkdir $(@D)/src/luarocks/cmd/external + mkdir -p $(@D)/src/luarocks/cmd/external cp package/luarocks/buildroot.lua $(@D)/src/luarocks/cmd/external/buildroot.lua endef HOST_LUAROCKS_POST_EXTRACT_HOOKS += LUAROCKS_ADDON_EXTRACT diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index 7c2368efba..f7182ba311 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -113,7 +113,7 @@ endef # By default syslog-ng installs a .service that requires a config file at # /etc/default, so provide one with the default values. define SYSLOG_NG_INSTALL_INIT_SYSTEMD - mkdir $(TARGET_DIR)/usr/lib/systemd/system/syslog-ng@.service.d + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/syslog-ng@.service.d printf '[Install]\nDefaultInstance=default\n' \ >$(TARGET_DIR)/usr/lib/systemd/system/syslog-ng@.service.d/buildroot-default-instance.conf endef diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index cb12f667d6..ddd3f4380e 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -576,7 +576,7 @@ ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) # * enable serial-getty@xxx for other $BR2_TARGET_GENERIC_TTY_PATH # * rewrite baudrates if a baudrate is provided define SYSTEMD_INSTALL_SERVICE_TTY - mkdir $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d; \ + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d; \ printf '[Install]\nDefaultInstance=\n' \ >$(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d/buildroot-console.conf; \ if [ $(BR2_TARGET_GENERIC_GETTY_PORT) = "console" ]; \ @@ -588,7 +588,7 @@ define SYSTEMD_INSTALL_SERVICE_TTY $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) \ >$(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d/buildroot-console.conf; \ else \ - mkdir $(TARGET_DIR)/usr/lib/systemd/system/serial-getty@.service.d;\ + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/serial-getty@.service.d;\ printf '[Install]\nDefaultInstance=%s\n' \ $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) \ >$(TARGET_DIR)/usr/lib/systemd/system/serial-getty@.service.d/buildroot-console.conf;\