From c281a64cbaa252ecd618a99343e0ffaa09ecd5f3 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 17 Sep 2018 00:37:53 +0100 Subject: [PATCH] [ppc64el] udeb: Fix relative #include filenames in module lists (fixes FTBFS) --- debian/changelog | 2 ++ debian/installer/modules/ppc64el/ata-modules | 2 +- debian/installer/modules/ppc64el/btrfs-modules | 2 +- debian/installer/modules/ppc64el/cdrom-core-modules | 2 +- debian/installer/modules/ppc64el/crc-modules | 2 +- debian/installer/modules/ppc64el/crypto-dm-modules | 2 +- debian/installer/modules/ppc64el/crypto-modules | 2 +- debian/installer/modules/ppc64el/event-modules | 2 +- debian/installer/modules/ppc64el/ext4-modules | 2 +- debian/installer/modules/ppc64el/fancontrol-modules | 2 +- debian/installer/modules/ppc64el/fat-modules | 2 +- debian/installer/modules/ppc64el/firewire-core-modules | 2 +- debian/installer/modules/ppc64el/fuse-modules | 2 +- debian/installer/modules/ppc64el/hypervisor-modules | 2 +- debian/installer/modules/ppc64el/input-modules | 2 +- debian/installer/modules/ppc64el/isofs-modules | 2 +- debian/installer/modules/ppc64el/jfs-modules | 2 +- debian/installer/modules/ppc64el/loop-modules | 2 +- debian/installer/modules/ppc64el/md-modules | 2 +- debian/installer/modules/ppc64el/mouse-modules | 2 +- debian/installer/modules/ppc64el/multipath-modules | 2 +- debian/installer/modules/ppc64el/nbd-modules | 2 +- debian/installer/modules/ppc64el/nic-modules | 2 +- debian/installer/modules/ppc64el/nic-shared-modules | 2 +- debian/installer/modules/ppc64el/ppp-modules | 2 +- debian/installer/modules/ppc64el/sata-modules | 2 +- debian/installer/modules/ppc64el/scsi-core-modules | 2 +- debian/installer/modules/ppc64el/scsi-modules | 2 +- debian/installer/modules/ppc64el/serial-modules | 2 +- debian/installer/modules/ppc64el/squashfs-modules | 2 +- debian/installer/modules/ppc64el/udf-modules | 2 +- debian/installer/modules/ppc64el/uinput-modules | 2 +- debian/installer/modules/ppc64el/usb-modules | 2 +- debian/installer/modules/ppc64el/usb-serial-modules | 2 +- debian/installer/modules/ppc64el/usb-storage-modules | 2 +- debian/installer/modules/ppc64el/virtio-modules | 2 +- debian/installer/modules/ppc64el/xfs-modules | 2 +- 37 files changed, 38 insertions(+), 36 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7671cbed7..69421a45f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,8 @@ linux (4.19~rc4-1~exp1) UNRELEASED; urgency=medium * Revert "Revert "net: increase fragment memory usage limits"", as 4.19 includes a better fix for CVE-2018-5391 * debian/patches: Add Forwarded fields to several patches + * [ppc64el] udeb: Fix relative #include filenames in module lists (fixes + FTBFS) -- Ben Hutchings Mon, 10 Sep 2018 22:25:53 +0100 diff --git a/debian/installer/modules/ppc64el/ata-modules b/debian/installer/modules/ppc64el/ata-modules index 77a471d2f..03599667e 100644 --- a/debian/installer/modules/ppc64el/ata-modules +++ b/debian/installer/modules/ppc64el/ata-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/ata-modules" +#include "../ppc64/ata-modules" diff --git a/debian/installer/modules/ppc64el/btrfs-modules b/debian/installer/modules/ppc64el/btrfs-modules index 4ab00bed8..1d9d7d86f 100644 --- a/debian/installer/modules/ppc64el/btrfs-modules +++ b/debian/installer/modules/ppc64el/btrfs-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/btrfs-modules" +#include "../ppc64/btrfs-modules" diff --git a/debian/installer/modules/ppc64el/cdrom-core-modules b/debian/installer/modules/ppc64el/cdrom-core-modules index ab06dbd9b..4e22480aa 100644 --- a/debian/installer/modules/ppc64el/cdrom-core-modules +++ b/debian/installer/modules/ppc64el/cdrom-core-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/cdrom-core-modules" +#include "../ppc64/cdrom-core-modules" diff --git a/debian/installer/modules/ppc64el/crc-modules b/debian/installer/modules/ppc64el/crc-modules index faf2d628d..6adf710ee 100644 --- a/debian/installer/modules/ppc64el/crc-modules +++ b/debian/installer/modules/ppc64el/crc-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/crc-modules" +#include "../ppc64/crc-modules" diff --git a/debian/installer/modules/ppc64el/crypto-dm-modules b/debian/installer/modules/ppc64el/crypto-dm-modules index 2c530b3d4..f00e29325 100644 --- a/debian/installer/modules/ppc64el/crypto-dm-modules +++ b/debian/installer/modules/ppc64el/crypto-dm-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/crypto-dm-modules" +#include "../ppc64/crypto-dm-modules" diff --git a/debian/installer/modules/ppc64el/crypto-modules b/debian/installer/modules/ppc64el/crypto-modules index c6170b1d3..1d84b7f90 100644 --- a/debian/installer/modules/ppc64el/crypto-modules +++ b/debian/installer/modules/ppc64el/crypto-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/crypto-modules" +#include "../ppc64/crypto-modules" diff --git a/debian/installer/modules/ppc64el/event-modules b/debian/installer/modules/ppc64el/event-modules index b0e5f5626..e4a33897e 100644 --- a/debian/installer/modules/ppc64el/event-modules +++ b/debian/installer/modules/ppc64el/event-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/event-modules" +#include "../ppc64/event-modules" diff --git a/debian/installer/modules/ppc64el/ext4-modules b/debian/installer/modules/ppc64el/ext4-modules index ac5f4c066..b145b0d96 100644 --- a/debian/installer/modules/ppc64el/ext4-modules +++ b/debian/installer/modules/ppc64el/ext4-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/ext4-modules" +#include "../ppc64/ext4-modules" diff --git a/debian/installer/modules/ppc64el/fancontrol-modules b/debian/installer/modules/ppc64el/fancontrol-modules index 55cde68ad..c3ace7562 100644 --- a/debian/installer/modules/ppc64el/fancontrol-modules +++ b/debian/installer/modules/ppc64el/fancontrol-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/fancontrol-modules" +#include "../ppc64/fancontrol-modules" diff --git a/debian/installer/modules/ppc64el/fat-modules b/debian/installer/modules/ppc64el/fat-modules index 9ef0e07a2..016d97275 100644 --- a/debian/installer/modules/ppc64el/fat-modules +++ b/debian/installer/modules/ppc64el/fat-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/fat-modules" +#include "../ppc64/fat-modules" diff --git a/debian/installer/modules/ppc64el/firewire-core-modules b/debian/installer/modules/ppc64el/firewire-core-modules index 30b2c4c7c..5a7791fe8 100644 --- a/debian/installer/modules/ppc64el/firewire-core-modules +++ b/debian/installer/modules/ppc64el/firewire-core-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/firewire-core-modules" +#include "../ppc64/firewire-core-modules" diff --git a/debian/installer/modules/ppc64el/fuse-modules b/debian/installer/modules/ppc64el/fuse-modules index 73597f9e7..c90a988b2 100644 --- a/debian/installer/modules/ppc64el/fuse-modules +++ b/debian/installer/modules/ppc64el/fuse-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/fuse-modules" +#include "../ppc64/fuse-modules" diff --git a/debian/installer/modules/ppc64el/hypervisor-modules b/debian/installer/modules/ppc64el/hypervisor-modules index f2edc4b77..2c8e7d824 100644 --- a/debian/installer/modules/ppc64el/hypervisor-modules +++ b/debian/installer/modules/ppc64el/hypervisor-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/hypervisor-modules" +#include "../ppc64/hypervisor-modules" diff --git a/debian/installer/modules/ppc64el/input-modules b/debian/installer/modules/ppc64el/input-modules index e4625ac77..94d6a1174 100644 --- a/debian/installer/modules/ppc64el/input-modules +++ b/debian/installer/modules/ppc64el/input-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/input-modules" +#include "../ppc64/input-modules" diff --git a/debian/installer/modules/ppc64el/isofs-modules b/debian/installer/modules/ppc64el/isofs-modules index 18fb993d2..ff9a9e5cb 100644 --- a/debian/installer/modules/ppc64el/isofs-modules +++ b/debian/installer/modules/ppc64el/isofs-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/isofs-modules" +#include "../ppc64/isofs-modules" diff --git a/debian/installer/modules/ppc64el/jfs-modules b/debian/installer/modules/ppc64el/jfs-modules index 193513f5f..86a502bda 100644 --- a/debian/installer/modules/ppc64el/jfs-modules +++ b/debian/installer/modules/ppc64el/jfs-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/jfs-modules" +#include "../ppc64/jfs-modules" diff --git a/debian/installer/modules/ppc64el/loop-modules b/debian/installer/modules/ppc64el/loop-modules index fac3d38d4..2373df643 100644 --- a/debian/installer/modules/ppc64el/loop-modules +++ b/debian/installer/modules/ppc64el/loop-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/loop-modules" +#include "../ppc64/loop-modules" diff --git a/debian/installer/modules/ppc64el/md-modules b/debian/installer/modules/ppc64el/md-modules index 03b10183f..be97ac8b0 100644 --- a/debian/installer/modules/ppc64el/md-modules +++ b/debian/installer/modules/ppc64el/md-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/md-modules" +#include "../ppc64/md-modules" diff --git a/debian/installer/modules/ppc64el/mouse-modules b/debian/installer/modules/ppc64el/mouse-modules index 163e3bab0..fecdd47a4 100644 --- a/debian/installer/modules/ppc64el/mouse-modules +++ b/debian/installer/modules/ppc64el/mouse-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/mouse-modules" +#include "../ppc64/mouse-modules" diff --git a/debian/installer/modules/ppc64el/multipath-modules b/debian/installer/modules/ppc64el/multipath-modules index cb7afcb65..d6965bdb8 100644 --- a/debian/installer/modules/ppc64el/multipath-modules +++ b/debian/installer/modules/ppc64el/multipath-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/multipath-modules" +#include "../ppc64/multipath-modules" diff --git a/debian/installer/modules/ppc64el/nbd-modules b/debian/installer/modules/ppc64el/nbd-modules index 6540c0af6..9037d8f63 100644 --- a/debian/installer/modules/ppc64el/nbd-modules +++ b/debian/installer/modules/ppc64el/nbd-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/nbd-modules" +#include "../ppc64/nbd-modules" diff --git a/debian/installer/modules/ppc64el/nic-modules b/debian/installer/modules/ppc64el/nic-modules index f8c5bb011..5af435ef4 100644 --- a/debian/installer/modules/ppc64el/nic-modules +++ b/debian/installer/modules/ppc64el/nic-modules @@ -1,4 +1,4 @@ -#include "../../../ppc64/modules/ppc64/nic-modules" +#include "../ppc64/nic-modules" airport - ehea - diff --git a/debian/installer/modules/ppc64el/nic-shared-modules b/debian/installer/modules/ppc64el/nic-shared-modules index 13812a869..c8ff13b12 100644 --- a/debian/installer/modules/ppc64el/nic-shared-modules +++ b/debian/installer/modules/ppc64el/nic-shared-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/nic-shared-modules" +#include "../ppc64/nic-shared-modules" diff --git a/debian/installer/modules/ppc64el/ppp-modules b/debian/installer/modules/ppc64el/ppp-modules index 626201967..212615220 100644 --- a/debian/installer/modules/ppc64el/ppp-modules +++ b/debian/installer/modules/ppc64el/ppp-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/ppp-modules" +#include "../ppc64/ppp-modules" diff --git a/debian/installer/modules/ppc64el/sata-modules b/debian/installer/modules/ppc64el/sata-modules index 6907d272e..92f711ac9 100644 --- a/debian/installer/modules/ppc64el/sata-modules +++ b/debian/installer/modules/ppc64el/sata-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/sata-modules" +#include "../ppc64/sata-modules" diff --git a/debian/installer/modules/ppc64el/scsi-core-modules b/debian/installer/modules/ppc64el/scsi-core-modules index dd496f79b..b764c2b2e 100644 --- a/debian/installer/modules/ppc64el/scsi-core-modules +++ b/debian/installer/modules/ppc64el/scsi-core-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/scsi-core-modules" +#include "../ppc64/scsi-core-modules" diff --git a/debian/installer/modules/ppc64el/scsi-modules b/debian/installer/modules/ppc64el/scsi-modules index da4567b84..da5091e04 100644 --- a/debian/installer/modules/ppc64el/scsi-modules +++ b/debian/installer/modules/ppc64el/scsi-modules @@ -1,3 +1,3 @@ -#include "../../../ppc64/modules/ppc64/scsi-modules" +#include "../ppc64/scsi-modules" ps3rom - diff --git a/debian/installer/modules/ppc64el/serial-modules b/debian/installer/modules/ppc64el/serial-modules index 22548f450..111ebcd6d 100644 --- a/debian/installer/modules/ppc64el/serial-modules +++ b/debian/installer/modules/ppc64el/serial-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/serial-modules" +#include "../ppc64/serial-modules" diff --git a/debian/installer/modules/ppc64el/squashfs-modules b/debian/installer/modules/ppc64el/squashfs-modules index 8c0c6d1c2..557d0d204 100644 --- a/debian/installer/modules/ppc64el/squashfs-modules +++ b/debian/installer/modules/ppc64el/squashfs-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/squashfs-modules" +#include "../ppc64/squashfs-modules" diff --git a/debian/installer/modules/ppc64el/udf-modules b/debian/installer/modules/ppc64el/udf-modules index 9ab96e026..c7471ab0b 100644 --- a/debian/installer/modules/ppc64el/udf-modules +++ b/debian/installer/modules/ppc64el/udf-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/udf-modules" +#include "../ppc64/udf-modules" diff --git a/debian/installer/modules/ppc64el/uinput-modules b/debian/installer/modules/ppc64el/uinput-modules index 3d3929e24..4a3898f13 100644 --- a/debian/installer/modules/ppc64el/uinput-modules +++ b/debian/installer/modules/ppc64el/uinput-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/uinput-modules" +#include "../ppc64/uinput-modules" diff --git a/debian/installer/modules/ppc64el/usb-modules b/debian/installer/modules/ppc64el/usb-modules index 45ac3cf89..a113185a2 100644 --- a/debian/installer/modules/ppc64el/usb-modules +++ b/debian/installer/modules/ppc64el/usb-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/usb-modules" +#include "../ppc64/usb-modules" diff --git a/debian/installer/modules/ppc64el/usb-serial-modules b/debian/installer/modules/ppc64el/usb-serial-modules index 63a8412e7..c7fe81a40 100644 --- a/debian/installer/modules/ppc64el/usb-serial-modules +++ b/debian/installer/modules/ppc64el/usb-serial-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/usb-serial-modules" +#include "../ppc64/usb-serial-modules" diff --git a/debian/installer/modules/ppc64el/usb-storage-modules b/debian/installer/modules/ppc64el/usb-storage-modules index 1679b922b..43d2811a9 100644 --- a/debian/installer/modules/ppc64el/usb-storage-modules +++ b/debian/installer/modules/ppc64el/usb-storage-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/usb-storage-modules" +#include "../ppc64/usb-storage-modules" diff --git a/debian/installer/modules/ppc64el/virtio-modules b/debian/installer/modules/ppc64el/virtio-modules index cbfbd1137..9a32c3dd7 100644 --- a/debian/installer/modules/ppc64el/virtio-modules +++ b/debian/installer/modules/ppc64el/virtio-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/virtio-modules" +#include "../ppc64/virtio-modules" diff --git a/debian/installer/modules/ppc64el/xfs-modules b/debian/installer/modules/ppc64el/xfs-modules index 5e8a7ce69..3431331e9 100644 --- a/debian/installer/modules/ppc64el/xfs-modules +++ b/debian/installer/modules/ppc64el/xfs-modules @@ -1 +1 @@ -#include "../../../ppc64/modules/ppc64/xfs-modules" +#include "../ppc64/xfs-modules"