| Message ID | 20161122213434.14788-1-mmarek@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Michael, On Tue, Nov 22, 2016 at 10:34:29PM +0100, Michal Marek wrote: > The KBUILD_IMAGE variable is used by the rpm and deb-pkg targets, which > expect it to point to the image file in the build directory. The > builddeb script has a workaround for architectures which only provide > the basename, but let's provide a clean interface for packaging tools. > > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Michal Marek <mmarek@suse.com> > --- > arch/arm64/Makefile | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) What's the plan for this patch? I'm happy to merge it, but I don't see the rest of the series queued anywhere. Thanks, Will > diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile > index 3635b8662724..80b6866bcacb 100644 > --- a/arch/arm64/Makefile > +++ b/arch/arm64/Makefile > @@ -94,12 +94,12 @@ libs-y := arch/arm64/lib/ $(libs-y) > core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a > > # Default target when executing plain make > -KBUILD_IMAGE := Image.gz > +boot := arch/arm64/boot > +KBUILD_IMAGE := $(boot)/Image.gz > KBUILD_DTBS := dtbs > > -all: $(KBUILD_IMAGE) $(KBUILD_DTBS) > +all: Image.gz $(KBUILD_DTBS) > > -boot := arch/arm64/boot > > Image: vmlinux > $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ > -- > 2.10.0 >
Dne 10.3.2017 v 18:58 Will Deacon napsal(a): > Hi Michael, > > On Tue, Nov 22, 2016 at 10:34:29PM +0100, Michal Marek wrote: >> The KBUILD_IMAGE variable is used by the rpm and deb-pkg targets, which >> expect it to point to the image file in the build directory. The >> builddeb script has a workaround for architectures which only provide >> the basename, but let's provide a clean interface for packaging tools. >> >> Cc: Catalin Marinas <catalin.marinas@arm.com> >> Cc: Will Deacon <will.deacon@arm.com> >> Cc: linux-arm-kernel@lists.infradead.org >> Signed-off-by: Michal Marek <mmarek@suse.com> >> --- >> arch/arm64/Makefile | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) > > What's the plan for this patch? I'm happy to merge it, Great, please merge it. > but I don't see > the rest of the series queued anywhere. I'll see what remains and submit the rest via the kbuild tree. Thanks, Michal
Hi Will, Michal, 2017-03-11 6:20 GMT+09:00 Michal Marek <mmarek@suse.com>: > Dne 10.3.2017 v 18:58 Will Deacon napsal(a): >> Hi Michael, >> >> On Tue, Nov 22, 2016 at 10:34:29PM +0100, Michal Marek wrote: >>> The KBUILD_IMAGE variable is used by the rpm and deb-pkg targets, which >>> expect it to point to the image file in the build directory. The >>> builddeb script has a workaround for architectures which only provide >>> the basename, but let's provide a clean interface for packaging tools. >>> >>> Cc: Catalin Marinas <catalin.marinas@arm.com> >>> Cc: Will Deacon <will.deacon@arm.com> >>> Cc: linux-arm-kernel@lists.infradead.org >>> Signed-off-by: Michal Marek <mmarek@suse.com> >>> --- >>> arch/arm64/Makefile | 6 +++--- >>> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> What's the plan for this patch? I'm happy to merge it, > > Great, please merge it. > > >> but I don't see >> the rest of the series queued anywhere. > > I'll see what remains and submit the rest via the kbuild tree. > > Thanks, > Michal > -- > To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html I like this approach, rather than fixing scripts/package/mkspec. So, how shall we handle this series? I am OK with getting 1/6 in through arm64 tree, but 6/6 will be postponed in the case. If Will issues Acked-by, I can pick-up the whole series to linux-kbuild.
On Sat, Mar 18, 2017 at 10:14:41PM +0900, Masahiro Yamada wrote: > 2017-03-11 6:20 GMT+09:00 Michal Marek <mmarek@suse.com>: > > Dne 10.3.2017 v 18:58 Will Deacon napsal(a): > >> On Tue, Nov 22, 2016 at 10:34:29PM +0100, Michal Marek wrote: > >>> The KBUILD_IMAGE variable is used by the rpm and deb-pkg targets, which > >>> expect it to point to the image file in the build directory. The > >>> builddeb script has a workaround for architectures which only provide > >>> the basename, but let's provide a clean interface for packaging tools. > >>> > >>> Cc: Catalin Marinas <catalin.marinas@arm.com> > >>> Cc: Will Deacon <will.deacon@arm.com> > >>> Cc: linux-arm-kernel@lists.infradead.org > >>> Signed-off-by: Michal Marek <mmarek@suse.com> > >>> --- > >>> arch/arm64/Makefile | 6 +++--- > >>> 1 file changed, 3 insertions(+), 3 deletions(-) > >> > >> What's the plan for this patch? I'm happy to merge it, > > > > Great, please merge it. > > > >> but I don't see > >> the rest of the series queued anywhere. > > > > I'll see what remains and submit the rest via the kbuild tree. > > > > I like this approach, rather than fixing scripts/package/mkspec. > > > So, how shall we handle this series? > > > I am OK with getting 1/6 in through arm64 tree, > but 6/6 will be postponed in the case. > > > > If Will issues Acked-by, I can pick-up the whole series > to linux-kbuild. Ok, that works for me too. For the first patch: Acked-by: Will Deacon <will.deacon@arm.com> So please take this via linux-kbuild. Will
2017-03-20 21:13 GMT+09:00 Will Deacon <will.deacon@arm.com>: > On Sat, Mar 18, 2017 at 10:14:41PM +0900, Masahiro Yamada wrote: >> 2017-03-11 6:20 GMT+09:00 Michal Marek <mmarek@suse.com>: >> > Dne 10.3.2017 v 18:58 Will Deacon napsal(a): >> >> On Tue, Nov 22, 2016 at 10:34:29PM +0100, Michal Marek wrote: >> >>> The KBUILD_IMAGE variable is used by the rpm and deb-pkg targets, which >> >>> expect it to point to the image file in the build directory. The >> >>> builddeb script has a workaround for architectures which only provide >> >>> the basename, but let's provide a clean interface for packaging tools. >> >>> >> >>> Cc: Catalin Marinas <catalin.marinas@arm.com> >> >>> Cc: Will Deacon <will.deacon@arm.com> >> >>> Cc: linux-arm-kernel@lists.infradead.org >> >>> Signed-off-by: Michal Marek <mmarek@suse.com> >> >>> --- >> >>> arch/arm64/Makefile | 6 +++--- >> >>> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> >> >> What's the plan for this patch? I'm happy to merge it, >> > >> > Great, please merge it. >> > >> >> but I don't see >> >> the rest of the series queued anywhere. >> > >> > I'll see what remains and submit the rest via the kbuild tree. >> > >> >> I like this approach, rather than fixing scripts/package/mkspec. >> >> >> So, how shall we handle this series? >> >> >> I am OK with getting 1/6 in through arm64 tree, >> but 6/6 will be postponed in the case. >> >> >> >> If Will issues Acked-by, I can pick-up the whole series >> to linux-kbuild. > > Ok, that works for me too. For the first patch: > > Acked-by: Will Deacon <will.deacon@arm.com> > > So please take this via linux-kbuild. > > Will Applied to linux-kbuild/misc. Thanks!
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 3635b8662724..80b6866bcacb 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -94,12 +94,12 @@ libs-y := arch/arm64/lib/ $(libs-y) core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a # Default target when executing plain make -KBUILD_IMAGE := Image.gz +boot := arch/arm64/boot +KBUILD_IMAGE := $(boot)/Image.gz KBUILD_DTBS := dtbs -all: $(KBUILD_IMAGE) $(KBUILD_DTBS) +all: Image.gz $(KBUILD_DTBS) -boot := arch/arm64/boot Image: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
The KBUILD_IMAGE variable is used by the rpm and deb-pkg targets, which expect it to point to the image file in the build directory. The builddeb script has a workaround for architectures which only provide the basename, but let's provide a clean interface for packaging tools. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Michal Marek <mmarek@suse.com> --- arch/arm64/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)