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

pkgbase: Remove package name mangling in generate-ucl.sh

Browse Source 
The mangling was present in the initial revision of the script, but its
purpose is not clear.  It may have been to avoid defining make(1)
variables with a dash in the name, but this is permitted.  Furthermore,
it results in invalid dependency information if a dependency's name
contains an underscore, causing e.g., libcompiler_rt-dev to depend on
libcompiler-rt, and resulting in warnings when installing base system
packages.  Remove the mangling.

Reviewed by:	manu
MFC after:	2 months
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D29883
This commit is contained in:
Mark Johnston 2021-04-26 15:15:31 -04:00
parent 409ab7e109
commit 09d83a060f
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,6 @@ main() {
shift $(( ${OPTIND} - 1 ))
outname="$(echo ${outname} | tr '-' '_')"
vital="false"
case "${outname}" in
@ -52,33 +51,33 @@ main() {
_descr="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESCR)"
vital="true"
;;
*_lib32_dev)
outname="${outname%%_lib32_dev}"
*-lib32_dev)
outname="${outname%%-lib32_dev}"
_descr="32-bit Libraries, Development Files"
pkgdeps="${outname}"
;;
*_lib32_dbg)
outname="${outname%%_lib32_dbg}"
*-lib32_dbg)
outname="${outname%%-lib32_dbg}"
_descr="32-bit Libraries, Debugging Symbols"
pkgdeps="${outname}"
;;
*_lib32)
outname="${outname%%_lib32}"
*-lib32)
outname="${outname%%-lib32}"
_descr="32-bit Libraries"
pkgdeps="${outname}"
;;
*_dev)
outname="${outname%%_dev}"
*-dev)
outname="${outname%%-dev}"
_descr="Development Files"
pkgdeps="${outname}"
;;
*_dbg)
outname="${outname%%_dbg}"
*-dbg)
outname="${outname%%-dbg}"
_descr="Debugging Symbols"
pkgdeps="${outname}"
;;
*_man)
outname="${outname%%_man}"
*-man)
outname="${outname%%-man}"
_descr="Manual Pages"
pkgdeps="${outname}"
;;
@ -91,10 +90,6 @@ main() {
;;
esac
outname="${outname%%_*}"
pkgdeps="$(echo ${pkgdeps} | tr '_' '-')"
desc="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESC)"
comment="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_COMMENT)"