From a4b47e24e3dfd9278a729f937628450042ec8613 Mon Sep 17 00:00:00 2001 From: Paolo Pisati Date: Thu, 3 Feb 2022 17:18:21 +0100 Subject: [PATCH] UBUNTU: [packaging] unhook lowlatency flavours from the build Signed-off-by: Paolo Pisati --- debian.master/control.d/vars.lowlatency | 6 ------ debian.master/control.d/vars.lowlatency-64k | 6 ------ debian.master/etc/getabis | 4 ++-- debian.master/rules.d/amd64.mk | 2 +- debian.master/rules.d/arm64.mk | 2 +- debian.master/rules.d/i386.mk | 2 +- 6 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 debian.master/control.d/vars.lowlatency delete mode 100644 debian.master/control.d/vars.lowlatency-64k diff --git a/debian.master/control.d/vars.lowlatency b/debian.master/control.d/vars.lowlatency deleted file mode 100644 index fe6994e29802..000000000000 --- a/debian.master/control.d/vars.lowlatency +++ /dev/null @@ -1,6 +0,0 @@ -arch="amd64 arm64" -supported="Lowlatency" -target="Geared toward desktop and server systems." -desc="=HUMAN= SMP" -bootloader="grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [armhf arm64] | grub-efi-arm64 [arm64] | grub-efi-arm [armhf]" -provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64]" diff --git a/debian.master/control.d/vars.lowlatency-64k b/debian.master/control.d/vars.lowlatency-64k deleted file mode 100644 index 78617be9ebe4..000000000000 --- a/debian.master/control.d/vars.lowlatency-64k +++ /dev/null @@ -1,6 +0,0 @@ -arch="arm64" -supported="Lowlatency 64K pages" -target="Geared toward desktop and server systems." -desc="=HUMAN= SMP" -bootloader="grub-efi-arm64 [arm64] | flash-kernel [arm64]" -provides="kvm-api-4, redhat-cluster-modules, ivtv-modules" diff --git a/debian.master/etc/getabis b/debian.master/etc/getabis index 29b25c36405f..ac7450c8840f 100644 --- a/debian.master/etc/getabis +++ b/debian.master/etc/getabis @@ -12,7 +12,7 @@ package_prefixes linux-buildinfo getall armhf generic getall armhf generic-lpae -getall amd64 generic lowlatency -getall arm64 generic generic-64k lowlatency lowlatency-64k +getall amd64 generic +getall arm64 generic generic-64k getall ppc64el generic getall s390x generic diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index d768b5355823..2288c25a7a52 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -2,7 +2,7 @@ human_arch = 64 bit x86 build_arch = x86 header_arch = $(build_arch) defconfig = defconfig -flavours = generic lowlatency +flavours = generic build_image = bzImage kernel_file = arch/$(build_arch)/boot/bzImage install_file = vmlinuz diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk index 97bde8455127..e0415a4075ac 100644 --- a/debian.master/rules.d/arm64.mk +++ b/debian.master/rules.d/arm64.mk @@ -2,7 +2,7 @@ human_arch = ARMv8 build_arch = arm64 header_arch = arm64 defconfig = defconfig -flavours = generic generic-64k lowlatency lowlatency-64k +flavours = generic generic-64k build_image = Image.gz kernel_file = arch/$(build_arch)/boot/Image.gz install_file = vmlinuz diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk index 30c9ecb85bc2..c2e41a076823 100644 --- a/debian.master/rules.d/i386.mk +++ b/debian.master/rules.d/i386.mk @@ -2,7 +2,7 @@ human_arch = 32 bit x86 build_arch = i386 header_arch = $(build_arch) defconfig = defconfig -flavours = generic lowlatency +flavours = generic build_image = bzImage kernel_file = arch/$(build_arch)/boot/bzImage install_file = vmlinuz