include/package-pack: translate PKGARCH for APK
We have a lot of script-only packages that are universal for all arch-s
and those set PKGARCH:=all to indicate it.
Unfortunately, APK expects architecture to be set to "noarch" instead to
indicate that its universal so instead of having to update all packages
that set PKGARCH:=all and thus break OPKG lets simply translate "all" to
"noarch" when generating the APK package.
This will be required as soon we update APK to include [1] as it will start
enforcing package architecture checks.
[1] c1a3e69f24
Suggested-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/17015
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
8ec35a2a15
commit
0d0a5eb4b5
|
@ -344,7 +344,7 @@ else
|
||||||
--info "name:$(1)$$(ABIV_$(1))" \
|
--info "name:$(1)$$(ABIV_$(1))" \
|
||||||
--info "version:$(VERSION)" \
|
--info "version:$(VERSION)" \
|
||||||
--info "description:$$(call description_escape,$$(strip $$(Package/$(1)/description)))" \
|
--info "description:$$(call description_escape,$$(strip $$(Package/$(1)/description)))" \
|
||||||
--info "arch:$(PKGARCH)" \
|
$(if $(findstring all,$(PKGARCH)),--info "arch:noarch",--info "arch:$(PKGARCH)") \
|
||||||
--info "license:$(LICENSE)" \
|
--info "license:$(LICENSE)" \
|
||||||
--info "origin:$(SOURCE)" \
|
--info "origin:$(SOURCE)" \
|
||||||
--info "url:$(URL)" \
|
--info "url:$(URL)" \
|
||||||
|
|
Loading…
Reference in New Issue