2016-11-22 21:35:44

by Michal Marek

[permalink] [raw]
Subject: [PATCH 1/6] arm64: Use full path in KBUILD_IMAGE definition

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 <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: [email protected]
Signed-off-by: Michal Marek <[email protected]>
---
arch/arm64/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

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


2016-11-22 21:35:47

by Michal Marek

[permalink] [raw]
Subject: [PATCH 6/6] deb-pkg: Remove the KBUILD_IMAGE workaround

The arch Makefile are fixed to set KBUILD_IMAGE to the full patch, so
the workaround is no longer needed.

Signed-off-by: Michal Marek <[email protected]>
---
scripts/package/builddeb | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 8ea9fd2b6573..dab997343f1a 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -143,12 +143,7 @@ else
cp System.map "$tmpdir/boot/System.map-$version"
cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
fi
-# Not all arches include the boot path in KBUILD_IMAGE
-if [ -e $KBUILD_IMAGE ]; then
- cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"
-else
- cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
-fi
+cp "$($MAKE -s image_name)" "$tmpdir/$installed_image_path"

if grep -q "^CONFIG_OF=y" $KCONFIG_CONFIG ; then
# Only some architectures with OF support have this target
--
2.10.0

2016-11-22 21:35:46

by Michal Marek

[permalink] [raw]
Subject: [PATCH 3/6] arc: Use full path in KBUILD_IMAGE definition

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: Vineet Gupta <[email protected]>
Cc: [email protected]
Signed-off-by: Michal Marek <[email protected]>
---
arch/arc/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arc/Makefile b/arch/arc/Makefile
index 19cce226d1a8..44ef35d33956 100644
--- a/arch/arc/Makefile
+++ b/arch/arc/Makefile
@@ -123,9 +123,9 @@ libs-y += arch/arc/lib/ $(LIBGCC)
boot := arch/arc/boot

#default target for make without any arguments.
-KBUILD_IMAGE := bootpImage
+KBUILD_IMAGE := $(boot)/bootpImage

-all: $(KBUILD_IMAGE)
+all: bootpImage
bootpImage: vmlinux

boot_targets += uImage uImage.bin uImage.gz
--
2.10.0

2016-11-22 21:35:42

by Michal Marek

[permalink] [raw]
Subject: [PATCH 2/6] arm: Use full path in KBUILD_IMAGE definition

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: Russell King <[email protected]>
Cc: [email protected]
Signed-off-by: Michal Marek <[email protected]>
---
arch/arm/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 6be9ee148b78..f3fa2cafca15 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -296,10 +296,11 @@ drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/
libs-y := arch/arm/lib/ $(libs-y)

# Default target when executing plain make
+boot := arch/arm/boot
ifeq ($(CONFIG_XIP_KERNEL),y)
-KBUILD_IMAGE := xipImage
+KBUILD_IMAGE := $(boot)/xipImage
else
-KBUILD_IMAGE := zImage
+KBUILD_IMAGE := $(boot)/zImage
endif

# Build the DT binary blobs if we have OF configured
@@ -307,9 +308,8 @@ ifeq ($(CONFIG_USE_OF),y)
KBUILD_DTBS := dtbs
endif

-all: $(KBUILD_IMAGE) $(KBUILD_DTBS)
+all: $(notdir $(KBUILD_IMAGE)) $(KBUILD_DTBS)

-boot := arch/arm/boot

archprepare:
$(Q)$(MAKE) $(build)=arch/arm/tools include/generated/mach-types.h
--
2.10.0

2016-11-22 21:36:49

by Michal Marek

[permalink] [raw]
Subject: [PATCH 5/6] unicore32: Use full path in KBUILD_IMAGE definition

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: Guan Xuetao <[email protected]>
Signed-off-by: Michal Marek <[email protected]>
---
arch/unicore32/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/unicore32/Makefile b/arch/unicore32/Makefile
index b6f5c4c1eaf9..98a5ca43ae87 100644
--- a/arch/unicore32/Makefile
+++ b/arch/unicore32/Makefile
@@ -43,9 +43,9 @@ boot := arch/unicore32/boot

# Default defconfig and target when executing plain make
KBUILD_DEFCONFIG := $(ARCH)_defconfig
-KBUILD_IMAGE := zImage
+KBUILD_IMAGE := $(boot)/zImage

-all: $(KBUILD_IMAGE)
+all: zImage

zImage Image uImage: vmlinux
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
--
2.10.0

2016-11-22 21:37:11

by Michal Marek

