[openwrt/openwrt] ca-certificates: canonical the build dir

LEDE Commits lede-commits at lists.infradead.org
Thu Nov 12 12:22:32 EST 2020


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/8d7a6d48ebd826a68c3149e77ac08cd38a91ecde

commit 8d7a6d48ebd826a68c3149e77ac08cd38a91ecde
Author: Jianhui Zhao <zhaojh329 at gmail.com>
AuthorDate: Thu Nov 5 22:28:37 2020 +0800

    ca-certificates: canonical the build dir
    
    The previous build directory "build_dir/target-xx/work/"
    contaminated the entire build directory.
    
    Signed-off-by: Jianhui Zhao <zhaojh329 at gmail.com>
---
 package/system/ca-certificates/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/system/ca-certificates/Makefile b/package/system/ca-certificates/Makefile
index 239b442ebd..ca3756b34d 100644
--- a/package/system/ca-certificates/Makefile
+++ b/package/system/ca-certificates/Makefile
@@ -14,7 +14,6 @@ PKG_MAINTAINER:=
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/c/ca-certificates
 PKG_HASH:=43766d5a436519503dfd65ab83488ae33ab4d4ca3d0993797b58c92eb9ed4e63
-PKG_BUILD_DIR:=$(BUILD_DIR)/work
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -35,6 +34,13 @@ define Package/ca-bundle
   PROVIDES:=ca-certs
 endef
 
+define Build/Prepare
+	$(DECOMPRESS_CMD) $(HOST_TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+	$(Build/Patch)
+endef
+
+MAKE_PATH := work
+
 define Build/Install
 	mkdir -p \
 		$(PKG_INSTALL_DIR)/usr/sbin \



More information about the lede-commits mailing list