diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-25 19:45:53 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-27 21:38:15 +0300 |
commit | 316dfdd917bec6a218f431211d28bf8df6b6fb0f (patch) | |
tree | 5541073f9851f44c2bd67b4959dc776ee3c3810f /import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch | |
parent | 36acd3e888044dea2ac0b2946f15616f968388c9 (diff) | |
download | openbmc-316dfdd917bec6a218f431211d28bf8df6b6fb0f.tar.xz |
Yocto 2.5
Move OpenBMC to Yocto 2.5(sumo)
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Change-Id: I5c5ad6904a16e14c1c397f0baf10c9d465594a78
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch')
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch b/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch index f18b56928..0b5b80912 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch @@ -12,7 +12,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c -index 8fbce4f..66e11e5 100644 +index b961471..2d3d251 100644 --- a/src/plugins/crypto.c +++ b/src/plugins/crypto.c @@ -22,7 +22,7 @@ @@ -25,7 +25,7 @@ index 8fbce4f..66e11e5 100644 #include <linux/random.h> #include <locale.h> diff --git a/src/plugins/part.c b/src/plugins/part.c -index 12d2ef7..3afe297 100644 +index 6b2a690..ab490d9 100644 --- a/src/plugins/part.c +++ b/src/plugins/part.c @@ -25,6 +25,7 @@ @@ -33,10 +33,10 @@ index 12d2ef7..3afe297 100644 #include <unistd.h> #include <sys/file.h> +#include <fcntl.h> + #include <sys/ioctl.h> + #include <linux/fs.h> #include <blockdev/utils.h> - #include <part_err.h> - -@@ -1224,7 +1225,7 @@ static gboolean set_gpt_flags (const gchar *device, int part_num, guint64 flags, +@@ -1354,7 +1355,7 @@ static gboolean set_gpt_flags (const gchar *device, int part_num, guint64 flags, real_flags |= 0x4000000000000000; /* 1 << 62 */ if (flags & BD_PART_FLAG_GPT_NO_AUTOMOUNT) real_flags |= 0x8000000000000000; /* 1 << 63 */ @@ -46,5 +46,5 @@ index 12d2ef7..3afe297 100644 args[2] = g_strdup_printf ("%d:=:%s", part_num, mask_str); g_free (mask_str); -- -1.8.3.1 +2.14.3 |