From 68fa5e71a9c2d30ad444c3827f19a23e88915b15 Mon Sep 17 00:00:00 2001 From: Christophe Priouzeau Date: Mon, 6 Jun 2022 15:33:31 +0200 Subject: [PATCH] ARCHIVER: use variable for compression choice Signed-off-by: Christophe Priouzeau Change-Id: I62783c37448b5b53957354ed43e906d30ccf2f85 --- classes/archiver_stm32mp_clean.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/classes/archiver_stm32mp_clean.bbclass b/classes/archiver_stm32mp_clean.bbclass index e1e0de0..857abc2 100644 --- a/classes/archiver_stm32mp_clean.bbclass +++ b/classes/archiver_stm32mp_clean.bbclass @@ -5,8 +5,9 @@ python archiver_clean_tarball() { import os ar_outdir = d.getVar('ARCHIVER_OUTDIR') + compression_method = d.getVarFlag('ARCHIVER_MODE', 'compression') #get tarball name - tarball_name = [f for f in listdir(ar_outdir) if f.endswith("tar.gz")] + tarball_name = [f for f in listdir(ar_outdir) if f.endswith("tar.%s" % compression_method)] tmpdir = tempfile.mkdtemp(dir=d.getVar('ARCHIVER_WORKDIR')) if tarball_name and tarball_name[0] and len(tarball_name[0]) > 0: tar = tarfile.open(os.path.join(ar_outdir,tarball_name[0])) @@ -29,7 +30,7 @@ do_ar_original[postfuncs] =+ "archiver_clean_tarball" ARCHIVER_README = "README.HOW_TO.txt" archiver_git_uri() { - ret=`echo "${SRC_URI}" | grep branch | wc -l` + ret=$(echo "${SRC_URI}" | grep branch | wc -l) if [ $ret -gt 0 ]; then BRANCH=`echo "${SRC_URI}" | sed "s|.*branch=\([^ ;]*\).*|\1|" ` else