Skip to content

Commit 0bca4bc

Browse files
committed
noble test
. Signed-off-by: JeanTracker <[email protected]>
1 parent 6fb4886 commit 0bca4bc

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

.github/workflows/docker-publish-rootfs.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,6 @@ jobs:
1414
matrix:
1515
target:
1616
[
17-
xenial_x64,
18-
xenial_arm64,
19-
xenial_armhf,
20-
bionic_x64,
21-
bionic_arm64,
22-
bionic_armhf,
23-
focal_x64,
24-
focal_arm64,
25-
focal_armhf,
26-
jammy_x64,
27-
jammy_arm64,
28-
jammy_armhf,
2917
noble_x64,
3018
noble_arm64,
3119
noble_armhf,

build.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,18 +127,19 @@ esac
127127

128128
if [ "$CROSS" -eq 1 ]
129129
then
130-
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"
130+
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"
131131
else
132132
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"
133133
fi
134134

135-
if [ -n "${QEMU+x}" ] && [ "$CROSS" -eq 1 ]; then
136-
docker exec -t $1 bash -c "update-binfmts --enable $QEMU"
137-
fi
138-
139135
# Install essential packages
140136
docker exec -t $1 sudo bash -c "cd / && schroot -c source:$CHROOT -u root -- apt-get install -y apt-transport-https ca-certificates"
141137

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

144145
echo "export CHROOT=$CHROOT" > buildinfo

0 commit comments

Comments
 (0)