packages: prevent occurring the error when directory exists
PATCH 1/1 packages: prevent occurring the error when directory exists
Add -p argument that ignore that specified directory already exists.
Signed-off-by Bartosz Bilas <[email protected]>
--- package/luarocks/luarocks.mk | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- package/systemd/systemd.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
package/luarocks/luarocks.mk +1 -1
@@ -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
package/syslog-ng/syslog-ng.mk +1 -1
@@ -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 at .service.d + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/syslog-ng at .service.d printf '[Install]\nDefaultInstance=default\n' \ >$(TARGET_DIR)/usr/lib/systemd/system/syslog-ng at .service.d/buildroot-default-instance.conf endef
package/systemd/systemd.mk +2 -2
@@ -576,7 +576,7 @@ ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) # * enable serial-getty at 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 at .service.d; \ + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/getty at .service.d; \ printf '[Install]\nDefaultInstance=\n' \ >$(TARGET_DIR)/usr/lib/systemd/system/getty at .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 at .service.d/buildroot-console.conf; \ else \ - mkdir $(TARGET_DIR)/usr/lib/systemd/system/serial-getty at .service.d;\ + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/serial-getty at .service.d;\ printf '[Install]\nDefaultInstance=%s\n' \ $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) \ >$(TARGET_DIR)/usr/lib/systemd/system/serial-getty at .service.d/buildroot-console.conf;\
Signature · 1 line
2.29.2
Yann E. MORIN
AppliedPATCH 1/1 packages: prevent occurring the error when directory exists
Bartosz, All,
On 2020-11-16 13:30 +0100, Bartosz Bilas spake thusly:
Quoted 3 lines
Add -p argument that ignore that specified directory already exists.
Signed-off-by Bartosz Bilas <[email protected]>
I've split this into three patches, one for each affected package. Additionally, I changed the luarocks package to use $(INSTALL) rather than the combination of "mkdir -p + cp".
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 61 lines
--- package/luarocks/luarocks.mk | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- package/systemd/systemd.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)package/luarocks/luarocks.mk +1
-1@@ -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_EXTRACTpackage/syslog-ng/syslog-ng.mk +1
-1@@ -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 at .service.d + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/syslog-ng at .service.d printf '[Install]\nDefaultInstance=default\n' \ >$(TARGET_DIR)/usr/lib/systemd/system/syslog-ng at .service.d/buildroot-default-instance.conf endefpackage/systemd/systemd.mk +2
-2@@ -576,7 +576,7 @@ ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) # * enable serial-getty at 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 at .service.d; \ + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/getty at .service.d; \ printf '[Install]\nDefaultInstance=\n' \ >$(TARGET_DIR)/usr/lib/systemd/system/getty at .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 at .service.d/buildroot-console.conf; \ else \ - mkdir $(TARGET_DIR)/usr/lib/systemd/system/serial-getty at .service.d;\ + mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/serial-getty at .service.d;\ printf '[Install]\nDefaultInstance=%s\n' \ $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) \ >$(TARGET_DIR)/usr/lib/systemd/system/serial-getty at .service.d/buildroot-console.conf;\Signature · 6 lines
2.29.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'