[permalink] [raw]
Subject: [PATCH 4/6] sh: Use full path in KBUILD_IMAGE definition

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: Yoshinori Sato <[email protected]>
Cc: Rich Felker <[email protected]>
Cc: [email protected]
Signed-off-by: Michal Marek <[email protected]>
---
arch/sh/Makefile | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 336f33a419d9..280bbff12102 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -94,7 +94,8 @@ defaultimage-$(CONFIG_SH_7206_SOLUTION_ENGINE) := vmlinux
defaultimage-$(CONFIG_SH_7619_SOLUTION_ENGINE) := vmlinux

# Set some sensible Kbuild defaults
-KBUILD_IMAGE := $(defaultimage-y)
+boot := arch/sh/boot
+KBUILD_IMAGE := $(boot)/$(defaultimage-y)

#
# Choosing incompatible machines durings configuration will result in
@@ -186,8 +187,6 @@ cpuincdir-y += cpu-common # Must be last
drivers-y += arch/sh/drivers/
drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/

-boot := arch/sh/boot
-
cflags-y += $(foreach d, $(cpuincdir-y), -Iarch/sh/include/$(d)) \
$(foreach d, $(machdir-y), -Iarch/sh/include/$(d))

@@ -211,7 +210,7 @@ BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.xz uImage.lzo \
romImage
PHONY += $(BOOT_TARGETS)

-all: $(KBUILD_IMAGE)
+all: $(notdir $(KBUILD_IMAGE))

$(BOOT_TARGETS): vmlinux
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
--
2.10.0

2016-11-23 19:47:20

by Alexey Brodkin

[permalink] [raw]
Subject: Re: [PATCH 3/6] arc: Use full path in KBUILD_IMAGE definition

Hi Michal,

On Tue, 2016-11-22 at 22:34 +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: Vineet Gupta <[email protected]>
> Cc: [email protected]
> Signed-off-by: Michal Marek <[email protected]>
> ---
>  arch/arc/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arc/Makefile b/arch/arc/Makefile
> index 19cce226d1a8..44ef35d33956 100644
> --- a/arch/arc/Makefile
> +++ b/arch/arc/Makefile
> @@ -123,9 +123,9 @@ libs-y += arch/arc/lib/ $(LIBGCC)
>  boot := arch/arc/boot
>  
>  #default target for make without any arguments.
> -KBUILD_IMAGE := bootpImage
> +KBUILD_IMAGE := $(boot)/bootpImage
>  
> -all: $(KBUILD_IMAGE)
> +all: bootpImage
>  bootpImage: vmlinux
>  
>  boot_targets += uImage uImage.bin uImage.gz

I tried to find any examples on how that KBUILD_IMAGE thingy is used
but to no avail. It looks like for ARC "bootpImage" makes not much
sense and if you really want to get something useful in .deb/.rpm
most probably something like below may work much better:
------------------------>8--------------------------
KBUILD_IMAGE := $(boot)/uImage
------------------------>8--------------------------

And I don't know context of KBUILD_IMAGE usage but in
case of ARC our default target is "vmlinux" so I'm not sure then if
KBUILD_IMAGE may point to non-default target.

For example in "arch/avr32/Makefile" I see more complicated construction:
------------------------>8--------------------------
             KBUILD_IMAGE := $(boot)/uImage
vmlinux.elf: KBUILD_IMAGE := $(boot)/vmlinux.elf
vmlinux.cso: KBUILD_IMAGE := $(boot)/vmlinux.cso
uImage.srec: KBUILD_IMAGE := $(boot)/uImage.srec
uImage:      KBUILD_IMAGE := $(boot)/uImage
------------------------>8--------------------------
and may imagine that we need something similar for ARC obviously with
default being "$(boot)/vmlinux".

-Alexey

2016-11-25 12:12:21

by Riku Voipio

[permalink] [raw]
Subject: Re: [PATCH 6/6] deb-pkg: Remove the KBUILD_IMAGE workaround

On 22 November 2016 at 23:34, Michal Marek <[email protected]> wrote:
> The arch Makefile are fixed to set KBUILD_IMAGE to the full patch, so
> the workaround is no longer needed.
>
> Signed-off-by: Michal Marek <[email protected]>
> ---
Thanks for cleaning this up.

Reviewed-by: Riku Voipio <[email protected]>

