diff options
| author | Michael Forney <mforney@mforney.org> | 2021-07-24 18:05:26 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2021-07-24 18:08:16 -0700 |
| commit | a02412b3637ff39935c2df2cce98d274b7eab480 (patch) | |
| tree | 2674fd520a6f4aaa79edc7ef3f993a451430ee7e | |
| parent | 995b307746340db5a569d8c0f35f3a9938838d46 (diff) | |
Move oasis git helpers to skeleton package
| -rw-r--r-- | gen.lua | 7 | ||||
| -rw-r--r-- | pkg/skeleton/applyperms.c (renamed from src/applyperms.c) | 0 | ||||
| -rw-r--r-- | pkg/skeleton/gen.lua | 5 | ||||
| -rw-r--r-- | pkg/skeleton/mergeperms.c (renamed from src/mergeperms.c) | 0 | ||||
| -rw-r--r-- | src/gen.lua | 7 |
5 files changed, 11 insertions, 8 deletions
@@ -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 index 8e446d39..8e446d39 100644 --- a/src/applyperms.c +++ b/pkg/skeleton/applyperms.c diff --git a/pkg/skeleton/gen.lua b/pkg/skeleton/gen.lua index efd8dd61..e55ecddb 100644 --- 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 index 94ba7e3d..94ba7e3d 100644 --- a/src/mergeperms.c +++ b/pkg/skeleton/mergeperms.c diff --git a/src/gen.lua b/src/gen.lua deleted file mode 100644 index e2a04f5a..00000000 --- a/src/gen.lua +++ /dev/null @@ -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'})) |