Skip to content

Commit

Permalink
noble test
Browse files Browse the repository at this point in the history
.

Signed-off-by: JeanTracker <hyojoong.kim.jean@gmail.com>
  • Loading branch information
JeanTracker committed Jun 27, 2024
1 parent 6fb4886 commit 2f74c7d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 18 deletions.
12 changes: 0 additions & 12 deletions .github/workflows/docker-publish-rootfs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,6 @@ jobs:
matrix:
target:
[
xenial_x64,
xenial_arm64,
xenial_armhf,
bionic_x64,
bionic_arm64,
bionic_armhf,
focal_x64,
focal_arm64,
focal_armhf,
jammy_x64,
jammy_arm64,
jammy_armhf,
noble_x64,
noble_arm64,
noble_armhf,
Expand Down
11 changes: 6 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -127,18 +127,19 @@ esac

if [ "$CROSS" -eq 1 ]
then
docker exec -t $1 bash -c "mk-sbuild --target $HOST $DIST && sudo sed -i 's/^union-type=.*/union-type=overlay/' /etc/schroot/chroot.d/sbuild-$CHROOT && sbuild-update $CHROOT && sbuild-upgrade $CHROOT && sudo cp /usr/bin/qemu-a*-static /var/lib/schroot/chroots/$CHROOT/usr/bin"
docker exec -t $1 bash -c "mk-sbuild --arch amd64 --target $HOST $DIST && sudo sed -i 's/^union-type=.*/union-type=overlay/' /etc/schroot/chroot.d/sbuild-$CHROOT && sbuild-update $CHROOT && sbuild-upgrade $CHROOT && sudo cp /usr/bin/qemu-a*-static /var/lib/schroot/chroots/$CHROOT/usr/bin"
else
docker exec -t $1 bash -c "mk-sbuild --arch $HOST $DIST && sudo sed -i 's/^union-type=.*/union-type=overlay/' /etc/schroot/chroot.d/sbuild-$CHROOT && sbuild-update $CHROOT && sbuild-upgrade $CHROOT"
fi

if [ -n "${QEMU+x}" ] && [ "$CROSS" -eq 1 ]; then
docker exec -t $1 bash -c "update-binfmts --enable $QEMU"
fi

# Install essential packages
docker exec -t $1 sudo bash -c "cd / && schroot -c source:$CHROOT -u root -- apt-get install -y apt-transport-https ca-certificates"

# if [ -n "${QEMU+x}" ] && [ "$CROSS" -eq 1 ]; then
# docker exec -t $1 sudo bash -c "cd / && schroot -c source:$CHROOT -u root -- update-binfmts --enable $QEMU"
# fi


docker stop $1

echo "export CHROOT=$CHROOT" > buildinfo
Expand Down
2 changes: 1 addition & 1 deletion sbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ if [ ! -z "$DIRECT" ]; then
echo $RESULT
fi

sbuild --chroot $CHROOT --host $HOST -j$JOBS --dpkg-source-opt="-I.git" "$@"
sbuild --chroot $CHROOT --arch amd64 --target $HOST -j$JOBS --dpkg-source-opt="-I.git" "$@"

0 comments on commit 2f74c7d

Please sign in to comment.