diff options
| author | Michael Forney <mforney@mforney.org> | 2017-09-16 15:25:05 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2017-09-25 19:23:06 -0700 |
| commit | 2abb789ef7b29c50b226ad4ffd9a45f49ec24b3c (patch) | |
| tree | b622bc85f572563794e19a3825433a45c5fc2de5 /pkg | |
| parent | 08c431b66b23a36bb253ac6e8b6ebeb43543325b (diff) | |
efivar: Update to 32
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/efibootmgr/gen.lua | 1 | ||||
| -rw-r--r-- | pkg/efivar/gen.lua | 12 | ||||
| -rw-r--r-- | pkg/efivar/rev | 2 | ||||
| m--------- | pkg/efivar/src | 0 |
4 files changed, 8 insertions, 7 deletions
diff --git a/pkg/efibootmgr/gen.lua b/pkg/efibootmgr/gen.lua index 1ebb96dc..43a3c011 100644 --- 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 index 272ecb50..77697544 100644 --- 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 index 00750edc..b8626c4c 100644 --- a/pkg/efivar/rev +++ b/pkg/efivar/rev @@ -1 +1 @@ -3 +4 diff --git a/pkg/efivar/src b/pkg/efivar/src -Subproject 270205d88598d60d4e75f9cec13b8d25d82ee55 +Subproject dabdb9c5a7cc9a178157396d6903541f9cc4860 |