> scripts/package/builddeb | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index 8ea9fd2b6573..dab997343f1a 100755
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -143,12 +143,7 @@ else
> cp System.map "$tmpdir/boot/System.map-$version"
> cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
> fi
> -# Not all arches include the boot path in KBUILD_IMAGE
> -if [ -e $KBUILD_IMAGE ]; then
> - cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"
> -else
> - cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
> -fi
> +cp "$($MAKE -s image_name)" "$tmpdir/$installed_image_path"
>
> if grep -q "^CONFIG_OF=y" $KCONFIG_CONFIG ; then
> # Only some architectures with OF support have this target
> --
> 2.10.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2016-11-25 14:21:41

by Michal Marek

[permalink] [raw]
Subject: Re: [PATCH 3/6] arc: Use full path in KBUILD_IMAGE definition

Dne 23.11.2016 v 20:40 Alexey Brodkin napsal(a):
>> diff --git a/arch/arc/Makefile b/arch/arc/Makefile
>> index 19cce226d1a8..44ef35d33956 100644
>> --- a/arch/arc/Makefile
>> +++ b/arch/arc/Makefile
>> @@ -123,9 +123,9 @@ libs-y += arch/arc/lib/ $(LIBGCC)
>> boot := arch/arc/boot
>>
>> #default target for make without any arguments.
>> -KBUILD_IMAGE := bootpImage
>> +KBUILD_IMAGE := $(boot)/bootpImage
>>
>> -all: $(KBUILD_IMAGE)
>> +all: bootpImage
>> bootpImage: vmlinux
>>
>> boot_targets += uImage uImage.bin uImage.gz
>
> I tried to find any examples on how that KBUILD_IMAGE thingy is used
> but to no avail.

Ho Alexey,

see scripts/pacakge/{builddeb,buildtar,mkspec}. mkspec calls make
image_name, which in turn outputs $KBUILD_IMAGE.


> It looks like for ARC "bootpImage" makes not much
> sense and if you really want to get something useful in .deb/.rpm
> most probably something like below may work much better:
> ------------------------>8--------------------------
> KBUILD_IMAGE := $(boot)/uImage
> ------------------------>8--------------------------
>
> And I don't know context of KBUILD_IMAGE usage but in
> case of ARC our default target is "vmlinux" so I'm not sure then if
> KBUILD_IMAGE may point to non-default target.

Right, this will not work for make rpm-pkg, since it calls make with no
explicit target and expects the file pointed to by KBUILD_IMAGE to exist
afterward. This will work if you also change the 'all' target to depend
on uImage.


> For example in "arch/avr32/Makefile" I see more complicated construction:
> ------------------------>8--------------------------
> KBUILD_IMAGE := $(boot)/uImage
> vmlinux.elf: KBUILD_IMAGE := $(boot)/vmlinux.elf
> vmlinux.cso: KBUILD_IMAGE := $(boot)/vmlinux.cso
> uImage.srec: KBUILD_IMAGE := $(boot)/uImage.srec
> uImage: KBUILD_IMAGE := $(boot)/uImage
> ------------------------>8--------------------------

Right, but the packaging targets will only build and package uImage. The
other redefinitions are there only for the avr32 install rule:

install: vmlinux
$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) $@


> and may imagine that we need something similar for ARC obviously with
> default being "$(boot)/vmlinux".

What some other architectures do is that the image format is selected
via Kconfig and not on the make command line. E.g. arm and sh do this.

Michal

2016-11-25 14:22:34

by Michal Marek

[permalink] [raw]
Subject: Re: [PATCH 6/6] deb-pkg: Remove the KBUILD_IMAGE workaround

Dne 25.11.2016 v 13:12 Riku Voipio napsal(a):
> On 22 November 2016 at 23:34, Michal Marek <[email protected]> wrote:
>> The arch Makefile are fixed to set KBUILD_IMAGE to the full patch, so
>> the workaround is no longer needed.
>>
>> Signed-off-by: Michal Marek <[email protected]>
>> ---
> Thanks for cleaning this up.
>
> Reviewed-by: Riku Voipio <[email protected]>

Note that this will only be merged once the individual arch patches have
been picked up.

Michal

2017-03-10 17:59:10

by Will Deacon

[permalink] [raw]
Subject: Re: [PATCH 1/6] arm64: Use full path in KBUILD_IMAGE definition

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 <[email protected]>
> Cc: Will Deacon <[email protected]>
> Cc: [email protected]
> Signed-off-by: Michal Marek <[email protected]>
> ---
> 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
>

2017-03-10 21:20:59

by Michal Marek

[permalink] [raw]
Subject: Re: [PATCH 1/6] arm64: Use full path in KBUILD_IMAGE definition

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 <[email protected]>
>> Cc: Will Deacon <[email protected]>
>> Cc: [email protected]
>> Signed-off-by: Michal Marek <[email protected]>
>> ---
>> 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

