ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-24 15:56:49 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

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

Browse Source 
Ignore errors caused by /etc/opkg not existing (i.e. when opkg is not
selected).

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer 2016-09-24 18:36:36 +02:00
parent e916579340
commit 3675e657ed
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/image.mk
View File

@ -298,7 +298,7 @@ opkg_target = \
target-dir-%: FORCE target-dir-%: FORCE
rm -rf $(mkfs_cur_target_dir) $(mkfs_cur_target_dir).opkg rm -rf $(mkfs_cur_target_dir) $(mkfs_cur_target_dir).opkg
$(CP) $(TARGET_DIR) $(mkfs_cur_target_dir) $(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 echo 'src default file://$(PACKAGE_DIR_ALL)' > $(mkfs_cur_target_dir).conf
$(if $(call opkg_package_files,$(mkfs_packages_add)), \ $(if $(call opkg_package_files,$(mkfs_packages_add)), \
$(opkg_target) update && \ $(opkg_target) update && \
@ -309,7 +309,7 @@ target-dir-%: FORCE
$(mkfs_packages_remove)) $(mkfs_packages_remove))
$(call Image/mkfs/prepare,$(mkfs_cur_target_dir)) $(call Image/mkfs/prepare,$(mkfs_cur_target_dir))
$(call prepare_rootfs,$(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 rm -f $(mkfs_cur_target_dir).conf
$(KDIR)/root.%: kernel_prepare $(KDIR)/root.%: kernel_prepare