diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-09-26 15:25:38 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-09-26 17:57:58 +0200 |
| commit | 021b96d7c5c668fbcb5375c65cee90832bb2854f (patch) | |
| tree | 216f408ebe7f02da577aaaeacde8641e833f2d03 | |
| parent | 593dfac90938d62558de1fa13ac027c319284fe3 (diff) | |
| download | upstream-021b96d7c5c668fbcb5375c65cee90832bb2854f.tar.gz upstream-021b96d7c5c668fbcb5375c65cee90832bb2854f.tar.bz2 upstream-021b96d7c5c668fbcb5375c65cee90832bb2854f.zip | |
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>
| -rw-r--r-- | include/image.mk | 2 | ||||
| -rw-r--r-- | include/rootfs.mk | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/image.mk b/include/image.mk index 18a3ed8ea9..8b7d91d726 100644 --- 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 6a6610019f..15f71ae0df 100644 --- 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 |