diff options
author | David Riley <davidriley@chromium.org> | 2015-02-05 19:22:49 -0800 |
---|---|---|
committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-02-11 23:05:39 +0000 |
commit | 05987b159acb9737707b9ef92b818ac434ef8c3d (patch) | |
tree | 8e5e48a674b6756bf62a5913d336efc9b7ea162b /futility/cmd_vbutil_kernel.c | |
parent | 2b0dc167451b151452b834f88dafd83d912a55cd (diff) | |
download | vboot-05987b159acb9737707b9ef92b818ac434ef8c3d.tar.gz |
Changes to compile signing tools on darwin
The following works from a Mac with these changes:
make Q= ARCH=arm HAVE_MACOS=1 `pwd`/build/futility/futility
Only vbutil_keyblock and vbutil_kernel have been exercised.
BUG=none
TEST='make Q= ARCH=arm HAVE_MACOS=1 `pwd`/build/futility/futility'
BRANCH=none
Signed-off-by: David Riley <davidriley@chromium.org>
Change-Id: Ie69cfee0c650d4ff96be6322083a2fea1543ee39
Reviewed-on: https://chromium-review.googlesource.com/246773
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Tested-by: David Riley <davidriley@chromium.org>
Commit-Queue: David Riley <davidriley@chromium.org>
Diffstat (limited to 'futility/cmd_vbutil_kernel.c')
-rw-r--r-- | futility/cmd_vbutil_kernel.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c index f1573b61..ae4fd3f9 100644 --- a/futility/cmd_vbutil_kernel.c +++ b/futility/cmd_vbutil_kernel.c @@ -10,7 +10,9 @@ #include <fcntl.h> #include <getopt.h> #include <inttypes.h> /* For PRIu64 */ +#ifndef HAVE_MACOS #include <linux/fs.h> /* For BLKGETSIZE64 */ +#endif #include <stdarg.h> #include <stdio.h> #include <string.h> @@ -176,11 +178,13 @@ static uint8_t *ReadOldKPartFromFileOrDie(const char *filename, Fatal("Unable to stat %s: %s\n", filename, strerror(errno)); if (S_ISBLK(statbuf.st_mode)) { +#ifndef HAVE_MACOS int fd = open(filename, O_RDONLY); if (fd >= 0) { ioctl(fd, BLKGETSIZE64, &file_size); close(fd); } +#endif } else { file_size = statbuf.st_size; } |