summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-09 18:56:10 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-15 09:22:46 (GMT)
commitf6e03ac1a7344fad265b7b4ca58547757c395c5b (patch)
treef02522e12a0c6805443c4dc7cf5c8a8ae602cc9b
parented79a8ccbe6969c4dc2414ff9109bf111a512062 (diff)
downloadpoky-f6e03ac1a7344fad265b7b4ca58547757c395c5b.tar.gz
cryptodev: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: cecd562742c94f223c92bf5426148967fc9a8054) (From OE-Core rev: ce0554c6807b3a67bd770b172e81595797715e9e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch42
1 files changed, 21 insertions, 21 deletions
diff --git a/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch b/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
index 3f0298b..84fd27e 100644
--- a/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
+++ b/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
@@ -14,37 +14,37 @@ Upstream-Status: Pending
14 tests/Makefile | 8 ++++++++ 14 tests/Makefile | 8 ++++++++
15 2 files changed, 14 insertions(+), 0 deletions(-) 15 2 files changed, 14 insertions(+), 0 deletions(-)
16 16
17diff --git a/Makefile b/Makefile 17Index: git/Makefile
18index 31c4b3f..2ecf2a9 100644 18===================================================================
19--- a/Makefile 19--- git.orig/Makefile
20+++ b/Makefile 20+++ git/Makefile
21@@ -34,6 +34,9 @@ modules_install: 21@@ -35,6 +35,9 @@ modules_install:
22 @echo "Installing cryptodev.h in $(PREFIX)/usr/include/crypto ..." 22 $(MAKE) $(KERNEL_MAKE_OPTS) modules_install
23 @install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h 23 install -m 644 -D crypto/cryptodev.h $(DESTDIR)/$(includedir)/crypto/cryptodev.h
24 24
25+install_tests: 25+install_tests:
26+ make -C tests install DESTDIR=$(PREFIX) 26+ make -C tests install DESTDIR=$(PREFIX)
27+ 27+
28 clean: 28 clean:
29 make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean 29 $(MAKE) $(KERNEL_MAKE_OPTS) clean
30 rm -f $(hostprogs) *~ 30 rm -f $(hostprogs) *~
31@@ -42,6 +45,9 @@ clean: 31@@ -43,6 +46,9 @@ clean:
32 check: 32 check:
33 CFLAGS=$(CRYPTODEV_CFLAGS) KERNEL_DIR=$(KERNEL_DIR) make -C tests check 33 CFLAGS=$(CRYPTODEV_CFLAGS) KERNEL_DIR=$(KERNEL_DIR) $(MAKE) -C tests check
34 34
35+testprogs: 35+testprogs:
36+ KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs 36+ KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs
37+ 37+
38 CPOPTS = 38 CPOPTS =
39 ifneq (${SHOW_TYPES},) 39 ifneq ($(SHOW_TYPES),)
40 CPOPTS += --show-types 40 CPOPTS += --show-types
41diff --git a/tests/Makefile b/tests/Makefile 41Index: git/tests/Makefile
42index c9f04e8..cd202af 100644 42===================================================================
43--- a/tests/Makefile 43--- git.orig/tests/Makefile
44+++ b/tests/Makefile 44+++ git/tests/Makefile
45@@ -19,6 +19,12 @@ example-async-hmac-objs := async_hmac.o 45@@ -23,6 +23,12 @@ bindir = $(execprefix)/bin
46 example-async-speed-objs := async_speed.o 46
47 example-hashcrypt-speed-objs := hashcrypt_speed.c 47 all: $(hostprogs)
48 48
49+install: 49+install:
50+ install -d $(DESTDIR)/usr/bin/tests_cryptodev 50+ install -d $(DESTDIR)/usr/bin/tests_cryptodev
@@ -55,9 +55,9 @@ index c9f04e8..cd202af 100644
55 check: $(hostprogs) 55 check: $(hostprogs)
56 ./cipher 56 ./cipher
57 ./hmac 57 ./hmac
58@@ -28,6 +34,8 @@ check: $(hostprogs) 58@@ -38,6 +44,8 @@ install:
59 ./cipher-gcm 59 install -m 755 $$prog $(DESTDIR)/$(bindir); \
60 ./cipher-aead 60 done
61 61
62+testprogs: $(hostprogs) 62+testprogs: $(hostprogs)
63+ 63+