From: Matthias Schiffer Date: Mon, 26 Sep 2016 13:25:38 +0000 (+0200) Subject: image: per-device rootfs: first remove, then install packages X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=593dfac90938d62558de1fa13ac027c319284fe3;p=openwrt%2Fstaging%2Fneocturne.git 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 --- 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