Commit 0b20d0fc authored by Stephan's avatar Stephan
Browse files

increase bmxd wd timestamp diff; build.sh:fix copying specific files

parent 9ea34b4f
Pipeline #1675 passed with stages
in 92 minutes and 5 seconds
......@@ -73,6 +73,7 @@
"selector-config":"18.06", # used to select config
"selector-feeds":"18.06", # used to select feeds
"selector-patches":"18.06", # used to select patches
"selector-files":"18.06",
"feeds" : [
{"type":"src-link", "name":"ddmesh_own", "src":"feeds-own" },
{"type":"src-git", "name":"packages", "src":"https://git.openwrt.org/feed/packages.git", "rev":"de3766173"},
......@@ -90,6 +91,7 @@
"selector-config":"18.06", # used to select config
"selector-feeds":"18.06", # used to select feeds
"selector-patches":"18.06", # used to select patches
"selector-files":"18.06",
"feeds" : [
{"type":"src-link", "name":"ddmesh_own", "src":"feeds-own" },
{"type":"src-git", "name":"packages", "src":"https://git.openwrt.org/feed/packages.git", "rev":"de3766173"},
......@@ -153,6 +155,7 @@
"selector-config":"18.06", # used to select config
"selector-feeds":"18.06", # used to select feeds
"selector-patches":"18.06", # used to select patches
"selector-files":"18.06",
"feeds" : [
{"type":"src-link", "name":"ddmesh_own", "src":"feeds-own" },
{"type":"src-git", "name":"packages", "src":"https://git.openwrt.org/feed/packages.git", "rev":"de3766173"},
......
......@@ -529,15 +529,17 @@ setup_buildroot ()
rm -f $buildroot/dl
ln -s ../../$openwrt_dl_dir $buildroot/dl
# -------- common files -----------
# copy common files first
echo -e "$C_PURPLE copy rootfs $C_NONE: $C_GREEN common $C_NONE"
echo -e "${C_PURPLE}copy rootfs ${C_NONE}: ${C_GREEN} common ${C_NONE}"
rm -rf $buildroot/files
mkdir -p $buildroot/files
cp -a $RUN_DIR/files/common/* $buildroot/files/
# -------- specific files -----------
# copy specific files over (may overwrite common)
echo -e "$C_PURPLE copy specific files $C_NONE: $C_GREEN $firmware_files $C_NONE"
test -d "$RUN_DIR/files/$firmware_files)" && cp -a $RUN_DIR/files/$firmware_files/* $buildroot/files/
echo -e "${C_PURPLE}copy specific files ${C_NONE}: ${C_GREEN}${firmware_files}${C_NONE}"
test -d "$RUN_DIR/files/$firmware_files" && cp -a $RUN_DIR/files/$firmware_files/* $buildroot/files/
echo -e $C_PURPLE"create rootfs/etc/built_info file"$C_NONE
mkdir -p $buildroot/files/etc
......@@ -712,7 +714,6 @@ do
test -z "$filterred" && continue
if [ "$_TERM" = "1" ]; then
echo $progress_counter $progress_max
show_progress $progress_counter $progress_max
progress_counter=$(( $progress_counter + 1 ))
echo ""
......
......@@ -131,7 +131,7 @@ case "$ARG1" in
# watchdog timestamp check: bmxd present as process, but dead
# or present as zombi process "[bmxd]"
# devel: run "bmxd -lcd4&" more than 12 times will create this situation
MAX_BMXD_TIME=120
MAX_BMXD_TIME=300
cur=$(date '+%s')
wd=$cur # default,keep diff small after start
......
......@@ -131,7 +131,7 @@ case "$ARG1" in
# watchdog timestamp check: bmxd present as process, but dead
# or present as zombi process "[bmxd]"
# devel: run "bmxd -lcd4&" more than 12 times will create this situation
MAX_BMXD_TIME=120
MAX_BMXD_TIME=300
cur=$(date '+%s')
wd=$cur # default,keep diff small after start
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment