ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-18 21:28:02 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

include/package-pack: escape package description for APK mkpkg

Browse Source 
Escape special char for package description for APK mkpkg as the
description is passed as an args to mkpkg with --info option and can
easily escape from the "".

Currently escaped char `, $, ", \.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2024-11-17 19:09:31 +01:00
parent 4511fa4b30
commit 43455f1075
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/package-pack.mk
View File

@ -8,6 +8,10 @@ endif
IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg
define description_escape
$(subst `,\`,$(subst $$,\$$,$(subst ",\",$(subst \,\\,$(1)))))
endef
# Generates a make statement to return a wildcard for candidate ipkg files # Generates a make statement to return a wildcard for candidate ipkg files
# 1: package name # 1: package name
define gen_package_wildcard define gen_package_wildcard
@ -339,7 +343,7 @@ else
$(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk mkpkg \ $(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk mkpkg \
--info "name:$(1)$$(ABIV_$(1))" \ --info "name:$(1)$$(ABIV_$(1))" \
--info "version:$(VERSION)" \ --info "version:$(VERSION)" \
--info "description:$$(strip $$(Package/$(1)/description))" \ --info "description:$$(call description_escape,$$(strip $$(Package/$(1)/description)))" \
--info "arch:$(PKGARCH)" \ --info "arch:$(PKGARCH)" \
--info "license:$(LICENSE)" \ --info "license:$(LICENSE)" \
--info "origin:$(SOURCE)" \ --info "origin:$(SOURCE)" \