Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1527951 > unrolled thread
| Started by | Michal Marek <mmarek@suse.com> |
|---|---|
| First post | 2016-11-22 22:40 +0100 |
| Last post | 2016-11-22 22:40 +0100 |
| Articles | 7 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 1/6] arm64: Use full path in KBUILD_IMAGE definition Michal Marek <mmarek@suse.com> - 2016-11-22 22:40 +0100
[PATCH 5/6] unicore32: Use full path in KBUILD_IMAGE definition Michal Marek <mmarek@suse.com> - 2016-11-22 22:40 +0100
[PATCH 2/6] arm: Use full path in KBUILD_IMAGE definition Michal Marek <mmarek@suse.com> - 2016-11-22 22:40 +0100
[PATCH 6/6] deb-pkg: Remove the KBUILD_IMAGE workaround Michal Marek <mmarek@suse.com> - 2016-11-22 22:40 +0100
Re: [PATCH 6/6] deb-pkg: Remove the KBUILD_IMAGE workaround Riku Voipio <riku.voipio@linaro.org> - 2016-11-25 13:20 +0100
Re: [PATCH 6/6] deb-pkg: Remove the KBUILD_IMAGE workaround Michal Marek <mmarek@suse.com> - 2016-11-25 15:30 +0100
[PATCH 4/6] sh: Use full path in KBUILD_IMAGE definition Michal Marek <mmarek@suse.com> - 2016-11-22 22:40 +0100
| From | Michal Marek <mmarek@suse.com> |
|---|---|
| Date | 2016-11-22 22:40 +0100 |
| Subject | [PATCH 1/6] arm64: Use full path in KBUILD_IMAGE definition |
| Message-ID | <sGqXf-4ft-3@gated-at.bofh.it> |
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(-) 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
[toc] | [next] | [standalone]
| From | Michal Marek <mmarek@suse.com> |
|---|---|
| Date | 2016-11-22 22:40 +0100 |
| Subject | [PATCH 5/6] unicore32: Use full path in KBUILD_IMAGE definition |
| Message-ID | <sGqXg-4ft-11@gated-at.bofh.it> |
| In reply to | #1527951 |
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 <gxt@mprc.pku.edu.cn> Signed-off-by: Michal Marek <mmarek@suse.com> --- 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
[toc] | [prev] | [next] | [standalone]
| From | Michal Marek <mmarek@suse.com> |
|---|---|
| Date | 2016-11-22 22:40 +0100 |
| Subject | [PATCH 2/6] arm: Use full path in KBUILD_IMAGE definition |
| Message-ID | <sGqXg-4ft-17@gated-at.bofh.it> |
| In reply to | #1527951 |
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 <linux@armlinux.org.uk> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Michal Marek <mmarek@suse.com> --- 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
[toc] | [prev] | [next] | [standalone]
| From | Michal Marek <mmarek@suse.com> |
|---|---|
| Date | 2016-11-22 22:40 +0100 |
| Subject | [PATCH 6/6] deb-pkg: Remove the KBUILD_IMAGE workaround |
| Message-ID | <sGqXg-4ft-37@gated-at.bofh.it> |
| In reply to | #1527951 |
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 <mmarek@suse.com> --- 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
[toc] | [prev] | [next] | [standalone]
| From | Riku Voipio <riku.voipio@linaro.org> |
|---|---|
| Date | 2016-11-25 13:20 +0100 |
| Subject | Re: [PATCH 6/6] deb-pkg: Remove the KBUILD_IMAGE workaround |
| Message-ID | <sHnDX-t4-5@gated-at.bofh.it> |
| In reply to | #1527957 |
On 22 November 2016 at 23:34, Michal Marek <mmarek@suse.com> 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 <mmarek@suse.com> > --- Thanks for cleaning this up. Reviewed-by: Riku Voipio <riku.voipio@linaro.org> > 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 majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
[toc] | [prev] | [next] | [standalone]
| From | Michal Marek <mmarek@suse.com> |
|---|---|
| Date | 2016-11-25 15:30 +0100 |
| Subject | Re: [PATCH 6/6] deb-pkg: Remove the KBUILD_IMAGE workaround |
| Message-ID | <sHpFM-1In-21@gated-at.bofh.it> |
| In reply to | #1530156 |
Dne 25.11.2016 v 13:12 Riku Voipio napsal(a): > On 22 November 2016 at 23:34, Michal Marek <mmarek@suse.com> 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 <mmarek@suse.com> >> --- > Thanks for cleaning this up. > > Reviewed-by: Riku Voipio <riku.voipio@linaro.org> Note that this will only be merged once the individual arch patches have been picked up. Michal
[toc] | [prev] | [next] | [standalone]
| From | Michal Marek <mmarek@suse.com> |
|---|---|
| Date | 2016-11-22 22:40 +0100 |
| Subject | [PATCH 4/6] sh: Use full path in KBUILD_IMAGE definition |
| Message-ID | <sGqXg-4ft-29@gated-at.bofh.it> |
| In reply to | #1527951 |
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 <ysato@users.sourceforge.jp> Cc: Rich Felker <dalias@libc.org> Cc: linux-sh@vger.kernel.org Signed-off-by: Michal Marek <mmarek@suse.com> --- 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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web