From: "Alexander Kanavin" <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Subject: [PATCH 09/37] cryptodev: upgrade 1.10 -> 1.11
Date: Sun, 23 Aug 2020 22:20:03 +0200 [thread overview]
Message-ID: <20200823202031.24686-9-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20200823202031.24686-1-alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...-linux_1.10.bb => cryptodev-linux_1.11.bb} | 0
...odule_1.10.bb => cryptodev-module_1.11.bb} | 6 +--
...-tests_1.10.bb => cryptodev-tests_1.11.bb} | 0
meta/recipes-kernel/cryptodev/cryptodev.inc | 2 +-
.../0001-Fix-build-for-Linux-5.8-rc1.patch | 49 -------------------
5 files changed, 3 insertions(+), 54 deletions(-)
rename meta/recipes-kernel/cryptodev/{cryptodev-linux_1.10.bb => cryptodev-linux_1.11.bb} (100%)
rename meta/recipes-kernel/cryptodev/{cryptodev-module_1.10.bb => cryptodev-module_1.11.bb} (68%)
rename meta/recipes-kernel/cryptodev/{cryptodev-tests_1.10.bb => cryptodev-tests_1.11.bb} (100%)
delete mode 100644 meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.8-rc1.patch
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.10.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.11.bb
similarity index 100%
rename from meta/recipes-kernel/cryptodev/cryptodev-linux_1.10.bb
rename to meta/recipes-kernel/cryptodev/cryptodev-linux_1.11.bb
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.11.bb
similarity index 68%
rename from meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb
rename to meta/recipes-kernel/cryptodev/cryptodev-module_1.11.bb
index 6474599c45..b3b554c7d3 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.11.bb
@@ -7,10 +7,8 @@ inherit module
# Header file provided by a separate package
DEPENDS += "cryptodev-linux"
-SRC_URI += " \
-file://0001-Disable-installing-header-file-provided-by-another-p.patch \
-file://0001-Fix-build-for-Linux-5.8-rc1.patch \
-"
+SRC_URI += "file://0001-Disable-installing-header-file-provided-by-another-p.patch \
+ "
EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.10.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.11.bb
similarity index 100%
rename from meta/recipes-kernel/cryptodev/cryptodev-tests_1.10.bb
rename to meta/recipes-kernel/cryptodev/cryptodev-tests_1.11.bb
diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc
index f99f8bc9f0..906f4fc181 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev.inc
+++ b/meta/recipes-kernel/cryptodev/cryptodev.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux \
"
-SRCREV = "a87053bee5680878c295b7d23cf0d7065576ac2b"
+SRCREV = "2299d39475e91392abd050ea09f2d20feecb4adf"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.8-rc1.patch b/meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.8-rc1.patch
deleted file mode 100644
index 02c721a4f3..0000000000
--- a/meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.8-rc1.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 9e765068582aae3696520346a7500322ca6cc2de Mon Sep 17 00:00:00 2001
-From: Joan Bruguera <joanbrugueram@gmail.com>
-Date: Sat, 13 Jun 2020 19:46:44 +0200
-Subject: [PATCH] Fix build for Linux 5.8-rc1
-
-See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9740ca4e95b43b91a4a848694a20d01ba6818f7b
- https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=da1c55f1b272f4bd54671d459b39ea7b54944ef9
- https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d8ed45c5dcd455fc5848d47f86883a1b872ac0d0
-
-Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
-
-Upstream-Status: Backport [9e765068582aae3696520346a7500322ca6cc2de]
-
-Signed-off-by: He Zhe <zhe.he@windriver.com>
----
- zc.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/zc.c b/zc.c
-index ae464ff..2c286bb 100644
---- a/zc.c
-+++ b/zc.c
-@@ -58,7 +58,11 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write,
- return 0;
- }
-
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
- down_read(&mm->mmap_sem);
-+#else
-+ mmap_read_lock(mm);
-+#endif
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0))
- ret = get_user_pages(task, mm,
- (unsigned long)addr, pgcount, write, 0, pg, NULL);
-@@ -74,7 +78,11 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write,
- (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
- pg, NULL, NULL);
- #endif
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
- up_read(&mm->mmap_sem);
-+#else
-+ mmap_read_unlock(mm);
-+#endif
- if (ret != pgcount)
- return -EINVAL;
-
---
-2.17.1
-
--
2.28.0
next prev parent reply other threads:[~2020-08-23 20:21 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-23 20:19 [PATCH 01/37] bison: upgrade 3.6.4 -> 3.7.1 Alexander Kanavin
2020-08-23 20:19 ` [PATCH 02/37] util-linux: upgrade 2.35.2 -> 2.36 Alexander Kanavin
2020-08-23 20:19 ` [PATCH 03/37] python3-numpy: upgrade 1.19.0 -> 1.19.1 Alexander Kanavin
2020-08-23 20:19 ` [PATCH 04/37] python3-setuptools: upgrade 49.3.1 -> 49.6.0 Alexander Kanavin
2020-08-23 20:19 ` [PATCH 05/37] rsync: upgrade 3.2.2 -> 3.2.3 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 06/37] util-linux: merge .inc into .bb Alexander Kanavin
2020-08-23 20:20 ` [PATCH 07/37] acpica: upgrade 20200528 -> 20200717 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 08/37] asciidoc: upgrade 9.0.1 -> 9.0.2 Alexander Kanavin
2020-08-23 20:20 ` Alexander Kanavin [this message]
2020-08-23 20:20 ` [PATCH 10/37] diffoscope: upgrade 153 -> 156 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 11/37] epiphany: upgrade 3.36.3 -> 3.36.4 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 12/37] font-alias: upgrade 1.0.3 -> 1.0.4 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 13/37] gtk+3: upgrade 3.24.21 -> 3.24.22 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 14/37] libcheck: upgrade 0.15.0 -> 0.15.2 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 15/37] libinput: upgrade 1.16.0 -> 1.16.1 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 16/37] libpipeline: upgrade 1.5.2 -> 1.5.3 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 17/37] libx11: upgrade 1.6.9 -> 1.6.11 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 18/37] linux-firmware: upgrade 20200619 -> 20200721 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 19/37] man-pages: upgrade 5.07 -> 5.08 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 20/37] mc: upgrade 4.8.24 -> 4.8.25 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 21/37] mesa: upgrade 20.1.4 -> 20.1.5 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 22/37] piglit: upgrade to latest revision Alexander Kanavin
2020-08-23 20:20 ` [PATCH 23/37] re2c: upgrade 2.0 -> 2.0.2 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 24/37] sysstat: upgrade 12.2.2 -> 12.4.0 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 25/37] vala: upgrade 0.48.7 -> 0.48.9 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 26/37] bootchart2: update 0.14.8 -> 0.14.9 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 27/37] harfbuzz: convert to meson, enable gobject introspection Alexander Kanavin
2020-08-23 20:20 ` [PATCH 28/37] pango: update 1.44.7 -> 1.46.0 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 29/37] boost: update 1.73.0 -> 1.74.0 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 30/37] xev: update 1.2.3 -> 1.2.4 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 31/37] wpebackend-fdo: update 1.6.1 -> 1.7.1 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 32/37] gpgme: update 1.13.1 -> 1.14.0 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 33/37] libpsl: update 0.21.0 -> 0.21.1 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 34/37] gettext: update 0.20.2 -> 0.21 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 35/37] cmake: update 3.17.3 -> 3.18.1 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 36/37] linux-firmware: update 20200721 -> 20200817 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 37/37] meson: update 0.55.0 -> 0.55.1 Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200823202031.24686-9-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox