aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2016-09-26 15:25:38 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2016-09-26 17:57:58 +0200
commit593dfac90938d62558de1fa13ac027c319284fe3 (patch)
tree99d67f25b9177b6ecf1137fb48ba53de21fb3e1b
parent26b4216f95d2c262144d7e3744b0a541cf210506 (diff)
downloadupstream-593dfac90938d62558de1fa13ac027c319284fe3.tar.gz
upstream-593dfac90938d62558de1fa13ac027c319284fe3.tar.bz2
upstream-593dfac90938d62558de1fa13ac027c319284fe3.zip
image: per-device rootfs: first remove, then install packages
Some DEVICE_PACKAGES definitions replace one package variant with another (e.g. wpad-mini is replaced with wpad). To avoid file conflicts, first remove, then install packages. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-rw-r--r--include/image.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/image.mk b/include/image.mk
index 13874bec34..18a3ed8ea9 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -287,13 +287,13 @@ target-dir-%: FORCE
$(CP) $(TARGET_DIR_ORIG) $(mkfs_cur_target_dir)
-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 \
+ $(mkfs_packages_remove))
$(if $(call opkg_package_files,$(mkfs_packages_add)), \
$(opkg_target) update && \
$(opkg_target) install \
$(call opkg_package_files,$(mkfs_packages_add)))
- $(if $(mkfs_packages_remove), \
- $(call opkg,$(mkfs_cur_target_dir)) remove \
- $(mkfs_packages_remove))
$(call prepare_rootfs,$(mkfs_cur_target_dir))
-mv $(mkfs_cur_target_dir).opkg $(mkfs_cur_target_dir)/etc/opkg
rm -f $(mkfs_cur_target_dir).conf