diff options
author | Matt Weber <matthew.weber@rockwellcollins.com> | 2017-12-06 22:19:56 -0600 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-12-08 17:48:13 +0100 |
commit | f20615b53e83d6263346cb038d59df8e8d6b2b74 (patch) | |
tree | 8efc8b72d2d544299ec825765b428d83e87908f7 /package/kvmtool/0004-check-for-and-use-C-library-provided-strlcpy-and-str.patch | |
parent | e0b9052cf0ec4198b95cebc97f0fa65209510bad (diff) | |
download | buildroot-f20615b53e83d6263346cb038d59df8e8d6b2b74.tar.gz buildroot-f20615b53e83d6263346cb038d59df8e8d6b2b74.zip |
kvmtool: bump to f77d646ba0
Upstream Commit:
2017-11-03 16:19:58 +0000
irq.h: fix compilation error due to missing bool type
The following patches were updated/removed.
- 0001-avoid-redefining-PAGE_SIZE.patch is removed, as
it has been merged upstream as of commit 4095fac8
- 0002-x86-kvm-cpu.c-don-t-include-asm-msr-index.h.patch is
removed, as it has been merged upstream as of commit
1cc05b24
- 0003-use-poll.h-instead-of-sys-poll.h.patch is removed,
as it has been merged upstream as of commit 52c22e6e
- 0004-check-for-and-use-C-library-provided-strlcpy-and-str.patch
is removed, as it has been merged upstream as of commit
8f22adc4
- 0005-Fix-call-to-connect.patch is removed, as it has been
merged upstream as of commit d77bd4f4
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/kvmtool/0004-check-for-and-use-C-library-provided-strlcpy-and-str.patch')
-rw-r--r-- | package/kvmtool/0004-check-for-and-use-C-library-provided-strlcpy-and-str.patch | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/package/kvmtool/0004-check-for-and-use-C-library-provided-strlcpy-and-str.patch b/package/kvmtool/0004-check-for-and-use-C-library-provided-strlcpy-and-str.patch deleted file mode 100644 index d0591b9e4d..0000000000 --- a/package/kvmtool/0004-check-for-and-use-C-library-provided-strlcpy-and-str.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 7a9c16dcf58ff4c8154f3a9dfa1f02ec3daa1662 Mon Sep 17 00:00:00 2001 -From: Andre Przywara <andre.przywara@arm.com> -Date: Fri, 17 Jul 2015 17:02:16 +0100 -Subject: [PATCH] check for and use C library provided strlcpy and strlcat - -The musl-libc library provides implementations of strlcpy and strlcat, -so introduce a feature check for it and only use the kvmtool -implementation if there is no library support for it. -This avoids clashes with the public definition. - -Signed-off-by: Andre Przywara <andre.przywara@arm.com> -Signed-off-by: Will Deacon <will.deacon@arm.com> -[backport from upstream commit 8f22adc4230f07980a318ad1662fba5af0c131c1.] -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> ---- - Makefile | 5 +++++ - config/feature-tests.mak | 10 ++++++++++ - include/kvm/strbuf.h | 2 ++ - util/strbuf.c | 2 ++ - 4 files changed, 19 insertions(+) - -diff --git a/Makefile b/Makefile -index 151fa9d..bf71db4 100644 ---- a/Makefile -+++ b/Makefile -@@ -199,6 +199,11 @@ endif - # On a given system, some libs may link statically, some may not; so, check - # both and only build those that link! - -+ifeq ($(call try-build,$(SOURCE_STRLCPY),$(CFLAGS),),y) -+ CFLAGS_DYNOPT += -DHAVE_STRLCPY -+ CFLAGS_STATOPT += -DHAVE_STRLCPY -+endif -+ - ifeq ($(call try-build,$(SOURCE_BFD),$(CFLAGS),-lbfd -static),y) - CFLAGS_STATOPT += -DCONFIG_HAS_BFD - OBJS_STATOPT += symbol.o -diff --git a/config/feature-tests.mak b/config/feature-tests.mak -index 6bee6c2..03cdb42 100644 ---- a/config/feature-tests.mak -+++ b/config/feature-tests.mak -@@ -196,3 +196,13 @@ int main(void) - return 0; - } - endef -+ -+define SOURCE_STRLCPY -+#include <string.h> -+ -+int main(void) -+{ -+ strlcpy(NULL, NULL, 0); -+ return 0; -+} -+endef -diff --git a/include/kvm/strbuf.h b/include/kvm/strbuf.h -index 2beefbc..7657339 100644 ---- a/include/kvm/strbuf.h -+++ b/include/kvm/strbuf.h -@@ -6,8 +6,10 @@ - - int prefixcmp(const char *str, const char *prefix); - -+#ifndef HAVE_STRLCPY - extern size_t strlcat(char *dest, const char *src, size_t count); - extern size_t strlcpy(char *dest, const char *src, size_t size); -+#endif - - /* some inline functions */ - -diff --git a/util/strbuf.c b/util/strbuf.c -index 99d6b0c..2c6e8ad 100644 ---- a/util/strbuf.c -+++ b/util/strbuf.c -@@ -13,6 +13,7 @@ int prefixcmp(const char *str, const char *prefix) - } - } - -+#ifndef HAVE_STRLCPY - /** - * strlcat - Append a length-limited, %NUL-terminated string to another - * @dest: The string to be appended to -@@ -60,3 +61,4 @@ size_t strlcpy(char *dest, const char *src, size_t size) - } - return ret; - } -+#endif --- -2.9.4 - |