cryptodev-linux: bump to version 1.8
PATCH 1/1 cryptodev-linux: bump to version 1.8
Patches are upstream so remove them.
--- .../0001-fix-compilation-against-linux-3.19.patch | 37 ---------------- .../0002-Fix-compilation-against-linux-4.3.patch | 50 ---------------------- package/cryptodev-linux/cryptodev-linux.hash | 2 +- package/cryptodev-linux/cryptodev-linux.mk | 2 +- 4 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 package/cryptodev-linux/0001-fix-compilation-against-linux-3.19.patch delete mode 100644 package/cryptodev-linux/0002-Fix-compilation-against-linux-4.3.patch
package/cryptodev-linux/0001-fix-compilation-against-linux-3.19.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From 5054d20d45571cc85339351fde52f872eeb82206 Mon Sep 17 00:00:00 2001 -From: Phil Sutter <[email protected]> -Date: Tue, 10 Feb 2015 04:57:05 +0100 -Subject: [PATCH] fix compilation against linux-3.19 - -Commit f938612dd97d481b8b5bf960c992ae577f081c17 in linux.git removes -get_unused_fd() macro. This patch changes the calling code to use it's -content 'get_unused_fd_flags(0)' instead. Checking for when -get_unused_fd_flags was introduced shows it's been there since 2.6.23 at -least, so probably no need to make this change conditional on the target -kernel version. - -Original patch by Ricardo Ribalda Delgado for Open Embedded, reported by -Oleg Rakhmanov. - -Signed-off-by: Phil Sutter <[email protected]> -Signed-off-by: Gustavo Zacarias <[email protected]> ---- - ioctl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ioctl.c b/ioctl.c -index 5a55a76..b23f5fd 100644 ---- a/ioctl.c -+++ b/ioctl.c -@@ -546,7 +546,7 @@ static int - clonefd(struct file *filp) - { - int ret; -- ret = get_unused_fd(); -+ ret = get_unused_fd_flags(0); - if (ret >= 0) { - get_file(filp); - fd_install(ret, filp); --- -2.0.5 -
package/cryptodev-linux/0002-Fix-compilation-against-linux-4.3.patch deleted +0 -50
50 lines not on this page · raw message
package/cryptodev-linux/cryptodev-linux.hash +1 -1
@@ -1,2 +1,2 @@ # Locally calculated after checking php signature -sha256 41880533b53de4d7b3f054e230f576988dafb8eed7bef5ebcf6422bb2e3a3b25 cryptodev-linux-1.7.tar.gz +sha256 67fabde9fb67b286a96c4f45b594b0eccd0f761b495705c18f2ae9461b831376 cryptodev-linux-1.8.tar.gz
package/cryptodev-linux/cryptodev-linux.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -CRYPTODEV_LINUX_VERSION = 1.7 +CRYPTODEV_LINUX_VERSION = 1.8 CRYPTODEV_LINUX_SITE = http://download.gna.org/cryptodev-linux CRYPTODEV_LINUX_INSTALL_STAGING = YES CRYPTODEV_LINUX_LICENSE = GPLv2+
Signature · 1 line
2.4.10
Thomas Petazzoni
AppliedPATCH 1/1 cryptodev-linux: bump to version 1.8
Gustavo, Peter,
Quoted 1 line · Gustavo Zacarias
Patches are upstream so remove them.
Woohoo, I like when we can get rid of patches because they have been upstreamed.
Quoted 9 lines
Signed-off-by Gustavo Zacarias <[email protected]>--- .../0001-fix-compilation-against-linux-3.19.patch | 37 ---------------- .../0002-Fix-compilation-against-linux-4.3.patch | 50 ---------------------- package/cryptodev-linux/cryptodev-linux.hash | 2 +- package/cryptodev-linux/cryptodev-linux.mk | 2 +- 4 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 package/cryptodev-linux/0001-fix-compilation-against-linux-3.19.patch delete mode 100644 package/cryptodev-linux/0002-Fix-compilation-against-linux-4.3.patch
Applied to next (soon to be master).
Peter: this might create a conflict when merging back to master. The 0002-Fix-compilation-against-linux-4.3.patch that Gustavo is removing here has never been added to next, it had only been added to master. So when I applied this commit to the next branch, it just discarded the information that this commit removes 0002-Fix-compilation-against-linux-4.3.patch.
However, when you merge next into master, please make sure to re-remove 0002-Fix-compilation-against-linux-4.3.patch. Otherwise, it will fail to apply after extracting the new version of cryptodev-linux.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 cryptodev-linux: bump to version 1.8
On 01-12-15 17:46, Thomas Petazzoni wrote:
[snip]
Quoted 9 lines
Applied to next (soon to be master).
Peter: this might create a conflict when merging back to master. The 0002-Fix-compilation-against-linux-4.3.patch that Gustavo is removing here has never been added to next, it had only been added to master. So when I applied this commit to the next branch, it just discarded the information that this commit removes 0002-Fix-compilation-against-linux-4.3.patch.
Quoted 3 lines
However, when you merge next into master, please make sure to re-remove 0002-Fix-compilation-against-linux-4.3.patch. Otherwise, it will fail to apply after extracting the new version of cryptodev-linux.
Perhaps in the next cycle you should regularly merge master->next to avoid this
kind of issue. You were also bitten by it with unscd so it's not a rare problem.
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF