[PATCH 1/4] mmdebstrap: Make use of defined variables

[Andreas Naumann]

Signed-off-by: Andreas Naumann <anau...@emlix.com>
---
meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
index 931f6f138e..42d99756a1 100644
--- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
+++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
@@ -106,12 +106,12 @@ do_bootstrap() {
if [ -z "${BASE_REPO_KEY}" ]; then
line="[trusted=yes] ${line}"
fi
- echo "deb ${line}" > "${WORKDIR}/sources.list.d/base-apt.list"
+ echo "deb ${line}" > "$bootstrap_list"
line="copy://$base_apt_tmp/${BASE_DISTRO} ${BASE_DISTRO_CODENAME} main"
if [ -z "${BASE_REPO_KEY}" ]; then
line="[trusted=yes] ${line}"
fi
- echo "deb-src ${line}" >> "${WORKDIR}/sources.list.d/base-apt.list"
+ echo "deb-src ${line}" >> "$bootstrap_list"

# no need to sync /var/cache/apt/archives if base-apt used
syncin='echo skip sync-in'
@@ -137,8 +137,7 @@ do_bootstrap() {
deb_dl_dir_import "${WORKDIR}/dl_dir" "${BOOTSTRAP_BASE_DISTRO}-${BASE_DISTRO_CODENAME}"

bootstrap_list="${WORKDIR}/sources.list.d/bootstrap.list"
- install -v -m644 "${APTSRCS}" \
- "${WORKDIR}/sources.list.d/bootstrap.list"
+ install -v -m644 "${APTSRCS}" "$bootstrap_list"

syncin='flock -s ${DEB_DL_LOCK} cp -n --no-preserve=owner \
"${WORKDIR}/dl_dir/var/cache/apt/archives/"*.deb \
--
2.43.0