diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2019-08-04 04:45:06 +0800 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-08-05 23:22:26 +0200 |
| commit | e545fac8d968864a965edb9e50c6f90940b0a6c9 (patch) | |
| tree | 88124cfc0b0dae11f216a8391dcb66916c55cc5d /package/network/services | |
| parent | a3a2b4857eb9c926bdbce7809bf5bd92f777e967 (diff) | |
| download | upstream-e545fac8d968864a965edb9e50c6f90940b0a6c9.tar.gz upstream-e545fac8d968864a965edb9e50c6f90940b0a6c9.tar.bz2 upstream-e545fac8d968864a965edb9e50c6f90940b0a6c9.zip | |
build: include BUILD_VARIANT in PKG_BUILD_DIR
This changes the default PKG_BUILD_DIR to take BUILD_VARIANT into
account (if set), so that packages do not need to manually override
PKG_BUILD_DIR just to handle variants.
This also updates most base packages with variants to use the updated
default PKG_BUILD_DIR.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Diffstat (limited to 'package/network/services')
| -rw-r--r-- | package/network/services/hostapd/Makefile | 2 | ||||
| -rw-r--r-- | package/network/services/odhcpd/Makefile | 2 | ||||
| -rw-r--r-- | package/network/services/openvpn/Makefile | 1 | ||||
| -rw-r--r-- | package/network/services/ppp/Makefile | 2 |
4 files changed, 0 insertions, 7 deletions
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index e389efccb2..be2a9069c7 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -66,8 +66,6 @@ ifeq ($(LOCAL_VARIANT),mesh) CONFIG_VARIANT:=full endif -PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) - include $(INCLUDE_DIR)/package.mk STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(CONFIG_WPA_MSG_MIN_PRIORITY) diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile index 6e2a1df506..9f378f9e62 100644 --- a/package/network/services/odhcpd/Makefile +++ b/package/network/services/odhcpd/Makefile @@ -19,8 +19,6 @@ PKG_MIRROR_HASH:=b9ad88274843584629a15ac4200f910e1f14734d7b02650a0305540733fb739 PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com> PKG_LICENSE:=GPL-2.0 -PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) - PKG_INSTALL:=1 PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_odhcpd_$(BUILD_VARIANT)_ext_cer_id diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile index 30c74789a4..aed9f43f80 100644 --- a/package/network/services/openvpn/Makefile +++ b/package/network/services/openvpn/Makefile @@ -18,7 +18,6 @@ PKG_SOURCE_URL:=\ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_HASH:=a42f53570f669eaf10af68e98d65b531015ff9e12be7a62d9269ea684652f648 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_INSTALL:=1 diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile index c8016dc619..10e7656ea4 100644 --- a/package/network/services/ppp/Makefile +++ b/package/network/services/ppp/Makefile @@ -23,8 +23,6 @@ PKG_CPE_ID:=cpe:/a:samba:ppp PKG_RELEASE_VERSION:=2.4.7 PKG_VERSION:=$(PKG_RELEASE_VERSION).git-$(PKG_SOURCE_DATE) -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) - PKG_BUILD_DEPENDS:=libpcap PKG_BUILD_PARALLEL:=1 |