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: Matthias Schiffer <mschiffer@universe-factory.net>

diff --git a/include/image.mk b/include/image.mk
index 18a3ed8ea96e5c57d70141e095e540f30a71a439..8b7d91d726ab6a7742224627c5408e4a04daf036 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -288,7 +288,7 @@ target-dir-%: FORCE
        -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 $(mkfs_packages_remove), \
-               $(call opkg,$(mkfs_cur_target_dir)) remove \
+               -$(call opkg,$(mkfs_cur_target_dir)) remove \
                        $(mkfs_packages_remove))
        $(if $(call opkg_package_files,$(mkfs_packages_add)), \
                $(opkg_target) update && \

diff --git a/include/rootfs.mk b/include/rootfs.mk
index 6a6610019f6a4fb6c07c9c45feea338e202df1fa..15f71ae0dfbf77f0571977950e2eef857fcf897b 100644 (file)
--- a/include/rootfs.mk
+++ b/include/rootfs.mk
@@ -40,10 +40,7 @@ opkg = \
   TMPDIR=$(1)/tmp \
   $(STAGING_DIR_HOST)/bin/opkg \
        --offline-root $(1) \
-       --force-depends \
-       --force-overwrite \
        --force-postinstall \
-       --force-maintainer \
        --add-dest root:/ \
        --add-arch all:100 \
        --add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200