[Replicant] [vendor_lineage] [PATCH] BoardConfigKernel.mk: Use OUT_DIR

[Javi Ferrer]

Fix kernel build for those developers who make use OUT_DIR.
---
 config/BoardConfigKernel.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk
index ea7e808d..43fd239c 100644
--- a/config/BoardConfigKernel.mk
+++ b/config/BoardConfigKernel.mk
@@ -85,7 +85,11 @@ endif
 # is set to true or if the binary to run is whitelisted by in a file like
 # build/soong/ui/build/paths/config.go. See the path_interposer source in
 # build/soong/cmd/path_interposer for more details).
+ifeq ($(OUT_DIR),)
 KERNEL_XZ := $(BUILD_TOP)/out/.path/xz
+else
+KERNEL_XZ := $(OUT_DIR)/.path/xz
+endif

 # We need to add GCC toolchain to the path no matter what
 # for tools like `as`
-- 
2.30.1

On Wed, 24 Mar 2021 at 22:31, Javi Ferrer <javi.f.o at gmail.com> wrote:

> Sorry, I forgot to remove the debugging info:
>
> ---------------------------------------------------------------
> Fix kernel build for those developers who make use OUT_DIR.
> ---
>  config/BoardConfigKernel.mk | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk
> index ea7e808d..c0daa063 100644
> --- a/config/BoardConfigKernel.mk
> +++ b/config/BoardConfigKernel.mk
> @@ -85,7 +85,12 @@ endif
>  # is set to true or if the binary to run is whitelisted by in a file like
>  # build/soong/ui/build/paths/config.go. See the path_interposer source in
>  # build/soong/cmd/path_interposer for more details).
> +ifeq ($(OUT_DIR),)
>  KERNEL_XZ := $(BUILD_TOP)/out/.path/xz
> +else
> +KERNEL_XZ := $(OUT_DIR)/.path/xz
> +endif
> +$(warning KERNEL_XZ=$(KERNEL_XZ)")
>
>  # We need to add GCC toolchain to the path no matter what
>  # for tools like `as`
> --
> 2.30.1
>
> On Wed, 24 Mar 2021 at 22:28, Javi Ferrer <javi.f.o at gmail.com> wrote:
>
>> Fix kernel build for those developers who make use OUT_DIR.
>> ---
>>  config/BoardConfigKernel.mk | 5 +++++
>>  1 file changed, 5 insertions(+)
>>
>> diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk
>> index ea7e808d..c0daa063 100644
>> --- a/config/BoardConfigKernel.mk
>> +++ b/config/BoardConfigKernel.mk
>> @@ -85,7 +85,12 @@ endif
>>  # is set to true or if the binary to run is whitelisted by in a file like
>>  # build/soong/ui/build/paths/config.go. See the path_interposer source in
>>  # build/soong/cmd/path_interposer for more details).
>> +ifeq ($(OUT_DIR),)
>>  KERNEL_XZ := $(BUILD_TOP)/out/.path/xz
>> +else
>> +KERNEL_XZ := $(OUT_DIR)/.path/xz
>> +endif
>> +$(warning KERNEL_XZ=$(KERNEL_XZ)")
>>
>>  # We need to add GCC toolchain to the path no matter what
>>  # for tools like `as`
>> --
>> 2.30.1
>>
>> On Wed, 24 Mar 2021 at 17:58, Javi Ferrer <javi.f.o at gmail.com> wrote:
>>
>>> Fix kernel build for those developers who make use OUT_DIR.
>>>
>>> Signed-off-by: Javi Ferrer <javi.f.o at gmail.com>
>>> ---
>>>  config/BoardConfigKernel.mk | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk
>>> index ea7e808d..6342eb54 100644
>>> --- a/config/BoardConfigKernel.mk
>>> +++ b/config/BoardConfigKernel.mk
>>> @@ -85,7 +85,7 @@ endif
>>>  # is set to true or if the binary to run is whitelisted by in a file
>>> like
>>>  # build/soong/ui/build/paths/config.go. See the path_interposer source
>>> in
>>>  # build/soong/cmd/path_interposer for more details).
>>> -KERNEL_XZ := $(BUILD_TOP)/out/.path/xz
>>> +KERNEL_XZ := $(OUT_DIR)/.path/xz
>>>
>>>  # We need to add GCC toolchain to the path no matter what
>>>  # for tools like `as`
>>> --
>>> 2.30.1
>>>
>>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osuosl.org/pipermail/replicant/attachments/20210324/1fed729c/attachment.html>