Author: manu
Date: Tue Aug 11 10:07:59 2020
New Revision: 364104
URL: https://svnweb.freebsd.org/changeset/base/364104
Log:
pkgbase: Replace / with | for PKG_WWW
PKG_WWW contain / char, replace the delimiter by a '|'.
Reported by: 0mp
Modified:
head/Makefile.inc1
head/release/packages/generate-ucl.sh
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Tue Aug 11 08:42:24 2020 (r364103)
+++ head/Makefile.inc1 Tue Aug 11 10:07:59 2020 (r364104)
@@ -1915,7 +1915,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_defaul
-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
- -e "s/%PKG_WWW%/${PKG_WWW}/" \
+ -e "s|%PKG_WWW%|${PKG_WWW}|" \
${SRCDIR}/release/packages/kernel.ucl \
> ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl
; \
awk -F\" ' \
@@ -1951,7 +1951,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_
-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
- -e "s/%PKG_WWW%/${PKG_WWW}/" \
+ -e "s|%PKG_WWW%|${PKG_WWW}|" \
${SRCDIR}/release/packages/kernel.ucl \
> ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl
; \
awk -F\" ' \
Modified: head/release/packages/generate-ucl.sh
==============================================================================
--- head/release/packages/generate-ucl.sh Tue Aug 11 08:42:24 2020
(r364103)
+++ head/release/packages/generate-ucl.sh Tue Aug 11 10:07:59 2020
(r364104)
@@ -147,7 +147,7 @@ EOF
-e "s/%DESC%/${desc}/" \
-e "s/%CAP_MKDB_ENDIAN%/${cap_arg}/g" \
-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}/" \
${uclfile}
return 0
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
