[source] image: per-device rootfs: don't fail without opkg

LEDE Commits lede-commits at lists.infradead.org
Sat Sep 24 09:46:12 PDT 2016


neoraider pushed a commit to source.git, branch master:
https://git.lede-project.org/3675e657ed2746776a031766c7c121fc1936235b

commit 3675e657ed2746776a031766c7c121fc1936235b
Author: Matthias Schiffer <mschiffer at universe-factory.net>
AuthorDate: Sat Sep 24 18:36:36 2016 +0200

    image: per-device rootfs: don't fail without opkg
    
    Ignore errors caused by /etc/opkg not existing (i.e. when opkg is not
    selected).
    
    Signed-off-by: Matthias Schiffer <mschiffer at universe-factory.net>
---
 include/image.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/image.mk b/include/image.mk
index 3085400..b963735 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -298,7 +298,7 @@ opkg_target = \
 target-dir-%: FORCE
 	rm -rf $(mkfs_cur_target_dir) $(mkfs_cur_target_dir).opkg
 	$(CP) $(TARGET_DIR) $(mkfs_cur_target_dir)
-	mv $(mkfs_cur_target_dir)/etc/opkg $(mkfs_cur_target_dir).opkg
+	-mv $(mkfs_cur_target_dir)/etc/opkg $(mkfs_cur_target_dir).opkg
 	echo 'src default file://$(PACKAGE_DIR_ALL)' > $(mkfs_cur_target_dir).conf
 	$(if $(call opkg_package_files,$(mkfs_packages_add)), \
 		$(opkg_target) update && \
@@ -309,7 +309,7 @@ target-dir-%: FORCE
 			$(mkfs_packages_remove))
 	$(call Image/mkfs/prepare,$(mkfs_cur_target_dir))
 	$(call prepare_rootfs,$(mkfs_cur_target_dir))
-	mv $(mkfs_cur_target_dir).opkg $(mkfs_cur_target_dir)/etc/opkg
+	-mv $(mkfs_cur_target_dir).opkg $(mkfs_cur_target_dir)/etc/opkg
 	rm -f $(mkfs_cur_target_dir).conf
 
 $(KDIR)/root.%: kernel_prepare



More information about the lede-commits mailing list