apk: add package

[openwrt/staging/aparcar.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index b801ef993c310c1acafb4b635211e585dddeb588..3f42ed4369bff83ee14f73a0e0905adfe9595e76 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -264,7 +264,7 @@ define Image/mkfs/ext4
 endef
 
 define Image/Manifest
-       $(call opkg,$(TARGET_DIR_ORIG)) list-installed > \
+       $(call apk,$(TARGET_DIR_ORIG)) list --quiet --manifest | sort > \
                $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest
 endef
 
@@ -304,25 +304,19 @@ mkfs_packages_add = $(foreach pkg,$(filter-out -%,$(mkfs_packages)),$(pkg)$(call
 mkfs_packages_remove = $(foreach pkg,$(patsubst -%,%,$(filter -%,$(mkfs_packages))),$(pkg)$(call GetABISuffix,$(pkg)))
 mkfs_cur_target_dir = $(call mkfs_target_dir,pkg=$(target_params))
 
-opkg_target = \
-       $(call opkg,$(mkfs_cur_target_dir)) \
-               -f $(mkfs_cur_target_dir).conf
+apk_target = $(call apk,$(mkfs_cur_target_dir))
 
 target-dir-%: FORCE
-       rm -rf $(mkfs_cur_target_dir) $(mkfs_cur_target_dir).opkg
+       rm -rf $(mkfs_cur_target_dir) $(mkfs_cur_target_dir).apk
        $(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
+       mv $(mkfs_cur_target_dir)/etc/apk/repositories $(mkfs_cur_target_dir).repositories
        $(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)))
-       -$(CP) -T $(mkfs_cur_target_dir).opkg/ $(mkfs_cur_target_dir)/etc/opkg/
-       rm -rf $(mkfs_cur_target_dir).opkg $(mkfs_cur_target_dir).conf
+               $(apk_target) del $(mkfs_packages_remove))
+       $(if $(mkfs_packages_add), \
+               $(apk_target) add $(mkfs_packages_add))
+       mv $(mkfs_cur_target_dir).repositories $(mkfs_cur_target_dir)/etc/apk/repositories
        $(call prepare_rootfs,$(mkfs_cur_target_dir),$(TOPDIR)/files)
+       $(apk_target) list --quiet --manifest | sort > $(mkfs_cur_target_dir).manifest
 
 $(KDIR)/root.%: kernel_prepare
        $(call Image/mkfs/$(word 1,$(target_params)),$(target_params))