From fbe535f1c375f06c9e104599ae0dde2a4ae1fba9 Mon Sep 17 00:00:00 2001 From: Karol Lewandowski Date: Mon, 4 Apr 2022 20:31:08 +0200 Subject: [PATCH] Move all scripts to one standard location This commit changes installation of the upgrade scripts to /usr/libexec/upgrade-support, so that - delta generation scripts can copy whole directory contents instead of needing to follow each change in script's file names - other packages can potentially install additional scripts Change-Id: I89357f31ef738d1860ff4b90cf1bf559096f4d68 --- packaging/tota-ua.spec | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/packaging/tota-ua.spec b/packaging/tota-ua.spec index 432c3c2..d579508 100755 --- a/packaging/tota-ua.spec +++ b/packaging/tota-ua.spec @@ -1,6 +1,8 @@ +%define upgrade_scripts_dir %{_libexecdir}/upgrade-support + Name: tota-ua Summary: fota update agent -Version: 1.2.9 +Version: 1.3 Release: 0 Group: System License: Apache-2.0 @@ -52,10 +54,9 @@ make %{?jobs:-j%jobs} mkdir -p %{buildroot}%{tota_ua_list_dir} cp scripts/40-tota-ua.list %{buildroot}%{tota_ua_list_dir}/40-tota-ua.list -install -m 755 scripts/upgrade-trigger.sh %{buildroot}%{_bindir} -install -m 755 scripts/upgrade-partial.sh %{buildroot}%{_bindir} -install -m 755 scripts/upgrade-prepare-partitions.sh %{buildroot}%{_bindir} -install -m 755 scripts/upgrade-fota.sh %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{upgrade_scripts_dir} +install -m 755 scripts/*.sh scripts/*.inc %{buildroot}%{upgrade_scripts_dir} + %define fota_dir /opt/usr/data/fota mkdir -p %{buildroot}%{fota_dir} mkdir -p %{buildroot}%{img_verifier_root_ca_dir} @@ -71,12 +72,13 @@ mkdir -p %{buildroot}%{img_verifier_root_ca_dir} %attr(775, root, system_fw) %{fota_dir} %defattr(-,root,root,-) %{_bindir}/delta.ua -%{_bindir}/upgrade-trigger.sh -%{_bindir}/upgrade-partial.sh -%{_bindir}/upgrade-prepare-partitions.sh -%{_bindir}/upgrade-fota.sh -%{_bindir}/upgrade-full.sh -%{_bindir}/upgrade-common.inc +%{upgrade_scripts_dir}/upgrade-trigger.sh +%{upgrade_scripts_dir}/upgrade-partial.sh +%{upgrade_scripts_dir}/upgrade-prepare-partitions.sh +%{upgrade_scripts_dir}/upgrade-fota.sh +%{upgrade_scripts_dir}/upgrade-full.sh +%{upgrade_scripts_dir}/upgrade-legacy.sh +%{upgrade_scripts_dir}/upgrade-common.inc %attr(700,-,-) %{tota_ua_list_dir}/40-tota-ua.list -- 2.7.4