openstack/diskimage-builder
Code Issues Proposed changes

Merge "Remove qemu-debootstrap from debootstrap element"

Browse Source
This commit is contained in:
Zuul
2025-05-14 10:38:09 +00:00
committed by Gerrit Code Review
parent 46321ffb84 e61dfba9af
commit b3b0439586
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
diskimage_builder/elements/debootstrap/root.d/08-debootstrap
View File

@@ -34,8 +34,6 @@ DEBOOTSTRAP_TARBALL=$DIB_IMAGE_CACHE/debootstrap-${DISTRO_NAME}-${DIB_RELEASE}-$
http_proxy=${http_proxy:-} http_proxy=${http_proxy:-}
no_proxy=${no_proxy:-} no_proxy=${no_proxy:-}
DEBOOTSTRAP_QEMU=""
_debootstrap_version=$(debootstrap --version) _debootstrap_version=$(debootstrap --version)
# could be like "debootstrap 1.0.114~bpo16.04+1" # could be like "debootstrap 1.0.114~bpo16.04+1"
_debootstrap_version=${_debootstrap_version:16:3} _debootstrap_version=${_debootstrap_version:16:3}
@@ -57,13 +55,7 @@ else
# Have to --include=sudo for pre-install.d use of sudoers files # Have to --include=sudo for pre-install.d use of sudoers files
# Have to --include=busybox because initramfs needs it # Have to --include=busybox because initramfs needs it
if [ $(dpkg --print-architecture) != ${ARCH} ]; then sudo sh -c "http_proxy=$http_proxy no_proxy=$no_proxy debootstrap --verbose \
# Target architecture different from host architecture:
# there is the need to call 'qemu-debootstrap'.
DEBOOTSTRAP_QEMU="qemu-"
fi
sudo sh -c "http_proxy=$http_proxy no_proxy=$no_proxy ${DEBOOTSTRAP_QEMU}debootstrap --verbose \
--variant=minbase \ --variant=minbase \
--components=${DIB_DEBIAN_COMPONENTS} \ --components=${DIB_DEBIAN_COMPONENTS} \
--arch=${ARCH} \ --arch=${ARCH} \

6
releasenotes/notes/remove-qemu-debootstrap-f066e85c1ab0617e.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
fixes:
- |
Fix cross-architecture builds that use the debootstrap element by
removing use of deprecated qemu-debootstrap, in favor of using
debootstrap directly.