| Message ID | 20210323155227.45793-1-juergh@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [Unstable] UBUNTU: [Packaging] Replace flavor-specific arm64 build rule variables | expand |
Acked-by: Tim Gardner <tim.gardner@canonical.com> This is one of those changes that either work or it doesn't. A single build test is sufficient to figure that out. On 3/23/21 9:52 AM, Juerg Haefliger wrote: > The build rule variables 'build_image' and 'kernel_file' are identical for > both flavors on arm64 so replace the flavor-specific variables with the > generic ones. > > Ignore: yes > Signed-off-by: Juerg Haefliger <juergh@canonical.com> > --- > debian.master/rules.d/arm64.mk | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk > index f243c39e311a..97b64d213d8b 100644 > --- a/debian.master/rules.d/arm64.mk > +++ b/debian.master/rules.d/arm64.mk > @@ -3,10 +3,8 @@ build_arch = arm64 > header_arch = arm64 > defconfig = defconfig > flavours = generic generic-64k > -build_image_generic = Image.gz > -kernel_file_generic = arch/$(build_arch)/boot/Image.gz > -build_image_generic-64k = Image.gz > -kernel_file_generic-64k = arch/$(build_arch)/boot/Image.gz > +build_image = Image.gz > +kernel_file = arch/$(build_arch)/boot/Image.gz > install_file = vmlinuz > no_dumpfile = true > uefi_signed = true >
On Tue, Mar 23, 2021 at 04:52:27PM +0100, Juerg Haefliger wrote: > The build rule variables 'build_image' and 'kernel_file' are identical for > both flavors on arm64 so replace the flavor-specific variables with the > generic ones. > > Ignore: yes > Signed-off-by: Juerg Haefliger <juergh@canonical.com> The change itself is fine, however I already made the same changes earlier today before seeing this patch, so it's no longer needed. Seth
diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk index f243c39e311a..97b64d213d8b 100644 --- a/debian.master/rules.d/arm64.mk +++ b/debian.master/rules.d/arm64.mk @@ -3,10 +3,8 @@ build_arch = arm64 header_arch = arm64 defconfig = defconfig flavours = generic generic-64k -build_image_generic = Image.gz -kernel_file_generic = arch/$(build_arch)/boot/Image.gz -build_image_generic-64k = Image.gz -kernel_file_generic-64k = arch/$(build_arch)/boot/Image.gz +build_image = Image.gz +kernel_file = arch/$(build_arch)/boot/Image.gz install_file = vmlinuz no_dumpfile = true uefi_signed = true
The build rule variables 'build_image' and 'kernel_file' are identical for both flavors on arm64 so replace the flavor-specific variables with the generic ones. Ignore: yes Signed-off-by: Juerg Haefliger <juergh@canonical.com> --- debian.master/rules.d/arm64.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)