mirror of
https://github.com/FUjr/gl-infra-builder.git
synced 2025-12-16 17:15:08 +00:00
43 lines
1.1 KiB
Diff
43 lines
1.1 KiB
Diff
From 8cd986988fa56055de90c38ba6c2d2906fde28e7 Mon Sep 17 00:00:00 2001
|
|
From: Jianhui Zhao <jianhui.zhao@gl-inet.com>
|
|
Date: Mon, 26 Apr 2021 19:34:01 +0800
|
|
Subject: [PATCH 17/26] imagebuilder: files always overwrite
|
|
|
|
Signed-off-by: Jianhui Zhao <jianhui.zhao@gl-inet.com>
|
|
---
|
|
include/rootfs.mk | 11 +++++++----
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/include/rootfs.mk b/include/rootfs.mk
|
|
index f2d2494ae2..a156f5022f 100644
|
|
--- a/include/rootfs.mk
|
|
+++ b/include/rootfs.mk
|
|
@@ -61,9 +61,6 @@ ifdef CONFIG_CLEAN_IPKG
|
|
endif
|
|
|
|
define prepare_rootfs
|
|
- $(if $(2),@if [ -d '$(2)' ]; then \
|
|
- $(call file_copy,$(2)/.,$(1)); \
|
|
- fi)
|
|
@mkdir -p $(1)/etc/rc.d
|
|
@mkdir -p $(1)/var/lock
|
|
@( \
|
|
@@ -75,7 +72,13 @@ define prepare_rootfs
|
|
echo "postinst script $$script has failed with exit code $$ret" >&2; \
|
|
exit 1; \
|
|
fi; \
|
|
- done; \
|
|
+ done || true \
|
|
+ )
|
|
+ $(if $(2),@if [ -d '$(2)' ]; then \
|
|
+ $(call file_copy,$(2)/.,$(1)); \
|
|
+ fi)
|
|
+ @( \
|
|
+ cd $(1); \
|
|
for script in ./etc/init.d/*; do \
|
|
grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
|
|
if ! echo " $(3) " | grep -q " $$(basename $$script) "; then \
|
|
--
|
|
2.17.1
|
|
|