summaryrefslogtreecommitdiffstats
path: root/patches/qemu-xmount
diff options
context:
space:
mode:
authorJonathan Bauer2020-05-13 11:04:02 +0200
committerJonathan Bauer2020-05-13 11:04:02 +0200
commit1130873aa55c9b0a7e5af48edc44bd6c6fd1f888 (patch)
tree0fcfa186cd631d8d36611b3d4bc509fd38841d51 /patches/qemu-xmount
parentMerge branch 'centos8' into downloader (diff)
downloadsystemd-init-1130873aa55c9b0a7e5af48edc44bd6c6fd1f888.tar.gz
systemd-init-1130873aa55c9b0a7e5af48edc44bd6c6fd1f888.tar.xz
systemd-init-1130873aa55c9b0a7e5af48edc44bd6c6fd1f888.zip
restructure repo
* remove packager * move everything from builder/* back to root
Diffstat (limited to 'patches/qemu-xmount')
-rw-r--r--patches/qemu-xmount/01-fix_ld_pie_relocateable.patch14
-rw-r--r--patches/qemu-xmount/02-fix_memfd_mman.patch28
2 files changed, 42 insertions, 0 deletions
diff --git a/patches/qemu-xmount/01-fix_ld_pie_relocateable.patch b/patches/qemu-xmount/01-fix_ld_pie_relocateable.patch
new file mode 100644
index 00000000..c85a8f55
--- /dev/null
+++ b/patches/qemu-xmount/01-fix_ld_pie_relocateable.patch
@@ -0,0 +1,14 @@
+diff --git a/rules.mak b/rules.mak
+index 4551b9ea70..019d6c7691 100644
+--- a/rules.mak
++++ b/rules.mak
+@@ -111,7 +111,7 @@ module-common.o: CFLAGS += $(DSO_OBJ_CFLAGS)
+ $(if $(findstring /,$@),$(call quiet-command,cp $@ $(subst /,-,$@), " CP $(subst /,-,$@)"))
+
+
+-LD_REL := $(CC) -nostdlib -Wl,-r
++LD_REL := $(CC) -nostdlib -r
+
+ %.mo:
+ $(call quiet-command,$(LD_REL) -o $@ $^," LD -r $(TARGET_DIR)$@")
+
diff --git a/patches/qemu-xmount/02-fix_memfd_mman.patch b/patches/qemu-xmount/02-fix_memfd_mman.patch
new file mode 100644
index 00000000..8b272085
--- /dev/null
+++ b/patches/qemu-xmount/02-fix_memfd_mman.patch
@@ -0,0 +1,28 @@
+diff --git a/configure b/configure
+index 116a916aec..aefe9cef71 100755
+--- a/configure
++++ b/configure
+@@ -3642,7 +3642,7 @@ fi
+ # check if memfd is supported
+ memfd=no
+ cat > $TMPC << EOF
+-#include <sys/memfd.h>
++#include <sys/mman.h>
+
+ int main(void)
+ {
+diff --git a/util/memfd.c b/util/memfd.c
+index 7c406914c5..3636f0d9fd 100644
+--- a/util/memfd.c
++++ b/util/memfd.c
+@@ -34,9 +34,7 @@
+
+ #include "qemu/memfd.h"
+
+-#ifdef CONFIG_MEMFD
+-#include <sys/memfd.h>
+-#elif defined CONFIG_LINUX
++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
+ #include <sys/syscall.h>
+ #include <asm/unistd.h>
+