From owner-dev-commits-src-main@freebsd.org Mon Apr 26 19:43:38 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A1D9C5EE20E; Mon, 26 Apr 2021 19:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FTb164CLFz4Vjp; Mon, 26 Apr 2021 19:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 834015534; Mon, 26 Apr 2021 19:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13QJhcBa032625; Mon, 26 Apr 2021 19:43:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13QJhcQU032624; Mon, 26 Apr 2021 19:43:38 GMT (envelope-from git) Date: Mon, 26 Apr 2021 19:43:38 GMT Message-Id: <202104261943.13QJhcQU032624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 09d83a060f37 - main - pkgbase: Remove package name mangling in generate-ucl.sh MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09d83a060f37ba17b29c0e90f3a0e9aa9c735592 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Apr 2021 19:43:38 -0000 The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=09d83a060f37ba17b29c0e90f3a0e9aa9c735592 commit 09d83a060f37ba17b29c0e90f3a0e9aa9c735592 Author: Mark Johnston AuthorDate: 2021-04-26 19:15:31 +0000 Commit: Mark Johnston CommitDate: 2021-04-26 19:16:04 +0000 pkgbase: Remove package name mangling in generate-ucl.sh 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 --- release/packages/generate-ucl.sh | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index 10d9d3162f9c..95a328d10637 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -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)"