linux-qubasis

commit c4ac16ce08539ea983e7a24f17dd67e05b6335ea
parent 4907f6d79a8104926b55eeb0924ee2c45904db8e
Author: Jul <jul@9o.is>
Date:   Wed, 17 Sep 2025 12:08:42 +0800

save fspec files with their path

Diffstat:
M
ninja/functions.sh
 | 
5
+++--
M
tpl/example/gen.sh
 | 
37
++++++++++++++++++++-----------------

2 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/ninja/functions.sh b/ninja/functions.sh
@@ -378,7 +378,8 @@ _ninja_fspec_file() {
     fi
 
     for _v in $*; do
-        _ninja_buffer_fspec_files="$_ninja_buffer_fspec_files $pkgdir/$_v1/_fspec/$_v"
+        _fspec=$pkgdir/$_v1/_fspec/$(printf ${_v#/} | tr '/' '-')
+        _ninja_buffer_fspec_files="$_ninja_buffer_fspec_files $_fspec"
     done
 }
 
@@ -712,7 +713,7 @@ _ninja_flush_fspec() {
         mode=$3
         src=${4-}
 
-        out=$outdir/_fspec/${path##*/}
+        out=$outdir/_fspec/$(printf ${path#/} | tr '/' '-')
         dep='| $basedir/ninja/fspec.sh $hostdir/fspec-hash'
 
         if [ $type = reg ]; then
diff --git a/tpl/example/gen.sh b/tpl/example/gen.sh
@@ -34,22 +34,25 @@ pkg rc
 pkg sbase
 pkg ubase
 
-pkg mandoc \
-    apropos \
-    makewhatis \
-    man \
-    mandoc \
-    whatis \
-    apropos.1.gz \
-    makewhatis.8.gz \
-    man.1.gz \
-    man.conf.5.gz \
-    mandoc.1.gz \
-    mandoc.db.5.gz
+pkg mandoc "
+    /bin/apropos
+    /bin/makewhatis
+    /bin/man
+    /bin/mandoc
+    /bin/whatis
+    /share/man/man1/apropos.1.gz
+    /share/man/man8/makewhatis.8.gz
+    /share/man/man1/man.1.gz
+    /share/man/man5/man.conf.5.gz
+    /share/man/man1/mandoc.1.gz
+    /share/man/man5/mandoc.db.5.gz
+"
 
-pkg netbsd-curses \
-    terminfo
+pkg netbsd-curses "
+    /share/misc/terminfo
+"
 
-pkg less \
-    less \
-    less.1.gz
+pkg less "
+    /bin/less
+    /share/man/man1/less.1.gz
+"