From 8010e4c0f2906d56923ec522aa0042008b98306b Mon Sep 17 00:00:00 2001 From: Ole Petter Date: Tue, 4 May 2021 06:19:38 +0200 Subject: [PATCH] Scope the deb_name references Changelog: None Signed-off-by: Ole Petter --- mender-convert-modify | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mender-convert-modify b/mender-convert-modify index 1ea2311..c05a8ca 100755 --- a/mender-convert-modify +++ b/mender-convert-modify @@ -116,12 +116,12 @@ if [ "${MENDER_CLIENT_INSTALL}" = "y" ]; then deb_name=$(deb_from_repo_pool_get "work/deb-packages" ${MENDER_APT_REPO_URL} ${deb_arch} "mender-client" "${MENDER_CLIENT_VERSION}${DEBIAN_REVISION}") fi -fi + deb_extract_package "work/deb-packages/${deb_name}" "work/rootfs/" -deb_extract_package "work/deb-packages/${deb_name}" "work/rootfs/" + # Save installed client version for tests in Yocto variable format + testscfg_add "PREFERRED_VERSION_mender-client" "$(echo ${deb_name} | sed -r 's/.*_([0-9]+\.[0-9]+\.[0-9]+).*/\1/')" -# Save installed client version for tests in Yocto variable format -testscfg_add "PREFERRED_VERSION_mender-client" "$(echo ${deb_name} | sed -r 's/.*_([0-9]+\.[0-9]+\.[0-9]+).*/\1/')" +fi if [ "${MENDER_ENABLE_SYSTEMD}" == "y" ]; then run_and_log_cmd "sudo ln -sf /lib/systemd/system/mender-client.service \