From fda3b0103baedf3aa7c95ce128ef6302eaa6f4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 22 May 2021 03:35:09 +0200 Subject: [PATCH] xrdp: upgrade 0.9.15 -> 0.9.16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- .../0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch | 11 ++++++++--- .../xrdp/{xrdp_0.9.15.bb => xrdp_0.9.16.bb} | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) rename meta-oe/recipes-support/xrdp/{xrdp_0.9.15.bb => xrdp_0.9.16.bb} (98%) diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch index c06aa7b6ce..ea3eb11f0a 100644 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch @@ -9,14 +9,19 @@ Signed-off-by: Khem Raj common/arch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/common/arch.h b/common/arch.h +index 617feb5e..6edb39db 100644 --- a/common/arch.h +++ b/common/arch.h -@@ -84,7 +84,7 @@ typedef int bool_t; +@@ -85,7 +85,7 @@ typedef int bool_t; #define NEED_ALIGN #elif defined(__x86__) || defined(__x86_64__) || \ defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \ - defined(__i386__) || defined(__aarch64__) || \ + defined(__i386__) || defined(__aarch64__) || defined(__powerpc64__) || \ + defined(__PPC__) || defined(__LITTLE_ENDIAN__) || \ + defined(__s390__) || defined (__s390x__) || \ defined(__riscv) - #define NO_NEED_ALIGN - #else +-- +2.31.1 + diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.15.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.16.bb similarity index 98% rename from meta-oe/recipes-support/xrdp/xrdp_0.9.15.bb rename to meta-oe/recipes-support/xrdp/xrdp_0.9.16.bb index 039ba1a763..d7a371b088 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.15.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.16.bb @@ -16,7 +16,7 @@ SRC_URI = "git://github.com/neutrinolabs/xrdp.git;branch=devel \ file://0001-Fix-the-compile-error.patch \ file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ " -SRCREV = "f24b7b7988140b18202908654db3289659303772" +SRCREV = "a4c7ee077c049202d73f82f518b2de958d722890" S = "${WORKDIR}/git"