aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@FreeBSD.org>2020-08-11 10:07:59 +0000
committerEmmanuel Vadot <manu@FreeBSD.org>2020-08-11 10:07:59 +0000
commita90022d4d13a34b889081ca0ba9b9af4c78bd78d (patch)
tree152ef950c0889c7eabefbddc43b16df0ca34122a
parent82087d4b689e2478d2dcc00408d4c7f471cd88f1 (diff)
downloadsrc-a90022d4d13a34b889081ca0ba9b9af4c78bd78d.tar.gz
src-a90022d4d13a34b889081ca0ba9b9af4c78bd78d.zip
pkgbase: Replace / with | for PKG_WWW
PKG_WWW contain / char, replace the delimiter by a '|'. Reported by: 0mp
Notes
Notes: svn path=/head/; revision=364104
-rw-r--r--Makefile.inc14
-rwxr-xr-xrelease/packages/generate-ucl.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index cc2fb0d698d8..313adf85cb92 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1915,7 +1915,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap
-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,^""$,${_default_flavor},}-${_kerne
-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\" ' \
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index d9c791da290e..b3d76eb4019d 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -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