oasis

commit: a02412b3637ff39935c2df2cce98d274b7eab480
parent 995b307746340db5a569d8c0f35f3a9938838d46
Author: Michael Forney <mforney@mforney.org>
Date:   Sat, 24 Jul 2021 18:05:26 -0700

Move oasis git helpers to skeleton package

Diffstat:
M
gen.lua
7
++++++-
R
src/applyperms.c -> pkg/skeleton/applyperms.c
0

M
pkg/skeleton/gen.lua
5
+++++
R
src/mergeperms.c -> pkg/skeleton/mergeperms.c
0

D
src/gen.lua
7
-------

5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/gen.lua b/gen.lua
@@ -16,7 +16,6 @@ toolchain(config.target)
 
 subgen 'probe'
 subgen 'pkg'
-subgen 'src'
 
 build('awk', '$outdir/root.perms', {'$outdir/tree.fspec', '|', '$basedir/scripts/perms.awk'}, {
 	expr='-f $basedir/scripts/perms.awk',
@@ -31,6 +30,12 @@ build('phony', 'commit', '$builddir/root.commit')
 build('fspec-sort', '$outdir/root.fspec', {'$outdir/tree.fspec', '|', '$builddir/pkg/fspec-sync/host/fspec-sort'})
 build('fspec-tar', '$outdir/root.tar.zst', {'$outdir/root.fspec', '|', '$builddir/pkg/fspec-sync/host/fspec-tar'})
 
+--build('awk', '$outdir/root.sqfslist', {'$outdir/root.fspec', '|', '$basedir/scripts/squashfs.awk'}, {
+--	expr='-f $basedir/scripts/squashfs.awk',
+--})
+--rule('gensquashfs', 'gensquashfs -F $in -D . -f -c gzip $out')
+--build('gensquashfs', '$outdir/root.squashfs', {'$outdir/root.sqfslist'})
+
 build('phony', 'build.ninja', 'ninja', {generator='1'})
 
 io.write('default $builddir/root.tree\n')
diff --git a/src/applyperms.c b/pkg/skeleton/applyperms.c
diff --git a/pkg/skeleton/gen.lua b/pkg/skeleton/gen.lua
@@ -1,3 +1,5 @@
+set('srcdir', '$dir')
+
 dir('bin', '755')
 sym('bin/plumb', '../etc/plumb')
 dir('boot', '755')
@@ -17,3 +19,6 @@ dir('var/log', '755')
 sym('usr/bin', '../bin')
 
 gitfile('.gitignore', '644', '$dir/gitignore')
+
+file('libexec/applyperms', '755', exe('applyperms', {'applyperms.c'}))
+file('libexec/mergeperms', '755', exe('mergeperms', {'mergeperms.c'}))
diff --git a/src/mergeperms.c b/pkg/skeleton/mergeperms.c
diff --git a/src/gen.lua b/src/gen.lua
@@ -1,7 +0,0 @@
-set('srcdir', '$dir')
-cflags{
-	'-std=c11', '-Wall', '-Wextra', '-Wpedantic', '-Wno-unused-parameter',
-}
-
-file('libexec/applyperms',   '755', exe('applyperms',   {'applyperms.c'}))
-file('libexec/mergeperms',   '755', exe('mergeperms',   {'mergeperms.c'}))