2017-03-18 13:15:00

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH 1/6] arm64: Use full path in KBUILD_IMAGE definition

Hi Will, Michal,

2017-03-11 6:20 GMT+09:00 Michal Marek <[email protected]>:
> 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 <[email protected]>
>>> Cc: Will Deacon <[email protected]>
>>> Cc: [email protected]
>>> Signed-off-by: Michal Marek <[email protected]>
>>> ---
>>> 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 [email protected]
> 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.




--
Best Regards
Masahiro Yamada

2017-03-20 12:13:19

by Will Deacon

[permalink] [raw]
Subject: Re: [PATCH 1/6] arm64: Use full path in KBUILD_IMAGE definition

On Sat, Mar 18, 2017 at 10:14:41PM +0900, Masahiro Yamada wrote:
> 2017-03-11 6:20 GMT+09:00 Michal Marek <[email protected]>:
> > 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 <[email protected]>
> >>> Cc: Will Deacon <[email protected]>
> >>> Cc: [email protected]
> >>> Signed-off-by: Michal Marek <[email protected]>
> >>> ---
> >>> 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 <[email protected]>

So please take this via linux-kbuild.

Will

2017-03-20 13:52:35

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH 1/6] arm64: Use full path in KBUILD_IMAGE definition

2017-03-20 21:13 GMT+09:00 Will Deacon <[email protected]>:
> On Sat, Mar 18, 2017 at 10:14:41PM +0900, Masahiro Yamada wrote:
>> 2017-03-11 6:20 GMT+09:00 Michal Marek <[email protected]>:
>> > 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 <[email protected]>
>> >>> Cc: Will Deacon <[email protected]>
>> >>> Cc: [email protected]
>> >>> Signed-off-by: Michal Marek <[email protected]>
>> >>> ---
>> >>> 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 <[email protected]>
>
> So please take this via linux-kbuild.
>
> Will


Applied to linux-kbuild/misc. Thanks!




--
Best Regards
Masahiro Yamada

2017-03-20 13:56:38

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH 6/6] deb-pkg: Remove the KBUILD_IMAGE workaround

2016-11-25 23:22 GMT+09:00 Michal Marek <[email protected]>:
> Dne 25.11.2016 v 13:12 Riku Voipio napsal(a):
>> On 22 November 2016 at 23:34, Michal Marek <[email protected]> wrote:
>>> The arch Makefile are fixed to set KBUILD_IMAGE to the full patch, so
>>> the workaround is no longer needed.
>>>
>>> Signed-off-by: Michal Marek <[email protected]>
>>> ---
>> Thanks for cleaning this up.
>>
>> Reviewed-by: Riku Voipio <[email protected]>
>
> Note that this will only be merged once the individual arch patches have
> been picked up.
>



Applied to linux-kbuild/misc. Thanks!


--
Best Regards
Masahiro Yamada

2017-03-20 13:56:25

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH 5/6] unicore32: Use full path in KBUILD_IMAGE definition

2016-11-23 6:34 GMT+09:00 Michal Marek <[email protected]>:
> 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: Guan Xuetao <[email protected]>
> Signed-off-by: Michal Marek <[email protected]>


Applied to linux-kbuild/misc. Thanks!


--
Best Regards
Masahiro Yamada

2017-03-20 13:56:24

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH 4/6] sh: Use full path in KBUILD_IMAGE definition

2016-11-23 6:34 GMT+09:00 Michal Marek <[email protected]>:
> 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: Yoshinori Sato <[email protected]>
> Cc: Rich Felker <[email protected]>
> Cc: [email protected]
> Signed-off-by: Michal Marek <[email protected]>



Applied to linux-kbuild/misc. Thanks!



--
Best Regards
Masahiro Yamada

2017-03-20 13:59:05

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH 3/6] arc: Use full path in KBUILD_IMAGE definition

2016-11-23 6:34 GMT+09:00 Michal Marek <[email protected]>:
> 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: Vineet Gupta <[email protected]>
> Cc: [email protected]
> Signed-off-by: Michal Marek <[email protected]>



Applied to linux-kbuild/misc. Thanks!



--
Best Regards
Masahiro Yamada

2017-03-20 13:58:06

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH 2/6] arm: Use full path in KBUILD_IMAGE definition

2016-11-23 6:34 GMT+09:00 Michal Marek <[email protected]>:
> 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: Russell King <[email protected]>
> Cc: [email protected]
> Signed-off-by: Michal Marek <[email protected]>



Applied to linux-kbuild/misc. Thanks!


--
Best Regards
Masahiro Yamada