Skip to content

Commit 3a9babe

Browse files
amazingfateigorpecovnik
authored andcommitted
deploy missing qemu binary when adding repo key
1 parent 84725a7 commit 3a9babe

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

lib/functions/rootfs/distro-specific.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,9 @@ function create_sources_list_and_deploy_repo_key() {
164164
APT_SIGNING_KEY_FILE="/usr/share/keyrings/armbian-archive-keyring.gpg"
165165
gpg --batch --yes --dearmor < "${SRC}"/config/armbian.key > "${basedir}${APT_SIGNING_KEY_FILE}"
166166

167+
# deploy the qemu binary, no matter where the rootfs came from (built or cached)
168+
deploy_qemu_binary_to_chroot "${basedir}" "${when}" # undeployed at end of this function
169+
167170
# lets link to the old file as armbian-config uses it and we can't set there to new file
168171
# we user force linking as some old caches still exists
169172
chroot "${basedir}" /bin/bash -c "ln -fs armbian-archive-keyring.gpg /usr/share/keyrings/armbian.gpg"
@@ -174,6 +177,9 @@ function create_sources_list_and_deploy_repo_key() {
174177
chroot "${basedir}" /bin/bash -c "cat armbian.key | apt-key add - > /dev/null 2>&1"
175178
fi
176179

180+
# undeploy the qemu binary from the image; we don't want to ship the host's qemu in the target image
181+
undeploy_qemu_binary_from_chroot "${basedir}" "${when}"
182+
177183
# Add Armbian APT repository
178184
declare -a components=()
179185
if [[ "${when}" == "image"* ]]; then # only include the 'main' component when deploying to image (early or late)

0 commit comments

Comments
 (0)