linux-qubasis

commit ac73c24ac30814e8801b0029b02b450d206d9abd
parent 66f0eb1cc6a086dfb6d3c8b57919f53ee5500513
Author: Jul <jul@9o.is>
Date:   Fri, 29 Aug 2025 16:56:20 +0800

change fspec outdir from _files to _fspec

Diffstat:
M
ninja/functions.sh
 | 
14
+++++++-------

1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/ninja/functions.sh b/ninja/functions.sh
@@ -309,12 +309,12 @@ _ninja_fspec_file() {
     _v1=$1; shift
 
     if [ ! "$*" ]; then
-        _ninja_buffer_fspec_files="$_ninja_buffer_fspec_files $pkgdir/$_v1/_files/_all"
+        _ninja_buffer_fspec_files="$_ninja_buffer_fspec_files $pkgdir/$_v1/_fspec/ALL"
         return
     fi
 
     for _v in $*; do
-        _ninja_buffer_fspec_files="$_ninja_buffer_fspec_files $pkgdir/$_v1/_files/$_v"
+        _ninja_buffer_fspec_files="$_ninja_buffer_fspec_files $pkgdir/$_v1/_fspec/$_v"
     done
 }
 
@@ -450,7 +450,7 @@ _ninja_flush_build() {
     case $_ninja_type in
         root) build phony $tgtdir/build $_srcs;;
         tpl)  build phony $tgtdir/build $outdir/rootfs.tar.zst;;
-        pkg)  build phony $tgtdir/build $outdir/_files/_all $_srcs;;
+        pkg)  build phony $tgtdir/build $outdir/_fspec/ALL $_srcs;;
     esac
 }
 
@@ -572,7 +572,7 @@ _ninja_flush_fspec() {
     fi
 
     if [ ! "$_ninja_buffer_fspec" ] && [ ! "$_ninja_buffer_fspec_files" ]; then
-        build touch $outdir/_files/_all
+        build touch $outdir/_fspec/ALL
         return
     fi
 
@@ -583,7 +583,7 @@ _ninja_flush_fspec() {
         mode=$3
         src=${4-}
 
-        out=$outdir/_files/${path##*/}
+        out=$outdir/_fspec/${path##*/}
         dep='| $basedir/ninja/fspec.sh $hostdir/fspec-hash'
 
         if [ $type = reg ]; then
@@ -603,10 +603,10 @@ _ninja_flush_fspec() {
         printf "$out "
     done)
 
-    build cat $outdir/_files/_all $_srcs $_ninja_buffer_fspec_files
+    build cat $outdir/_fspec/ALL $_srcs $_ninja_buffer_fspec_files
 
     if [ $_ninja_type = tpl ]; then
-        build fspec-tar $outdir/rootfs.tar.zst $outdir/_files/_all '|' $hostdir/fspec-tar $hostdir/zstd
+        build fspec-tar $outdir/rootfs.tar.zst $outdir/_fspec/ALL '|' $hostdir/fspec-tar $hostdir/zstd
     fi
 }