[openwrt/openwrt] build,ib: add STRIP_ABI option for manifest

[LEDE Commits]

aparcar pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/69b77dc3b4480f90f02878e09e924a8e3f0116b6

commit 69b77dc3b4480f90f02878e09e924a8e3f0116b6
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Mon Mar 15 15:59:26 2021 -1000

    build,ib: add STRIP_ABI option for manifest
    
    The ImageBuilder `make manifest` prints all installed packages. This
    function can be used to create a list of package and corresponding
    package versions before attempting image creation.
    
    When called with `--strip-abi` OPKG can automatically strip attached
    ABIVersions from package names. Make this function accessible for the
    ImageBuilder by adding a `STRIP_ABI` variable.
    
    Signed-off-by: Paul Spooren <mail at aparcar.org>
    (cherry picked from commit 0f7cd97f812adaf4b2c2048227610d150aec72cc)
---
 target/imagebuilder/files/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 2d1e040286..aeae98aacd 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -54,6 +54,7 @@ Print manifest:
 
 	make manifest PROFILE="<profilename>" # override the default target profile
 	make manifest PACKAGES="<pkg1> [<pkg2> [<pkg3> ...]]" # include extra packages
+	make manifest STRIP_ABI=1 # remove ABI version from printed package names
 
 endef
 $(eval $(call shexport,Helptext))
@@ -129,7 +130,7 @@ _call_manifest: FORCE
 	mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR)
 	$(MAKE) package_reload >/dev/null
 	$(MAKE) package_install >/dev/null
-	$(OPKG) list-installed
+	$(OPKG) list-installed $(if $(STRIP_ABI),--strip-abi)
 
 package_index: FORCE
 	@echo >&2