[openwrt/openwrt] sdk: do not exclude all doc directories

LEDE Commits lede-commits at lists.infradead.org
Mon May 8 15:52:36 PDT 2023


ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/7bfe7e06767767914f42785d12d2fceca189854e

commit 7bfe7e06767767914f42785d12d2fceca189854e
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Sun May 7 19:33:40 2023 -0400

    sdk: do not exclude all doc directories
    
    Some packages which are using local gnulib source
    are expecting files to exist in the directory:
    
    staging_dir/host/share/gnulib/doc
    
    so delete the other doc directories directly
    instead of excluding all of them.
    
    Fixes: d167adbc4 ("gettext-full: bootstrap to local gnulib source")
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
---
 target/sdk/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index d9f67dae9e..b688eb4cba 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -32,7 +32,6 @@ EXCLUDE_DIRS:= \
 	*.install.clean \
 	*.install.flags \
 	*.install \
-	*/doc \
 	*/share/locale
 
 SDK_DIRS = \
@@ -158,6 +157,8 @@ $(BIN_DIR)/$(SDK_NAME).tar.xz: clean
 		$(SDK_BUILD_DIR)/package/kernel/
 
 	-rm -rf $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/.prereq-build
+	-rm -rf $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/doc
+	-rm -rf $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/share/doc
 
 	-rm -f $(SDK_BUILD_DIR)/feeds.conf.default
 	$(if $(BASE_FEED),echo "$(BASE_FEED)" > $(SDK_BUILD_DIR)/feeds.conf.default)




More information about the lede-commits mailing list