[openwrt/openwrt] build,IB: reload packages/ only if existing

LEDE Commits lede-commits at lists.infradead.org
Thu Oct 29 20:40:48 EDT 2020


dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/04757f964b9dd4190b27d51914a4c0053d4a38cd

commit 04757f964b9dd4190b27d51914a4c0053d4a38cd
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Sat Oct 17 10:06:03 2020 -1000

    build,IB: reload packages/ only if existing
    
    With the fix of external kmod feeds it is possible to ship the
    ImageBuilder without any packages except the pseudo packages kernel and
    libc. Therefore the local package feeds becomes optional.
    
    This commit adds a check to the package_reload function to only run if
    the local feed is existing.
    
    Signed-off-by: Paul Spooren <mail at aparcar.org>
---
 target/imagebuilder/files/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 03a95dbf6e..0ce5f8b39b 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -138,7 +138,10 @@ package_index: FORCE
 	$(OPKG) update >&2 || true
 
 package_reload:
-	if [ ! -f "$(PACKAGE_DIR)/Packages" ] || [ ! -f "$(PACKAGE_DIR)/Packages.gz" ] || [ "`find $(PACKAGE_DIR) -cnewer $(PACKAGE_DIR)/Packages.gz`" ]; then \
+	if [ -d "$(PACKAGE_DIR)" ] && ( \
+			[ ! -f "$(PACKAGE_DIR)/Packages" ] || \
+			[ ! -f "$(PACKAGE_DIR)/Packages.gz" ] || \
+			[ "`find $(PACKAGE_DIR) -cnewer $(PACKAGE_DIR)/Packages.gz`" ] ); then \
 		echo "Package list missing or not up-to-date, generating it." >&2 ;\
 		$(MAKE) package_index; \
 	else \



More information about the lede-commits mailing list