d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgbase: Replace / with | for PKG_WWW

Browse Source 
PKG_WWW contain / char, replace the delimiter by a '|'.

Reported by:	0mp
This commit is contained in:
Emmanuel Vadot 2020-08-11 10:07:59 +00:00
parent 82087d4b68
commit a90022d4d1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.inc1
View File

@ -1915,7 +1915,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap
-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
-e "s/%PKG_WWW%/${PKG_WWW}/" \ -e "s|%PKG_WWW%|${PKG_WWW}|" \
${SRCDIR}/release/packages/kernel.ucl \ ${SRCDIR}/release/packages/kernel.ucl \
> ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ > ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
awk -F\" ' \ awk -F\" ' \
@ -1951,7 +1951,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne
-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
-e "s/%PKG_WWW%/${PKG_WWW}/" \ -e "s|%PKG_WWW%|${PKG_WWW}|" \
${SRCDIR}/release/packages/kernel.ucl \ ${SRCDIR}/release/packages/kernel.ucl \
> ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ > ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \
awk -F\" ' \ awk -F\" ' \

2
release/packages/generate-ucl.sh
View File

@ -147,7 +147,7 @@ EOF
-e "s/%DESC%/${desc}/" \ -e "s/%DESC%/${desc}/" \
-e "s/%CAP_MKDB_ENDIAN%/${cap_arg}/g" \ -e "s/%CAP_MKDB_ENDIAN%/${cap_arg}/g" \
-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
-e "s/%PKG_WWW%/${PKG_WWW}/" \ -e "s|%PKG_WWW%|${PKG_WWW}|" \
-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
${uclfile} ${uclfile}
return 0 return 0