diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:55:30 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
| commit | 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 (patch) | |
| tree | ed0bec373424d01accfb2e9c895c177a3e2d7abe /poky/meta/recipes-support/gnutls | |
| parent | ac970dd705934286df062e0f1501f776dc2ef01d (diff) | |
| download | openbmc-706d5aacd7ab7b37c00df1a1b210e4ced06119e1.tar.xz | |
Reset poky to before our libpam hacks
Things got a bit out of synch with openbmc-config due to the libpam
issues and the migration from the meta-* layers.
Revert the two previous commits and then put the latest poky in with the
libpam revert and get openbmc-config right again.
Revert "Revert "libpam: update 1.3.1 -> 1.5.1""
This reverts commit 87ddd3eab4df68e624b5350ccaab28b3b97547c0.
Revert "poky: subtree update:796be0593a..10c69538c0"
This reverts commit c723b72979bfac6362509cf1fe086900f6641f28.
Change-Id: I3a1f405193aee6a21fe0cd24be9927c143a23d9a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-support/gnutls')
| -rw-r--r-- | poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch | 15 | ||||
| -rw-r--r-- | poky/meta/recipes-support/gnutls/gnutls_3.6.15.bb (renamed from poky/meta/recipes-support/gnutls/gnutls_3.7.0.bb) | 2 |
2 files changed, 3 insertions, 14 deletions
diff --git a/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch b/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch index 6eb1edbdb..34c8985c1 100644 --- a/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch +++ b/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch @@ -1,8 +1,3 @@ -From 8a5c96057cf305bbeac0d6e0e59ee24fbb9497fe Mon Sep 17 00:00:00 2001 -From: Joe Slater <jslater@windriver.com> -Date: Wed, 25 Jan 2017 13:52:59 -0800 -Subject: [PATCH] gnutls: account for ARM_EABI - Certain syscall's are not availabe for arm-eabi, so we eliminate reference to them. @@ -10,18 +5,12 @@ Upstream-Status: Pending Signed-off-by: Joe Slater <jslater@windriver.com> ---- - tests/seccomp.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/seccomp.c b/tests/seccomp.c -index ed14d00..3c5b726 100644 --- a/tests/seccomp.c +++ b/tests/seccomp.c -@@ -53,7 +53,9 @@ int disable_system_calls(void) +@@ -49,7 +49,9 @@ int disable_system_calls(void) + } ADD_SYSCALL(nanosleep, 0); - ADD_SYSCALL(clock_nanosleep, 0); +#if ! defined(__ARM_EABI__) ADD_SYSCALL(time, 0); +#endif diff --git a/poky/meta/recipes-support/gnutls/gnutls_3.7.0.bb b/poky/meta/recipes-support/gnutls/gnutls_3.6.15.bb index e3ca86b93..b936db50d 100644 --- a/poky/meta/recipes-support/gnutls/gnutls_3.7.0.bb +++ b/poky/meta/recipes-support/gnutls/gnutls_3.6.15.bb @@ -21,7 +21,7 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar file://arm_eabi.patch \ " -SRC_URI[sha256sum] = "49e2a22691d252c9f24a9829b293a8f359095bc5a818351f05f1c0a5188a1df8" +SRC_URI[sha256sum] = "0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558" inherit autotools texinfo pkgconfig gettext lib_package gtk-doc |