Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update QEMU to 7.2.0-1, add support for Debian 12 bookworm #27

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update QEMU to 7.2.0-1, add support for Debian 12 bookworm #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/workflows/actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
QEMU_VER: [v6.1.0-1]
QEMU_VER: [v7.2.0-1]
DOCKER_REPO: [docker.io/multiarch/debian-debootstrap]
VERSION: [sid, stretch, buster, bullseye]
VERSION: [sid, stretch, buster, bullseye, bookworm]
UNAME_ARCH: [x86_64, arm64, armel, armv7l, i386, mipsel, mips64el, ppc64el, s390x]
include:
- {ARCH: amd64, QEMU_ARCH: x86_64, UNAME_ARCH: x86_64}
Expand All @@ -22,14 +22,11 @@ jobs:
- {ARCH: mips64el, QEMU_ARCH: mipsel, UNAME_ARCH: mips64el}
- {ARCH: ppc64el, QEMU_ARCH: ppc64, UNAME_ARCH: ppc64el}
- {ARCH: s390x, QEMU_ARCH: s390x, UNAME_ARCH: s390x}
exclude:
- {VERSION: sid, UNAME_ARCH: arm64}
- {VERSION: bullseye, UNAME_ARCH: arm64}
steps:
- uses: actions/checkout@v2
- name: Build
run: |
sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu focal main universe'
sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu jammy main universe'
sudo apt-get update && sudo apt-get install -y qemu-user-static debootstrap
./update.sh -a ${{ matrix.ARCH }} -v ${{ matrix.VERSION }} -q ${{ matrix.QEMU_ARCH }} -u ${{ matrix.QEMU_VER }} -d ${{ matrix.DOCKER_REPO }} -o ${{ matrix.UNAME_ARCH }}
- name: Publish
Expand Down
9 changes: 7 additions & 2 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ shift $((OPTIND-1))
dir="$VERSION"
COMPONENTS="main"
VARIANT="minbase"
args=( -d "$dir" debootstrap --no-check-gpg --variant="$VARIANT" --components="$COMPONENTS" --include="wget" --arch="$ARCH" "$VERSION" )
if [[ "$VERSION" == "stretch" ]]; then
REPO=http://archive.debian.org/debian/
else
REPO=http://deb.debian.org/debian/
fi
args=( -d "$dir" debootstrap --no-check-gpg --variant="$VARIANT" --components="$COMPONENTS" --include="wget" --arch="$ARCH" "$VERSION" "$REPO" )

mkdir -p mkimage $dir
curl https://raw.githubusercontent.com/moby/moby/6f78b438b88511732ba4ac7c7c9097d148ae3568/contrib/mkimage.sh > mkimage.sh
Expand All @@ -42,7 +47,7 @@ mkimage="$(readlink -f "${MKIMAGE:-"mkimage.sh"}")"
echo 'https://github.com/moby/moby/blob/6f78b438b88511732ba4ac7c7c9097d148ae3568/contrib/mkimage.sh'
} > "$dir/build-command.txt"

sudo DEBOOTSTRAP="qemu-debootstrap" nice ionice -c 3 "$mkimage" "${args[@]}" 2>&1 | tee "$dir/build.log"
sudo DEBOOTSTRAP="debootstrap" nice ionice -c 3 "$mkimage" "${args[@]}" 2>&1 | tee "$dir/build.log"
cat "$dir/build.log"
sudo chown -R "$(id -u):$(id -g)" "$dir"

Expand Down