qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deploy missing qemu binary when adding repo key

This commit is contained in:
Jianfeng Liu 2025-07-11 09:41:16 +08:00 committed by Igor
parent 84725a77ac
commit 3a9babee14
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/functions/rootfs/distro-specific.sh
View File

@ -164,6 +164,9 @@ function create_sources_list_and_deploy_repo_key() {
APT_SIGNING_KEY_FILE="/usr/share/keyrings/armbian-archive-keyring.gpg" APT_SIGNING_KEY_FILE="/usr/share/keyrings/armbian-archive-keyring.gpg"
gpg --batch --yes --dearmor < "${SRC}"/config/armbian.key > "${basedir}${APT_SIGNING_KEY_FILE}" gpg --batch --yes --dearmor < "${SRC}"/config/armbian.key > "${basedir}${APT_SIGNING_KEY_FILE}"
# deploy the qemu binary, no matter where the rootfs came from (built or cached)
deploy_qemu_binary_to_chroot "${basedir}" "${when}" # undeployed at end of this function
# lets link to the old file as armbian-config uses it and we can't set there to new file # lets link to the old file as armbian-config uses it and we can't set there to new file
# we user force linking as some old caches still exists # we user force linking as some old caches still exists
chroot "${basedir}" /bin/bash -c "ln -fs armbian-archive-keyring.gpg /usr/share/keyrings/armbian.gpg" 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() {
chroot "${basedir}" /bin/bash -c "cat armbian.key | apt-key add - > /dev/null 2>&1" chroot "${basedir}" /bin/bash -c "cat armbian.key | apt-key add - > /dev/null 2>&1"
fi fi
# undeploy the qemu binary from the image; we don't want to ship the host's qemu in the target image
undeploy_qemu_binary_from_chroot "${basedir}" "${when}"
# Add Armbian APT repository # Add Armbian APT repository
declare -a components=() declare -a components=()
if [[ "${when}" == "image"* ]]; then # only include the 'main' component when deploying to image (early or late) if [[ "${when}" == "image"* ]]; then # only include the 'main' component when deploying to image (early or late)