Skip to content
Snippets Groups Projects
Unverified Commit 021b96d7 authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

rootfs: remove unnecessary and potentially harmful force flags from opkg call


Especially --force-overwrite and --force-depends will often lead to broken
images; it's better to fail the build in such cases than to silently ignore
the errors.

Instead, ignore errors in the per-device rootfs opkg remove command, so
the build doesn't break when packages can't be removed because of
dependencies.

Signed-off-by: default avatarMatthias Schiffer <mschiffer@universe-factory.net>
parent 593dfac9
No related branches found
No related tags found
No related merge requests found
...@@ -288,7 +288,7 @@ target-dir-%: FORCE ...@@ -288,7 +288,7 @@ target-dir-%: FORCE
-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 $(mkfs_packages_remove), \ $(if $(mkfs_packages_remove), \
$(call opkg,$(mkfs_cur_target_dir)) remove \ -$(call opkg,$(mkfs_cur_target_dir)) remove \
$(mkfs_packages_remove)) $(mkfs_packages_remove))
$(if $(call opkg_package_files,$(mkfs_packages_add)), \ $(if $(call opkg_package_files,$(mkfs_packages_add)), \
$(opkg_target) update && \ $(opkg_target) update && \
......
...@@ -40,10 +40,7 @@ opkg = \ ...@@ -40,10 +40,7 @@ opkg = \
TMPDIR=$(1)/tmp \ TMPDIR=$(1)/tmp \
$(STAGING_DIR_HOST)/bin/opkg \ $(STAGING_DIR_HOST)/bin/opkg \
--offline-root $(1) \ --offline-root $(1) \
--force-depends \
--force-overwrite \
--force-postinstall \ --force-postinstall \
--force-maintainer \
--add-dest root:/ \ --add-dest root:/ \
--add-arch all:100 \ --add-arch all:100 \
--add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200 --add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment