diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-09-24 18:36:36 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-09-24 18:41:37 +0200 |
| commit | 3675e657ed2746776a031766c7c121fc1936235b (patch) | |
| tree | bf158e3c2d6c2655668f0a9776b8384ba9314950 | |
| parent | e9165793409ceccaeef6674c691b875a83fcb97f (diff) | |
| download | upstream-3675e657ed2746776a031766c7c121fc1936235b.tar.gz upstream-3675e657ed2746776a031766c7c121fc1936235b.tar.bz2 upstream-3675e657ed2746776a031766c7c121fc1936235b.zip | |
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@universe-factory.net>
| -rw-r--r-- | include/image.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/image.mk b/include/image.mk index 3085400666..b963735266 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 |