<div dir="ltr"><div dir="ltr">On Sun, May 12, 2019 at 3:15 AM Hauke Mehrtens <<a href="mailto:hauke@hauke-m.de">hauke@hauke-m.de</a>> wrote:<br></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On 5/2/19 7:52 PM, Jeffery To wrote:<br>
> This changes the default PKG_BUILD_DIR to take BUILD_VARIANT into<br>
> account (if set), so that packages do not need to manually override<br>
> PKG_BUILD_DIR just to handle variants.<br>
> <br>
> This also updates most base packages with variants to use the updated<br>
> default PKG_BUILD_DIR.<br>
> <br>
> Signed-off-by: Jeffery To <<a href="mailto:jeffery.to@gmail.com" target="_blank">jeffery.to@gmail.com</a>><br>
> ---<br>
>  include/<a href="http://package.mk" rel="noreferrer" target="_blank">package.mk</a>                        | 2 +-<br>
>  package/libs/ustream-ssl/Makefile         | 2 --<br>
>  package/network/services/hostapd/Makefile | 2 --<br>
>  package/network/services/odhcpd/Makefile  | 2 --<br>
>  package/network/services/openvpn/Makefile | 1 -<br>
>  package/network/services/ppp/Makefile     | 3 ++-<br>
>  package/network/utils/iproute2/Makefile   | 4 ++--<br>
>  package/network/utils/iw/Makefile         | 1 -<br>
>  package/network/utils/tcpdump/Makefile    | 1 -<br>
>  package/system/ucert/Makefile             | 2 --<br>
>  package/utils/px5g/Makefile               | 1 -<br>
>  11 files changed, 5 insertions(+), 16 deletions(-)<br>
> <br>
> diff --git a/include/<a href="http://package.mk" rel="noreferrer" target="_blank">package.mk</a> b/include/<a href="http://package.mk" rel="noreferrer" target="_blank">package.mk</a><br>
> index 569ad647d6..015117bd3a 100644<br>
> --- a/include/<a href="http://package.mk" rel="noreferrer" target="_blank">package.mk</a><br>
> +++ b/include/<a href="http://package.mk" rel="noreferrer" target="_blank">package.mk</a><br>
> @@ -11,7 +11,7 @@ all: $(if $(DUMP),dumpinfo,$(if $(CHECK),check,compile))<br>
>  <br>
>  include $(INCLUDE_DIR)/<a href="http://download.mk" rel="noreferrer" target="_blank">download.mk</a><br>
>  <br>
> -PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))<br>
> +PKG_BUILD_DIR ?= $(BUILD_DIR)/$(if $(BUILD_VARIANT),$(PKG_NAME)-$(BUILD_VARIANT)/)$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))<br>
>  PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install<br>
>  PKG_BUILD_PARALLEL ?=<br>
>  PKG_USE_MIPS16 ?= 1<br>
<br>
Please also update the variable in include/<a href="http://kernel.mk" rel="noreferrer" target="_blank">kernel.mk</a> then you should not<br>
need the workarounds for the packages which include include/<a href="http://kernel.mk" rel="noreferrer" target="_blank">kernel.mk</a><br>
and more.<br>
<br>
Hauke<br></blockquote><div><br></div><div>I've updated include/<a href="http://kernel.mk">kernel.mk</a> and will submit a revised patch shortly, but now iproute2 and ppp are built inside KERNEL_BUILD_DIR instead of BUILD_DIR, not sure if this is an issue.</div><div><br></div><div>Jeff</div><div><br></div></div></div>