Revert "imagebuilder: add ABI suffix to packages when using apk"

This reverts commit 31cdd13.

After working with George we found that adding the ABI suffix to the
imagebuilder packages install process in apk cases is problematic [1].

Ideally, ABI suffixes should only appear in the dependencies of other
packages, that means they should not be added to apk's world because it
will not be possible to satisfy the constraint (in ASU sysupgrades) when
the abi-versioned package gets upgraded in the remote repositories,
apk's world should only contains the packages names without abi
suffixes.
Anyway, it is possible to add them to apk world and this is handled
correctly in sysupgrade paths and ASU's clients and server by removing
the abi-suffixes from the package lists before making the config backups
and sending the sysupgrade image requests.

Return to the previous state since the basename of abi-packages (without
the ABI suffix) can and should be handled correctly by the apk-backed
imagebuilder system.

[1]: openwrt#21747
Co-authored-by: George Sapkin <george@sapk.in>
Signed-off-by: Mario Andrés Pérez <mapb_@outlook.com>

Author: map-b

target/imagebuilder/files/Makefile

@@ -145,32 +145,6 @@ BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel)
 BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES))
 BUILD_PACKAGES:=$(USER_PACKAGES) $(BUILD_PACKAGES)
 BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES))
-
-ifneq ($(CONFIG_USE_APK),)
-BUILD_PACKAGES+= \
-  "base-files=$(BASE_FILES_VERSION)" \
-  "libc=$(LIBC_VERSION)" \
-  "kernel=$(KERNEL_VERSION)"
-endif
-
-# Get ABI version suffix for a package from an apk index
-#
-# 1: package name
-define GetABISuffix
-$(shell $(APK) query --fields tags --match provides $(1) | grep openwrt:abiversion | awk -F= '{print $$2; exit}')
-endef
-
-# Format packages by adding an ABI version suffix if found
-#
-# 1: list of packages
-define FormatPackages
-$(strip $(foreach pkg,$(strip $(subst ",,$(1))),
-  $(eval pkg_name:=$(firstword $(subst =, ,$(pkg))))
-  $(if $(findstring =,$(pkg)),$(eval pkg_ver:==$(lastword $(subst =, ,$(pkg)))))
-  $(pkg_name)$(call GetABISuffix,$(pkg_name))$(pkg_ver)
-))
-endef
-
 PACKAGES:=
 
 _call_image: staging_dir/host/.prereq-build
@@ -255,8 +229,10 @@ ifeq ($(CONFIG_USE_APK),)
 	$(OPKG) install $(wildcard $(PACKAGE_DIR)/kernel_*.ipk)
 	$(OPKG) install $(BUILD_PACKAGES)
 else
-	$(eval BUILD_PACKAGES:=$(call FormatPackages,$(BUILD_PACKAGES)))
-	$(APK) add --arch $(ARCH_PACKAGES) --no-scripts $(BUILD_PACKAGES)
+	$(APK) add --arch $(ARCH_PACKAGES) --no-scripts $(BUILD_PACKAGES) \
+        "base-files=$(BASE_FILES_VERSION)" \
+        "libc=$(LIBC_VERSION)" \
+        "kernel=$(KERNEL_VERSION)"
 endif
 
 prepare_rootfs: FORCE