v1.15.0 #311

Merged
muellerr merged 107 commits from develop into main 2022-10-27 11:28:49 +02:00
Showing only changes of commit f29b578cae - Show all commits

View File

@ -81,17 +81,17 @@ else
echo "-I- Installed EIVE OBSW into yocto repository successfully" echo "-I- Installed EIVE OBSW into yocto repository successfully"
fi fi
if [ ! -f ${build_dir}/${watchdog_bin_name} ]; then #if [ ! -f ${build_dir}/${watchdog_bin_name} ]; then
echo "-W- No EIVE Watchdog found to intall to yocto" # echo "-W- No EIVE Watchdog found to intall to yocto"
else #else
cp_cmd="cp $(pwd)/${build_dir}/${watchdog_bin_name} ${yocto_root}/${yocto_watchdog_path}/${watchdog_target_name}" # cp_cmd="cp $(pwd)/${build_dir}/${watchdog_bin_name} ${yocto_root}/${yocto_watchdog_path}/${watchdog_target_name}"
echo "-I- Executing: ${cp_cmd}" # echo "-I- Executing: ${cp_cmd}"
eval ${cp_cmd} # eval ${cp_cmd}
cp_ver_cmd="cp $(pwd)/${obsw_version_filename} ${yocto_root}/${yocto_watchdog_path}" # cp_ver_cmd="cp $(pwd)/${obsw_version_filename} ${yocto_root}/${yocto_watchdog_path}"
echo "-I- Executing: ${cp_ver_cmd}" # echo "-I- Executing: ${cp_ver_cmd}"
eval ${cp_ver_cmd} # eval ${cp_ver_cmd}
echo "-I- Installed EIVE watchdog into yocto repository successfully" # echo "-I- Installed EIVE watchdog into yocto repository successfully"
fi #fi
if [ -f $(pwd)/${obsw_version_filename} ]; then if [ -f $(pwd)/${obsw_version_filename} ]; then
rm $(pwd)/${obsw_version_filename} rm $(pwd)/${obsw_version_filename}