oasis

commit: 2abb789ef7b29c50b226ad4ffd9a45f49ec24b3c
parent 08c431b66b23a36bb253ac6e8b6ebeb43543325b
Author: Michael Forney <mforney@mforney.org>
Date:   Sat, 16 Sep 2017 15:25:05 -0700

efivar: Update to 32

Diffstat:
M
pkg/efibootmgr/gen.lua
1
+
M
pkg/efivar/gen.lua
12
++++++------
M
pkg/efivar/rev
2
+-

3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pkg/efibootmgr/gen.lua b/pkg/efibootmgr/gen.lua
@@ -3,6 +3,7 @@ cflags{
 	[[-D 'DEFAULT_LOADER="/linux"']],
 	'-I $srcdir/src/include',
 	'-I $builddir/pkg/efivar/include',
+	'-I $builddir/pkg/efivar/include/efivar',
 }
 
 exe('efibootmgr', [[
diff --git a/pkg/efivar/gen.lua b/pkg/efivar/gen.lua
@@ -7,7 +7,7 @@ cflags{
 	'-D _GNU_SOURCE',
 	'-include $dir/compat.h',
 	'-I $outdir/include',
-	'-I $srcdir/src/include/efivar',
+	'-I $srcdir/src/include',
 }
 
 sub('tools.ninja', function()
@@ -15,7 +15,7 @@ sub('tools.ninja', function()
 	cflags{
 		'-std=c99',
 		'-D EFIVAR_BUILD_ENVIRONMENT',
-		'-I $srcdir/src/include/efivar',
+		'-I $srcdir/src/include',
 	}
 	build('cc', '$outdir/host-guid.c.o', '$srcdir/src/guid.c')
 	exe('makeguids', {'src/makeguids.c', 'host-guid.c.o'}, nil, {ldlibs='-ldl'})
@@ -26,20 +26,20 @@ build('makeguids', {
 	'$outdir/guids.bin',
 	'$outdir/names.bin',
 	'$outdir/guid-symbols.c',
-	'$outdir/include/efivar-guids.h',
+	'$outdir/include/efivar/efivar-guids.h',
 }, {'$srcdir/src/guids.txt', '|', '$outdir/makeguids'})
 
 pkg.hdrs = {
-	copy('$outdir/include', '$srcdir/src/include/efivar', {
+	copy('$outdir/include/efivar', '$srcdir/src/include/efivar', {
 		'efiboot.h',
 		'efiboot-creator.h',
 		'efiboot-loadopt.h',
 		'efivar.h',
 		'efivar-dp.h',
 	}),
-	'$outdir/include/efivar-guids.h',
+	'$outdir/include/efivar/efivar-guids.h',
 }
-pkg.deps = {'$outdir/include/efivar-guids.h'}
+pkg.deps = {'$outdir/include/efivar/efivar-guids.h'}
 
 lib('libefiboot.a', 'src/(crc32.c creator.c disk.c gpt.c linux.c loadopt.c)')
 lib('libefivar.a', [[
diff --git a/pkg/efivar/rev b/pkg/efivar/rev
@@ -1 +1 @@
-3
+4