From nobody Wed Feb 12 01:44:30 2025 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 4Yt1MM1DyFz5n7sS; Wed, 12 Feb 2025 01:44:31 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yt1ML6M99z3jRF; Wed, 12 Feb 2025 01:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324670; 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=/Cg/bsxm7MGYPlUyyderW22faCKQz7EArKTHru09Vio=; b=mCoBmRXkx8YI+SQuQn6u3ZtpmnLOUasvjLEuqmtr/pvQvG4YdBUiWqm91HPLVpiHypiHhX FAT18SHTdKhO89+JRioRCMb6wHiherD/MQIusfYmxd1omT/i6kFmpjw1gaK07bIULyO0Kf pC+IP9UOZImfK6QcKdKoH+NQOtEfa7hTEdfCWmczkow/LfSoGLWFcgiBLS6tb7VMVFE1z2 EsbaBhrghIXQqtKwpQ7ou6vnTRhnJ6c8sUzqHbtj4UIo9ZDxRKOK1NzAysspSE239yjTYe ZpJez+aCWYZrddnbPLrcSdNbb5xNLc9jOOFixDF6kX5rnYz/f3nPND1y2boTjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739324670; 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=/Cg/bsxm7MGYPlUyyderW22faCKQz7EArKTHru09Vio=; b=hcniZhGiPis4Nd3jTfboaynxSKwYHeWDRpQM838e0wZ3cS+qBlrPYa1MnjHR4Jb5ybffi3 xpuQZ2EJfvqouITNyqrwT4Qf400o8wxuonsFyPQ+u0tbWjBFsGwsmMygafNxwCnCXir4uS WW5TX2IdseuhmpAHXvV+snzEZNF3xCIQbOK8l3uq79xnwdYJFTzx/JBaK1/f7kdfF5r9Vq f3NSsP+DNNobgAuY3BQfuvHd3Xk2H+spoHmI6vI0avv7/wAYFQoN92Fqwco4gpeOtfJEen U0jNG35+ZVYh9CqgMsk1YUOM2JjhKKYiG4uSdFARMqTCVc4K1zPDv3zQ+WaA2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739324670; a=rsa-sha256; cv=none; b=mzB6OY1FDC67/xHHvJh0MNpKPua/1u0X9gvKy78s9lufGL11ejnROyIE55AkGhA3CW8ZSi Q7L0uFU0j6abGwb2H1r2SHTdpz+BLv22WAKMqwJSXL7Ri74UgS72U9jKo4eqsY0OalgD7k yOS97XfmWXcdBu3LFgGlIMgNRLhh51YEdutp84PtsQ/NP14zI9rQv4tN09kMVAxMkn8piP wq2kK6LV57ww7O/VYuNnYS1dtmkTOgFBEkdbAPLSukGHkajWFdvTYbW6OKIU0tpYtsGRwp g6GfFQswjn+vBpv+uManIiI55pE3MkzU+MtCMAhsSHR3yv1P54ErLhHQwPbaHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yt1ML5Tbszf1j; Wed, 12 Feb 2025 01:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51C1iUmi052259; Wed, 12 Feb 2025 01:44:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51C1iUv8052256; Wed, 12 Feb 2025 01:44:30 GMT (envelope-from git) Date: Wed, 12 Feb 2025 01:44:30 GMT Message-Id: <202502120144.51C1iUv8052256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 65b71a21fc78 - stable/13 - libopencsd: Remove extra slashes 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 65b71a21fc78eb7012b9a83bc84458288f9c197e Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=65b71a21fc78eb7012b9a83bc84458288f9c197e commit 65b71a21fc78eb7012b9a83bc84458288f9c197e Author: Jose Luis Duran AuthorDate: 2025-02-04 14:15:37 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 01:39:41 +0000 libopencsd: Remove extra slashes Remove extra slashes that end up in the metalog. These double slashes can produce an invalid specification file if there are subdirectories down the hierarchy when sorted. For example, consider the following metalog excerpt: ./base/aaa type=dir ./base//aaa/bbb type=dir If sorted, would turn out: ./base//aaa/bbb type=dir ./base/aaa type=dir Apparently missing the ./base/aaa directory in the specification. Luckily here are no subdirectories. Reviewed by: imp, emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48779 (cherry picked from commit bccaf0262dcab84be49c42cc6b7a81c279c44b62) --- lib/libopencsd/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libopencsd/Makefile b/lib/libopencsd/Makefile index b1a9f6f5a98b..bae8dea6e444 100644 --- a/lib/libopencsd/Makefile +++ b/lib/libopencsd/Makefile @@ -116,7 +116,7 @@ APIINCS= \ ocsd_c_api_types.h \ opencsd_c_api.h -APIINCSDIR=${INCLUDEDIR}/opencsd/c_api/ +APIINCSDIR=${INCLUDEDIR}/opencsd/c_api ETMV4INCS= \ etmv4_decoder.h \ @@ -129,7 +129,7 @@ ETMV4INCS= \ trc_pkt_proc_etmv4i.h \ trc_pkt_types_etmv4.h -ETMV4INCSDIR=${INCLUDEDIR}/opencsd/etmv4/ +ETMV4INCSDIR=${INCLUDEDIR}/opencsd/etmv4 ETMV3INCS= \ etmv3_decoder.h \ @@ -140,7 +140,7 @@ ETMV3INCS= \ trc_pkt_proc_etmv3.h \ trc_pkt_types_etmv3.h -ETMV3INCSDIR=${INCLUDEDIR}/opencsd/etmv3/ +ETMV3INCSDIR=${INCLUDEDIR}/opencsd/etmv3 PTMINCS= \ ptm_decoder.h \ @@ -151,7 +151,7 @@ PTMINCS= \ trc_pkt_proc_ptm.h \ trc_pkt_types_ptm.h -PTMINCSDIR=${INCLUDEDIR}/opencsd/ptm/ +PTMINCSDIR=${INCLUDEDIR}/opencsd/ptm STMINCS= \ stm_decoder.h \ @@ -162,7 +162,7 @@ STMINCS= \ trc_pkt_proc_stm.h \ trc_pkt_types_stm.h -STMINCSDIR=${INCLUDEDIR}/opencsd/stm/ +STMINCSDIR=${INCLUDEDIR}/opencsd/stm INCSGROUPS=INCS APIINCS ETMV3INCS ETMV4INCS PTMINCS STMINCS