* [PATCH] kbuild: rpm-pkg: fix two build breaks when O= is used
@ 2018-11-02 11:25 Zhenzhong Duan
2018-11-05 7:55 ` Masahiro Yamada
0 siblings, 1 reply; 3+ messages in thread
From: Zhenzhong Duan @ 2018-11-02 11:25 UTC (permalink / raw)
To: linux-kernel, linux-kbuild
Cc: Srinivas REDDY Eeda, yamada.masahiro, michal.lkml
Running 'make O=/build/kernel binrpm-pkg' failed with below two errors.
Makefile:600: include/config/auto.conf: No such file or directory
+ cp make -C /mnt/root/kernel O=/build/kernel image_name make -f
/mnt/root/kernel/Makefile ...
cp: invalid option -- 'C'
Try 'cp --help' for more information.
Export KBUILD_OUTPUT when O= is used so that it could be used in locating
include/config/auto.conf
Use $srctree to locate source dir when generating image name, no matter
if O= is used.
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
---
Makefile | 5 +++++
scripts/package/mkspec | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 9aa352b..df316e5 100644
--- a/Makefile
+++ b/Makefile
@@ -135,6 +135,7 @@ KBUILD_OUTPUT := $(shell mkdir -p $(KBUILD_OUTPUT) && cd $(KBUILD_OUTPUT) \
$(if $(KBUILD_OUTPUT),, \
$(error failed to create output directory "$(saved-output)"))
+export KBUILD_OUTPUT
# Look for make include files relative to root of kernel src
#
# This does not become effective immediately because MAKEFLAGS is re-parsed
@@ -597,7 +598,11 @@ virt-y := virt/
endif # KBUILD_EXTMOD
ifeq ($(dot-config),1)
+ifeq ($(KBUILD_OUTPUT),)
include include/config/auto.conf
+else
+include $(KBUILD_OUTPUT)/include/config/auto.conf
+endif
endif
# The all: target is the default when no target is given on the
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index e05646d..3b4e5e4 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -84,10 +84,10 @@ $S
mkdir -p %{buildroot}/boot
%ifarch ia64
mkdir -p %{buildroot}/boot/efi
- cp \$(make image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE
+ cp \$(make -C \$srctree image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE
ln -s efi/vmlinuz-$KERNELRELEASE %{buildroot}/boot/
%else
- cp \$(make image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE
+ cp \$(make -C \$srctree image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE
%endif
$M make %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} KBUILD_SRC= modules_install
make %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr KBUILD_SRC= headers_install
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] kbuild: rpm-pkg: fix two build breaks when O= is used
2018-11-02 11:25 [PATCH] kbuild: rpm-pkg: fix two build breaks when O= is used Zhenzhong Duan
@ 2018-11-05 7:55 ` Masahiro Yamada
2018-11-05 9:25 ` Zhenzhong Duan
0 siblings, 1 reply; 3+ messages in thread
From: Masahiro Yamada @ 2018-11-05 7:55 UTC (permalink / raw)
To: zhenzhong.duan
Cc: Linux Kernel Mailing List, Linux Kbuild mailing list,
srinivas.eeda, Michal Marek
Hi Zhenzhong,
On Fri, Nov 2, 2018 at 8:26 PM Zhenzhong Duan <zhenzhong.duan@oracle.com> wrote:
>
> Running 'make O=/build/kernel binrpm-pkg' failed with below two errors.
>
> Makefile:600: include/config/auto.conf: No such file or directory
>
> + cp make -C /mnt/root/kernel O=/build/kernel image_name make -f
> /mnt/root/kernel/Makefile ...
> cp: invalid option -- 'C'
> Try 'cp --help' for more information.
>
> Export KBUILD_OUTPUT when O= is used so that it could be used in locating
> include/config/auto.conf
>
> Use $srctree to locate source dir when generating image name, no matter
> if O= is used.
>
> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Sorry for the breakage, and thanks for your report.
I'd like to fix the issue in a cleaner way.
See this:
https://patchwork.kernel.org/patch/10667539/
Thanks.
> ---
> Makefile | 5 +++++
> scripts/package/mkspec | 4 ++--
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 9aa352b..df316e5 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -135,6 +135,7 @@ KBUILD_OUTPUT := $(shell mkdir -p $(KBUILD_OUTPUT) && cd $(KBUILD_OUTPUT) \
> $(if $(KBUILD_OUTPUT),, \
> $(error failed to create output directory "$(saved-output)"))
>
> +export KBUILD_OUTPUT
> # Look for make include files relative to root of kernel src
> #
> # This does not become effective immediately because MAKEFLAGS is re-parsed
> @@ -597,7 +598,11 @@ virt-y := virt/
> endif # KBUILD_EXTMOD
>
> ifeq ($(dot-config),1)
> +ifeq ($(KBUILD_OUTPUT),)
> include include/config/auto.conf
> +else
> +include $(KBUILD_OUTPUT)/include/config/auto.conf
> +endif
> endif
>
> # The all: target is the default when no target is given on the
> diff --git a/scripts/package/mkspec b/scripts/package/mkspec
> index e05646d..3b4e5e4 100755
> --- a/scripts/package/mkspec
> +++ b/scripts/package/mkspec
> @@ -84,10 +84,10 @@ $S
> mkdir -p %{buildroot}/boot
> %ifarch ia64
> mkdir -p %{buildroot}/boot/efi
> - cp \$(make image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE
> + cp \$(make -C \$srctree image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE
> ln -s efi/vmlinuz-$KERNELRELEASE %{buildroot}/boot/
> %else
> - cp \$(make image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE
> + cp \$(make -C \$srctree image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE
> %endif
> $M make %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} KBUILD_SRC= modules_install
> make %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr KBUILD_SRC= headers_install
> --
> 1.8.3.1
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] kbuild: rpm-pkg: fix two build breaks when O= is used
2018-11-05 7:55 ` Masahiro Yamada
@ 2018-11-05 9:25 ` Zhenzhong Duan
0 siblings, 0 replies; 3+ messages in thread
From: Zhenzhong Duan @ 2018-11-05 9:25 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Linux Kernel Mailing List, Linux Kbuild mailing list,
srinivas.eeda, Michal Marek
On 2018/11/5 15:55, Masahiro Yamada wrote:
> Hi Zhenzhong,
>
> On Fri, Nov 2, 2018 at 8:26 PM Zhenzhong Duan<zhenzhong.duan@oracle.com> wrote:
>> Running 'make O=/build/kernel binrpm-pkg' failed with below two errors.
>>
>> Makefile:600: include/config/auto.conf: No such file or directory
>>
>> + cp make -C /mnt/root/kernel O=/build/kernel image_name make -f
>> /mnt/root/kernel/Makefile ...
>> cp: invalid option -- 'C'
>> Try 'cp --help' for more information.
>>
>> Export KBUILD_OUTPUT when O= is used so that it could be used in locating
>> include/config/auto.conf
>>
>> Use $srctree to locate source dir when generating image name, no matter
>> if O= is used.
>>
>> Signed-off-by: Zhenzhong Duan<zhenzhong.duan@oracle.com>
>
> Sorry for the breakage, and thanks for your report.
>
> I'd like to fix the issue in a cleaner way.
>
> See this:
> https://patchwork.kernel.org/patch/10667539/
Never mind, appreciate you fixed it in a smart way:)
Thanks
Zhenzhong
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-11-05 9:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-02 11:25 [PATCH] kbuild: rpm-pkg: fix two build breaks when O= is used Zhenzhong Duan
2018-11-05 7:55 ` Masahiro Yamada
2018-11-05 9:25 ` Zhenzhong Duan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).