The branch main has been updated by jlduran:
URL:
https://cgit.FreeBSD.org/src/commit/?id=bccaf0262dcab84be49c42cc6b7a81c279c44b62
commit bccaf0262dcab84be49c42cc6b7a81c279c44b62
Author: Jose Luis Duran <jldu...@freebsd.org>
AuthorDate: 2025-02-04 14:15:37 +0000
Commit: Jose Luis Duran <jldu...@freebsd.org>
CommitDate: 2025-02-04 14:15:37 +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
---
lib/libopencsd/Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/libopencsd/Makefile b/lib/libopencsd/Makefile
index aae0b795c216..649e756eacf6 100644
--- a/lib/libopencsd/Makefile
+++ b/lib/libopencsd/Makefile
@@ -121,7 +121,7 @@ APIINCS= \
ocsd_c_api_types.h \
opencsd_c_api.h
-APIINCSDIR=${INCLUDEDIR}/opencsd/c_api/
+APIINCSDIR=${INCLUDEDIR}/opencsd/c_api
ETEINCS= \
ete_decoder.h \
@@ -129,7 +129,7 @@ ETEINCS= \
trc_dcd_mngr_ete.h \
trc_pkt_types_ete.h
-ETEINCSDIR=${INCLUDEDIR}/opencsd/ete/
+ETEINCSDIR=${INCLUDEDIR}/opencsd/ete
ETMV4INCS= \
etmv4_decoder.h \
@@ -142,7 +142,7 @@ ETMV4INCS= \
trc_pkt_proc_etmv4i.h \
trc_pkt_types_etmv4.h
-ETMV4INCSDIR=${INCLUDEDIR}/opencsd/etmv4/
+ETMV4INCSDIR=${INCLUDEDIR}/opencsd/etmv4
ETMV3INCS= \
etmv3_decoder.h \
@@ -153,7 +153,7 @@ ETMV3INCS= \
trc_pkt_proc_etmv3.h \
trc_pkt_types_etmv3.h
-ETMV3INCSDIR=${INCLUDEDIR}/opencsd/etmv3/
+ETMV3INCSDIR=${INCLUDEDIR}/opencsd/etmv3
PTMINCS= \
ptm_decoder.h \
@@ -164,7 +164,7 @@ PTMINCS= \
trc_pkt_proc_ptm.h \
trc_pkt_types_ptm.h
-PTMINCSDIR=${INCLUDEDIR}/opencsd/ptm/
+PTMINCSDIR=${INCLUDEDIR}/opencsd/ptm
STMINCS= \
stm_decoder.h \
@@ -175,7 +175,7 @@ STMINCS= \
trc_pkt_proc_stm.h \
trc_pkt_types_stm.h
-STMINCSDIR=${INCLUDEDIR}/opencsd/stm/
+STMINCSDIR=${INCLUDEDIR}/opencsd/stm
INCSGROUPS=INCS APIINCS ETEINCS ETMV3INCS ETMV4INCS PTMINCS STMINCS
