From 17d48e366f71352fc13ca91632886c3ce2527c3f Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Tue, 15 May 2018 11:18:13 -0500 Subject: [PATCH 1/3] pkglib: Add debian.series to generated files. If patches are found add debian.series to generated files. Signed-off-by: Jose Carlos Venegas Munoz --- kernel/update.sh | 2 +- scripts/pkglib.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/update.sh b/kernel/update.sh index 85f05fec2..e27471ecd 100755 --- a/kernel/update.sh +++ b/kernel/update.sh @@ -27,7 +27,7 @@ KR_PATCHES=$(eval find "patches" -type f -name "*.patch") KR_REL=https://www.kernel.org/releases.json KR_SHA=https://cdn.kernel.org/pub/linux/kernel/v"${KR_SERIES}"/sha256sums.asc -GENERATED_FILES=(kata-linux-container.dsc kata-linux-container.spec _service config debian.control debian.series) +GENERATED_FILES=(kata-linux-container.dsc kata-linux-container.spec _service config debian.control) STATIC_FILES=(debian.dirs debian.rules debian.compat debian.copyright) #STATIC_FILES+=($KR_PATCHES) diff --git a/scripts/pkglib.sh b/scripts/pkglib.sh index c1031df25..4911800fb 100644 --- a/scripts/pkglib.sh +++ b/scripts/pkglib.sh @@ -349,4 +349,5 @@ function find_patches() { echo "$p" >> debian.series ((n++)) done + GENERATED_FILES+=(debian.series) } From 793a47a790da10ddfdea17d854242636a90f2d3d Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Tue, 15 May 2018 11:23:42 -0500 Subject: [PATCH 2/3] qemu: fix build for fedora 28 and ubuntu 18. This patch fix build for distros with new glib versions. Signed-off-by: Jose Carlos Venegas Munoz --- qemu-lite/debian.series | 1 - .../0001-memfd-fix-configure-test.patch | 55 +++++++++++++++++++ qemu-vanilla/debian.series | 1 - .../0001-memfd-fix-configure-test.patch | 55 +++++++++++++++++++ 4 files changed, 110 insertions(+), 2 deletions(-) delete mode 100644 qemu-lite/debian.series create mode 100644 qemu-lite/patches/0001-memfd-fix-configure-test.patch delete mode 100644 qemu-vanilla/debian.series create mode 100644 qemu-vanilla/patches/0001-memfd-fix-configure-test.patch diff --git a/qemu-lite/debian.series b/qemu-lite/debian.series deleted file mode 100644 index 37a4b4210..000000000 --- a/qemu-lite/debian.series +++ /dev/null @@ -1 +0,0 @@ -configure.patch diff --git a/qemu-lite/patches/0001-memfd-fix-configure-test.patch b/qemu-lite/patches/0001-memfd-fix-configure-test.patch new file mode 100644 index 000000000..b1f354ac1 --- /dev/null +++ b/qemu-lite/patches/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Recent glibc added memfd_create in sys/mman.h. This conflicts with +the definition in util/memfd.c: + + /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration + +Fix the configure test, and remove the sys/memfd.h inclusion since the +file actually does not exist---it is a typo in the memfd_create(2) man +page. + +Cc: Marc-André Lureau +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 9c8aa5a..99ccc17 100755 +--- a/configure ++++ b/configure +@@ -3923,7 +3923,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1a..412e94a 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +1.8.3.1 + diff --git a/qemu-vanilla/debian.series b/qemu-vanilla/debian.series deleted file mode 100644 index 37a4b4210..000000000 --- a/qemu-vanilla/debian.series +++ /dev/null @@ -1 +0,0 @@ -configure.patch diff --git a/qemu-vanilla/patches/0001-memfd-fix-configure-test.patch b/qemu-vanilla/patches/0001-memfd-fix-configure-test.patch new file mode 100644 index 000000000..b1f354ac1 --- /dev/null +++ b/qemu-vanilla/patches/0001-memfd-fix-configure-test.patch @@ -0,0 +1,55 @@ +From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Recent glibc added memfd_create in sys/mman.h. This conflicts with +the definition in util/memfd.c: + + /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration + +Fix the configure test, and remove the sys/memfd.h inclusion since the +file actually does not exist---it is a typo in the memfd_create(2) man +page. + +Cc: Marc-André Lureau +Signed-off-by: Paolo Bonzini +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 9c8aa5a..99ccc17 100755 +--- a/configure ++++ b/configure +@@ -3923,7 +3923,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include ++#include + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1a..412e94a 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include + #include + +-- +1.8.3.1 + From ab868b1648b634f7f38a53e99d0cc4615241b067 Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Tue, 15 May 2018 11:28:54 -0500 Subject: [PATCH 3/3] gitignore: Ignore debian.series file. This is an autogenerated file. Fixes: #61 Signed-off-by: Jose Carlos Venegas Munoz --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fc75775ee..e79e32ecb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ typescript +debian.series *.img *.initrd *.tar.gz