| Message ID | 20210323154913.45502-1-juergh@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [Unstable] UBUNTU: [Packaging] Remove unused 'loader' variable from build rules | expand |
Acked-by: Tim Gardner <tim.gardner@canonical.com> Appears to no longer be in use. On 3/23/21 9:49 AM, Juerg Haefliger wrote: > The use of the 'loader' variable was removed back in 2017 in Bionic with > commit fbf2867282ee ("UBUNTU: [Packaging] update to Debian like control > scripts") so drop it going forward. > > Ignore: yes > Signed-off-by: Juerg Haefliger <juergh@canonical.com> > --- > debian.master/rules.d/amd64.mk | 1 - > debian.master/rules.d/arm64.mk | 1 - > debian.master/rules.d/armhf.mk | 2 -- > debian.master/rules.d/i386.mk | 1 - > debian.master/rules.d/ppc64el.mk | 1 - > debian.master/rules.d/riscv64.mk | 1 - > debian.master/rules.d/x32.mk | 1 - > 7 files changed, 8 deletions(-) > > diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk > index 7f2724c8f1ea..79654376761f 100644 > --- a/debian.master/rules.d/amd64.mk > +++ b/debian.master/rules.d/amd64.mk > @@ -6,7 +6,6 @@ flavours = generic lowlatency > build_image = bzImage > kernel_file = arch/$(build_arch)/boot/bzImage > install_file = vmlinuz > -loader = grub > vdso = vdso_install > no_dumpfile = true > uefi_signed = true > diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk > index 7f92d2c63001..f243c39e311a 100644 > --- a/debian.master/rules.d/arm64.mk > +++ b/debian.master/rules.d/arm64.mk > @@ -11,7 +11,6 @@ install_file = vmlinuz > no_dumpfile = true > uefi_signed = true > > -loader = grub > vdso = vdso_install > > do_extras_package = true > diff --git a/debian.master/rules.d/armhf.mk b/debian.master/rules.d/armhf.mk > index 085e8acdc8aa..99c49b8f42ae 100644 > --- a/debian.master/rules.d/armhf.mk > +++ b/debian.master/rules.d/armhf.mk > @@ -8,8 +8,6 @@ kernel_file = arch/$(build_arch)/boot/zImage > install_file = vmlinuz > no_dumpfile = true > > -loader = grub > - > do_tools_usbip = true > do_tools_cpupower = true > do_tools_perf = true > diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk > index a0c64b72864b..30c9ecb85bc2 100644 > --- a/debian.master/rules.d/i386.mk > +++ b/debian.master/rules.d/i386.mk > @@ -6,7 +6,6 @@ flavours = generic lowlatency > build_image = bzImage > kernel_file = arch/$(build_arch)/boot/bzImage > install_file = vmlinuz > -loader = grub > vdso = vdso_install > no_dumpfile = true > do_flavour_image_package = false > diff --git a/debian.master/rules.d/ppc64el.mk b/debian.master/rules.d/ppc64el.mk > index e2f27fc27207..1745f1e333c0 100644 > --- a/debian.master/rules.d/ppc64el.mk > +++ b/debian.master/rules.d/ppc64el.mk > @@ -7,7 +7,6 @@ build_image = vmlinux.strip > kernel_file = arch/powerpc/boot/vmlinux.strip > install_file = vmlinux > no_dumpfile = true > -loader = grub > do_extras_package = true > opal_signed = true > do_tools_usbip = true > diff --git a/debian.master/rules.d/riscv64.mk b/debian.master/rules.d/riscv64.mk > index 66c75adf329e..425537f83142 100644 > --- a/debian.master/rules.d/riscv64.mk > +++ b/debian.master/rules.d/riscv64.mk > @@ -7,7 +7,6 @@ build_image = Image > kernel_file = arch/$(build_arch)/boot/Image > install_file = vmlinuz > > -loader = grub > vdso = vdso_install > no_dumpfile = true > > diff --git a/debian.master/rules.d/x32.mk b/debian.master/rules.d/x32.mk > index e0ccff961f02..84918880e252 100644 > --- a/debian.master/rules.d/x32.mk > +++ b/debian.master/rules.d/x32.mk > @@ -6,7 +6,6 @@ flavours = > build_image = bzImage > kernel_file = arch/$(build_arch)/boot/bzImage > install_file = vmlinuz > -loader = grub > vdso = vdso_install > no_dumpfile = true > uefi_signed = true >
On Tue, Mar 23, 2021 at 04:49:13PM +0100, Juerg Haefliger wrote: > The use of the 'loader' variable was removed back in 2017 in Bionic with > commit fbf2867282ee ("UBUNTU: [Packaging] update to Debian like control > scripts") so drop it going forward. Acked-by: Paolo Pisati <paolo.pisati@canonical.com>
Applied to hirsute/5.11. Thanks, -Andrea On Tue, Mar 23, 2021 at 04:49:13PM +0100, Juerg Haefliger wrote: > The use of the 'loader' variable was removed back in 2017 in Bionic with > commit fbf2867282ee ("UBUNTU: [Packaging] update to Debian like control > scripts") so drop it going forward. > > Ignore: yes > Signed-off-by: Juerg Haefliger <juergh@canonical.com> > --- > debian.master/rules.d/amd64.mk | 1 - > debian.master/rules.d/arm64.mk | 1 - > debian.master/rules.d/armhf.mk | 2 -- > debian.master/rules.d/i386.mk | 1 - > debian.master/rules.d/ppc64el.mk | 1 - > debian.master/rules.d/riscv64.mk | 1 - > debian.master/rules.d/x32.mk | 1 - > 7 files changed, 8 deletions(-) > > diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk > index 7f2724c8f1ea..79654376761f 100644 > --- a/debian.master/rules.d/amd64.mk > +++ b/debian.master/rules.d/amd64.mk > @@ -6,7 +6,6 @@ flavours = generic lowlatency > build_image = bzImage > kernel_file = arch/$(build_arch)/boot/bzImage > install_file = vmlinuz > -loader = grub > vdso = vdso_install > no_dumpfile = true > uefi_signed = true > diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk > index 7f92d2c63001..f243c39e311a 100644 > --- a/debian.master/rules.d/arm64.mk > +++ b/debian.master/rules.d/arm64.mk > @@ -11,7 +11,6 @@ install_file = vmlinuz > no_dumpfile = true > uefi_signed = true > > -loader = grub > vdso = vdso_install > > do_extras_package = true > diff --git a/debian.master/rules.d/armhf.mk b/debian.master/rules.d/armhf.mk > index 085e8acdc8aa..99c49b8f42ae 100644 > --- a/debian.master/rules.d/armhf.mk > +++ b/debian.master/rules.d/armhf.mk > @@ -8,8 +8,6 @@ kernel_file = arch/$(build_arch)/boot/zImage > install_file = vmlinuz > no_dumpfile = true > > -loader = grub > - > do_tools_usbip = true > do_tools_cpupower = true > do_tools_perf = true > diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk > index a0c64b72864b..30c9ecb85bc2 100644 > --- a/debian.master/rules.d/i386.mk > +++ b/debian.master/rules.d/i386.mk > @@ -6,7 +6,6 @@ flavours = generic lowlatency > build_image = bzImage > kernel_file = arch/$(build_arch)/boot/bzImage > install_file = vmlinuz > -loader = grub > vdso = vdso_install > no_dumpfile = true > do_flavour_image_package = false > diff --git a/debian.master/rules.d/ppc64el.mk b/debian.master/rules.d/ppc64el.mk > index e2f27fc27207..1745f1e333c0 100644 > --- a/debian.master/rules.d/ppc64el.mk > +++ b/debian.master/rules.d/ppc64el.mk > @@ -7,7 +7,6 @@ build_image = vmlinux.strip > kernel_file = arch/powerpc/boot/vmlinux.strip > install_file = vmlinux > no_dumpfile = true > -loader = grub > do_extras_package = true > opal_signed = true > do_tools_usbip = true > diff --git a/debian.master/rules.d/riscv64.mk b/debian.master/rules.d/riscv64.mk > index 66c75adf329e..425537f83142 100644 > --- a/debian.master/rules.d/riscv64.mk > +++ b/debian.master/rules.d/riscv64.mk > @@ -7,7 +7,6 @@ build_image = Image > kernel_file = arch/$(build_arch)/boot/Image > install_file = vmlinuz > > -loader = grub > vdso = vdso_install > no_dumpfile = true > > diff --git a/debian.master/rules.d/x32.mk b/debian.master/rules.d/x32.mk > index e0ccff961f02..84918880e252 100644 > --- a/debian.master/rules.d/x32.mk > +++ b/debian.master/rules.d/x32.mk > @@ -6,7 +6,6 @@ flavours = > build_image = bzImage > kernel_file = arch/$(build_arch)/boot/bzImage > install_file = vmlinuz > -loader = grub > vdso = vdso_install > no_dumpfile = true > uefi_signed = true > -- > 2.27.0 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index 7f2724c8f1ea..79654376761f 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -6,7 +6,6 @@ flavours = generic lowlatency build_image = bzImage kernel_file = arch/$(build_arch)/boot/bzImage install_file = vmlinuz -loader = grub vdso = vdso_install no_dumpfile = true uefi_signed = true diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk index 7f92d2c63001..f243c39e311a 100644 --- a/debian.master/rules.d/arm64.mk +++ b/debian.master/rules.d/arm64.mk @@ -11,7 +11,6 @@ install_file = vmlinuz no_dumpfile = true uefi_signed = true -loader = grub vdso = vdso_install do_extras_package = true diff --git a/debian.master/rules.d/armhf.mk b/debian.master/rules.d/armhf.mk index 085e8acdc8aa..99c49b8f42ae 100644 --- a/debian.master/rules.d/armhf.mk +++ b/debian.master/rules.d/armhf.mk @@ -8,8 +8,6 @@ kernel_file = arch/$(build_arch)/boot/zImage install_file = vmlinuz no_dumpfile = true -loader = grub - do_tools_usbip = true do_tools_cpupower = true do_tools_perf = true diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk index a0c64b72864b..30c9ecb85bc2 100644 --- a/debian.master/rules.d/i386.mk +++ b/debian.master/rules.d/i386.mk @@ -6,7 +6,6 @@ flavours = generic lowlatency build_image = bzImage kernel_file = arch/$(build_arch)/boot/bzImage install_file = vmlinuz -loader = grub vdso = vdso_install no_dumpfile = true do_flavour_image_package = false diff --git a/debian.master/rules.d/ppc64el.mk b/debian.master/rules.d/ppc64el.mk index e2f27fc27207..1745f1e333c0 100644 --- a/debian.master/rules.d/ppc64el.mk +++ b/debian.master/rules.d/ppc64el.mk @@ -7,7 +7,6 @@ build_image = vmlinux.strip kernel_file = arch/powerpc/boot/vmlinux.strip install_file = vmlinux no_dumpfile = true -loader = grub do_extras_package = true opal_signed = true do_tools_usbip = true diff --git a/debian.master/rules.d/riscv64.mk b/debian.master/rules.d/riscv64.mk index 66c75adf329e..425537f83142 100644 --- a/debian.master/rules.d/riscv64.mk +++ b/debian.master/rules.d/riscv64.mk @@ -7,7 +7,6 @@ build_image = Image kernel_file = arch/$(build_arch)/boot/Image install_file = vmlinuz -loader = grub vdso = vdso_install no_dumpfile = true diff --git a/debian.master/rules.d/x32.mk b/debian.master/rules.d/x32.mk index e0ccff961f02..84918880e252 100644 --- a/debian.master/rules.d/x32.mk +++ b/debian.master/rules.d/x32.mk @@ -6,7 +6,6 @@ flavours = build_image = bzImage kernel_file = arch/$(build_arch)/boot/bzImage install_file = vmlinuz -loader = grub vdso = vdso_install no_dumpfile = true uefi_signed = true
The use of the 'loader' variable was removed back in 2017 in Bionic with commit fbf2867282ee ("UBUNTU: [Packaging] update to Debian like control scripts") so drop it going forward. Ignore: yes Signed-off-by: Juerg Haefliger <juergh@canonical.com> --- debian.master/rules.d/amd64.mk | 1 - debian.master/rules.d/arm64.mk | 1 - debian.master/rules.d/armhf.mk | 2 -- debian.master/rules.d/i386.mk | 1 - debian.master/rules.d/ppc64el.mk | 1 - debian.master/rules.d/riscv64.mk | 1 - debian.master/rules.d/x32.mk | 1 - 7 files changed, 8 deletions(-)