From 0a7d8e431eccbe28499e153c6647f24899e7f1ef Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 11 May 2020 10:11:39 -0700 Subject: [PATCH] Apply workaround for https://bugs.debian.org/960271 This change comes from https://github.com/torvalds/linux/commit/467d12f5c7842896d2de3ced74e4147ee29e97c8 in the upstream kernel, and will hopefully get patched in Debian directly so we can drop this patch from our builds. --- 4.0/Dockerfile | 6 ++++++ 4.1/Dockerfile | 6 ++++++ 4.2/Dockerfile | 6 ++++++ 5.0/Dockerfile | 6 ++++++ Dockerfile.template | 6 ++++++ 5 files changed, 30 insertions(+) diff --git a/4.0/Dockerfile b/4.0/Dockerfile index 9fcfce4..444d1f8 100644 --- a/4.0/Dockerfile +++ b/4.0/Dockerfile @@ -60,6 +60,12 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ +# patch kernel headers ala https://github.com/torvalds/linux/commit/467d12f5c7842896d2de3ced74e4147ee29e97c8 +# filed in debian at https://bugs.debian.org/960271 + wget -O bits-per-long.patch 'https://github.com/torvalds/linux/commit/467d12f5c7842896d2de3ced74e4147ee29e97c8.patch'; \ + patch --input="$PWD/bits-per-long.patch" --strip=4 --directory=/usr/include/linux; \ + rm bits-per-long.patch; \ + \ tarball="$(basename "$QEMU_URL")"; \ wget -O "$tarball.sig" "$QEMU_URL.sig"; \ wget -O "$tarball" "$QEMU_URL" --progress=dot:giga; \ diff --git a/4.1/Dockerfile b/4.1/Dockerfile index 178928c..943379b 100644 --- a/4.1/Dockerfile +++ b/4.1/Dockerfile @@ -60,6 +60,12 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ +# patch kernel headers ala https://github.com/torvalds/linux/commit/467d12f5c7842896d2de3ced74e4147ee29e97c8 +# filed in debian at https://bugs.debian.org/960271 + wget -O bits-per-long.patch 'https://github.com/torvalds/linux/commit/467d12f5c7842896d2de3ced74e4147ee29e97c8.patch'; \ + patch --input="$PWD/bits-per-long.patch" --strip=4 --directory=/usr/include/linux; \ + rm bits-per-long.patch; \ + \ tarball="$(basename "$QEMU_URL")"; \ wget -O "$tarball.sig" "$QEMU_URL.sig"; \ wget -O "$tarball" "$QEMU_URL" --progress=dot:giga; \ diff --git a/4.2/Dockerfile b/4.2/Dockerfile index 6b284a1..3d11074 100644 --- a/4.2/Dockerfile +++ b/4.2/Dockerfile @@ -60,6 +60,12 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ +# patch kernel headers ala https://github.com/torvalds/linux/commit/467d12f5c7842896d2de3ced74e4147ee29e97c8 +# filed in debian at https://bugs.debian.org/960271 + wget -O bits-per-long.patch 'https://github.com/torvalds/linux/commit/467d12f5c7842896d2de3ced74e4147ee29e97c8.patch'; \ + patch --input="$PWD/bits-per-long.patch" --strip=4 --directory=/usr/include/linux; \ + rm bits-per-long.patch; \ + \ tarball="$(basename "$QEMU_URL")"; \ wget -O "$tarball.sig" "$QEMU_URL.sig"; \ wget -O "$tarball" "$QEMU_URL" --progress=dot:giga; \ diff --git a/5.0/Dockerfile b/5.0/Dockerfile index fcbf136..28d3a56 100644 --- a/5.0/Dockerfile +++ b/5.0/Dockerfile @@ -60,6 +60,12 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ +# patch kernel headers ala https://github.com/torvalds/linux/commit/467d12f5c7842896d2de3ced74e4147ee29e97c8 +# filed in debian at https://bugs.debian.org/960271 + wget -O bits-per-long.patch 'https://github.com/torvalds/linux/commit/467d12f5c7842896d2de3ced74e4147ee29e97c8.patch'; \ + patch --input="$PWD/bits-per-long.patch" --strip=4 --directory=/usr/include/linux; \ + rm bits-per-long.patch; \ + \ tarball="$(basename "$QEMU_URL")"; \ wget -O "$tarball.sig" "$QEMU_URL.sig"; \ wget -O "$tarball" "$QEMU_URL" --progress=dot:giga; \ diff --git a/Dockerfile.template b/Dockerfile.template index 67cbd48..d586f28 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -60,6 +60,12 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/*; \ \ +# patch kernel headers ala https://github.com/torvalds/linux/commit/467d12f5c7842896d2de3ced74e4147ee29e97c8 +# filed in debian at https://bugs.debian.org/960271 + wget -O bits-per-long.patch 'https://github.com/torvalds/linux/commit/467d12f5c7842896d2de3ced74e4147ee29e97c8.patch'; \ + patch --input="$PWD/bits-per-long.patch" --strip=4 --directory=/usr/include/linux; \ + rm bits-per-long.patch; \ + \ tarball="$(basename "$QEMU_URL")"; \ wget -O "$tarball.sig" "$QEMU_URL.sig"; \ wget -O "$tarball" "$QEMU_URL" --progress=dot:giga; \