From nobody Wed Jan 05 17:24:01 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6F52F19201BE; Wed, 5 Jan 2022 17:24:02 +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 4JTbtp0Pvlz3H0l; Wed, 5 Jan 2022 17:24:02 +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 E27A7107B0; Wed, 5 Jan 2022 17:24:01 +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 205HO1gj096861; Wed, 5 Jan 2022 17:24:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 205HO1ol096860; Wed, 5 Jan 2022 17:24:01 GMT (envelope-from git) Date: Wed, 5 Jan 2022 17:24:01 GMT Message-Id: <202201051724.205HO1ol096860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 3b09235bea3f - stable/13 - pkgbase: Remove package name mangling in generate-ucl.sh List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3b09235bea3f15e8f2ec883057c861c3326e7e04 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641403442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dXc+Bpxzn+4NdKgeYW4OWzMIqJmQl3KBHlEvc7ejICU=; b=gkth5MLpYoIFZEBFHGrvkb+6EucqsVmzV9ndnUiNuOvC3eOkikAYFTvDQRrw2nGEhwxg4Q fYl0eBfwCMuQc+EvGaNz0us4VFy72D4IpJzRP1xmPYk71nr735RlIWRCDpOMES35j9R79d q/Jns1Gcgl4eMatTyKTZiIg1Z+Z+kMLXn8dGvjXtPkD3fdGnofoiuwulBI3eeFQ2JzJgZW DO+DRTFQk/6rj1fqXVRnTm9g9/F88VA0u+QiaskpociWDj+Qx7v5/y2Gfqmux1Ck4Gbqrz DXKMyxxhsLJ2z7p8IbTtsCo1pzAbY+ImTXy2RVIGnoiHA0PP/RWHV2gFunrwqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641403442; a=rsa-sha256; cv=none; b=WB5bgO8MLdGKzPuagWfMZeGGrESItnibi++01LhZcmPRuf+z9UADfr2asUc/9yPVokTTsq mChAhHYjJLMQsrxzYO5xZUEGNlepvNa+ed74td3mQFLirhtFbO0mYTe1fqhqp2qDdX673U RtcHU8yE0fjGpXDPFsWCGfYNmsVpbnK9B1mMKtuMcuM8xjCkzzoyrUoR0tfuOmvlqcy+cP RqE+/uRvyYHqS0gFMlM8gZcnwTXW/yk2c67Y91h245KtPOKsCmk7E+cwbyJ0QGc9ymBPRJ Jo90UZGwEdm+Kn9tw54xiD4UTOKk0XYIdPx5Ecbe69U7WtiW2ExSTJ/cvNQK/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=3b09235bea3f15e8f2ec883057c861c3326e7e04 commit 3b09235bea3f15e8f2ec883057c861c3326e7e04 Author: Mark Johnston AuthorDate: 2021-04-26 19:15:31 +0000 Commit: Emmanuel Vadot CommitDate: 2022-01-05 17:23:48 +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 (cherry picked from commit 09d83a060f37ba17b29c0e90f3a0e9aa9c735592) --- 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)"