Fix libssh changes
This accounts for b10d49d761
(upstream switching from `libssh2` to `libssh` in 4.1+).
This commit is contained in:
parent
b2041b33b9
commit
dee71cdf29
|
@ -47,7 +47,7 @@ RUN set -eux; \
|
|||
libpixman-1-dev \
|
||||
libpng-dev \
|
||||
libseccomp-dev \
|
||||
libssh2-1-dev \
|
||||
libssh-dev \
|
||||
libusb-1.0-0-dev \
|
||||
libusbredirparser-dev \
|
||||
libxen-dev \
|
||||
|
@ -110,7 +110,7 @@ RUN set -eux; \
|
|||
--enable-kvm \
|
||||
--enable-libiscsi \
|
||||
--enable-libnfs \
|
||||
--enable-libssh2 \
|
||||
--enable-libssh \
|
||||
--enable-libusb \
|
||||
--enable-linux-aio \
|
||||
--enable-linux-user \
|
||||
|
|
|
@ -47,7 +47,7 @@ RUN set -eux; \
|
|||
libpixman-1-dev \
|
||||
libpng-dev \
|
||||
libseccomp-dev \
|
||||
libssh2-1-dev \
|
||||
libssh-dev \
|
||||
libusb-1.0-0-dev \
|
||||
libusbredirparser-dev \
|
||||
libxen-dev \
|
||||
|
@ -110,7 +110,7 @@ RUN set -eux; \
|
|||
--enable-kvm \
|
||||
--enable-libiscsi \
|
||||
--enable-libnfs \
|
||||
--enable-libssh2 \
|
||||
--enable-libssh \
|
||||
--enable-libusb \
|
||||
--enable-linux-aio \
|
||||
--enable-linux-user \
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
set -Eeuo pipefail
|
||||
|
||||
declare -A aliases=(
|
||||
[4.1-rc]='rc'
|
||||
[4.0]='4 latest'
|
||||
[3.1]='3'
|
||||
[2.12]='2'
|
||||
)
|
||||
|
||||
self="$(basename "$BASH_SOURCE")"
|
||||
|
|
10
update.sh
10
update.sh
|
@ -35,4 +35,14 @@ for version in "${versions[@]}"; do
|
|||
-e 's!%%QEMU_URL%%!'"$url"'!g' \
|
||||
Dockerfile.template > "$version/Dockerfile"
|
||||
cp -a start-qemu *.patch "$version/"
|
||||
|
||||
case "$rcVersion" in
|
||||
# https://github.com/qemu/qemu/commit/b10d49d7619e4957b4b971f816661b57e5061d71
|
||||
3.0 | 3.1 | 4.0)
|
||||
sed -ri \
|
||||
-e 's/libssh-dev/libssh2-1-dev/g' \
|
||||
-e 's/--enable-libssh/--enable-libssh2/g' \
|
||||
"$version/Dockerfile"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
|
Loading…
Reference in New Issue
Block a user