[meta-intel] [meta-intel-qat][PATCH 1/3] qat: move patches to a single directory

Tue Jan 23 19:50:09 PST 2018

Right now, patches for the two supported drivers are in separate directories
and duplicated. Move them to a single files/ dir.

Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
---
 ...salServices-Only-use-bits-time-with-GLIBC.patch |  0
 ...t16_2.3.0-34-make-sure-CFLAGS-are-correct.patch |  0
 ....0-34-qat-fix-for-cross-compilation-issue.patch |  0
 ....0-34-qat-remove-local-path-from-makefile.patch |  0
 ...qat16_2.5.0-80-qat-Added-include-dir-path.patch |  0
 ....0-80-qat-add-install-target-to-makefiles.patch |  0
 ...nge-in-return-type-of-func-in-kernel-v4.4.patch |  0
 ....0-65-qat-add-install-target-to-makefiles.patch |  0
 ...rride-CC-LD-AR-only-when-it-is-not-define.patch |  0
 .../qat17_0.6.0-1-qat-fix-kernel-patch.patch       |  0
 ...qat17_0.8.0-37-qat-added-include-dir-path.patch |  0
 ...0-4-qat-add-install-target-and-add-folder.patch |  0
 .../qat/{qat16 => files}/use-CC-for-LD.patch       |  0
 ....0-34-qat-remove-local-path-from-makefile.patch | 31 -------------------
 ...rride-CC-LD-AR-only-when-it-is-not-define.patch | 35 ----------------------
 15 files changed, 66 deletions(-)
 rename recipes-extended/qat/{qat16 => files}/0001-OsalServices-Only-use-bits-time-with-GLIBC.patch (100%)
 rename recipes-extended/qat/{qat16 => files}/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch (100%)
 rename recipes-extended/qat/{qat16 => files}/qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch (100%)
 rename recipes-extended/qat/{qat17 => files}/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch (100%)
 rename recipes-extended/qat/{qat16 => files}/qat16_2.5.0-80-qat-Added-include-dir-path.patch (100%)
 rename recipes-extended/qat/{qat16 => files}/qat16_2.5.0-80-qat-add-install-target-to-makefiles.patch (100%)
 rename recipes-extended/qat/{qat16 => files}/qat16_2.5.0-80-qat-change-in-return-type-of-func-in-kernel-v4.4.patch (100%)
 rename recipes-extended/qat/{qat16 => files}/qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch (100%)
 rename recipes-extended/qat/{qat17 => files}/qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch (100%)
 rename recipes-extended/qat/{qat17 => files}/qat17_0.6.0-1-qat-fix-kernel-patch.patch (100%)
 rename recipes-extended/qat/{qat17 => files}/qat17_0.8.0-37-qat-added-include-dir-path.patch (100%)
 rename recipes-extended/qat/{qat17 => files}/qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch (100%)
 rename recipes-extended/qat/{qat16 => files}/use-CC-for-LD.patch (100%)
 delete mode 100644 recipes-extended/qat/qat16/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch
 delete mode 100644 recipes-extended/qat/qat16/qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch

diff --git a/recipes-extended/qat/qat16/0001-OsalServices-Only-use-bits-time-with-GLIBC.patch b/recipes-extended/qat/files/0001-OsalServices-Only-use-bits-time-with-GLIBC.patch
similarity index 100%
rename from recipes-extended/qat/qat16/0001-OsalServices-Only-use-bits-time-with-GLIBC.patch
rename to recipes-extended/qat/files/0001-OsalServices-Only-use-bits-time-with-GLIBC.patch
diff --git a/recipes-extended/qat/qat16/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch b/recipes-extended/qat/files/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch
similarity index 100%
rename from recipes-extended/qat/qat16/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch
rename to recipes-extended/qat/files/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch
diff --git a/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch b/recipes-extended/qat/files/qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch
similarity index 100%
rename from recipes-extended/qat/qat16/qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch
rename to recipes-extended/qat/files/qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch
diff --git a/recipes-extended/qat/qat17/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch b/recipes-extended/qat/files/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch
similarity index 100%
rename from recipes-extended/qat/qat17/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch
rename to recipes-extended/qat/files/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch
diff --git a/recipes-extended/qat/qat16/qat16_2.5.0-80-qat-Added-include-dir-path.patch b/recipes-extended/qat/files/qat16_2.5.0-80-qat-Added-include-dir-path.patch
similarity index 100%
rename from recipes-extended/qat/qat16/qat16_2.5.0-80-qat-Added-include-dir-path.patch
rename to recipes-extended/qat/files/qat16_2.5.0-80-qat-Added-include-dir-path.patch
diff --git a/recipes-extended/qat/qat16/qat16_2.5.0-80-qat-add-install-target-to-makefiles.patch b/recipes-extended/qat/files/qat16_2.5.0-80-qat-add-install-target-to-makefiles.patch
similarity index 100%
rename from recipes-extended/qat/qat16/qat16_2.5.0-80-qat-add-install-target-to-makefiles.patch
rename to recipes-extended/qat/files/qat16_2.5.0-80-qat-add-install-target-to-makefiles.patch
diff --git a/recipes-extended/qat/qat16/qat16_2.5.0-80-qat-change-in-return-type-of-func-in-kernel-v4.4.patch b/recipes-extended/qat/files/qat16_2.5.0-80-qat-change-in-return-type-of-func-in-kernel-v4.4.patch
similarity index 100%
rename from recipes-extended/qat/qat16/qat16_2.5.0-80-qat-change-in-return-type-of-func-in-kernel-v4.4.patch
rename to recipes-extended/qat/files/qat16_2.5.0-80-qat-change-in-return-type-of-func-in-kernel-v4.4.patch
diff --git a/recipes-extended/qat/qat16/qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch b/recipes-extended/qat/files/qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch
similarity index 100%
rename from recipes-extended/qat/qat16/qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch
rename to recipes-extended/qat/files/qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch
diff --git a/recipes-extended/qat/qat17/qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch b/recipes-extended/qat/files/qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch
similarity index 100%
rename from recipes-extended/qat/qat17/qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch
rename to recipes-extended/qat/files/qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch
diff --git a/recipes-extended/qat/qat17/qat17_0.6.0-1-qat-fix-kernel-patch.patch b/recipes-extended/qat/files/qat17_0.6.0-1-qat-fix-kernel-patch.patch
similarity index 100%
rename from recipes-extended/qat/qat17/qat17_0.6.0-1-qat-fix-kernel-patch.patch
rename to recipes-extended/qat/files/qat17_0.6.0-1-qat-fix-kernel-patch.patch
diff --git a/recipes-extended/qat/qat17/qat17_0.8.0-37-qat-added-include-dir-path.patch b/recipes-extended/qat/files/qat17_0.8.0-37-qat-added-include-dir-path.patch
similarity index 100%
rename from recipes-extended/qat/qat17/qat17_0.8.0-37-qat-added-include-dir-path.patch
rename to recipes-extended/qat/files/qat17_0.8.0-37-qat-added-include-dir-path.patch
diff --git a/recipes-extended/qat/qat17/qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch b/recipes-extended/qat/files/qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch
similarity index 100%
rename from recipes-extended/qat/qat17/qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch
rename to recipes-extended/qat/files/qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch
diff --git a/recipes-extended/qat/qat16/use-CC-for-LD.patch b/recipes-extended/qat/files/use-CC-for-LD.patch
similarity index 100%
rename from recipes-extended/qat/qat16/use-CC-for-LD.patch
rename to recipes-extended/qat/files/use-CC-for-LD.patch
diff --git a/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch b/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch
deleted file mode 100644
index 0021c0d..0000000
--- a/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5044a14a6b4192b771f16aa834f688c1fd1287dd Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anujx.mittal at intel.com>
-Date: Wed, 8 Jul 2015 11:11:32 +0800
-Subject: [PATCH] qat: remove local path from makefile
-
-Upstream-Status: Inappropriate [Configuration]
-
-Remove the host machine /usr/include path from makefile.
-
-Signed-off-by: Anuj Mittal <anujx.mittal at intel.com>
----
- .../build_files/env_files/linux_2.6_user_space.mk  |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk b/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk
-index 1451f4a..719d1bb 100755
---- a/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk
-+++ b/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk
-@@ -72,8 +72,7 @@
- #
- #-------------------------------------------------------------
- 
--INCLUDES+=-I/usr/include \
--          -I$(API_DIR)   \
-+INCLUDES+=-I$(API_DIR)   \
-           -I$(OSAL_DIR)/include \
-           -I$(OSAL_DIR)/src/linux/user_space/include
- 
--- 
-1.7.9.5
-
diff --git a/recipes-extended/qat/qat16/qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch b/recipes-extended/qat/qat16/qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch
deleted file mode 100644
index 21cdeae..0000000
--- a/recipes-extended/qat/qat16/qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b21929c42aca4bc80f6c48b5ac31bf20165b2f3e Mon Sep 17 00:00:00 2001
-From: Rahul Kumar Gupta <rahul.kumarxx.gupta at intel.com>
-Date: Fri, 25 Mar 2016 18:02:37 +0800
-Subject: [PATCH] qat: override CC LD AR only when it is not define
-
-Upstream-Status: Inappropriate [Configuration]
-
-To make sure that compiler linker and archiver will override only when
-it is not defined by the environment.
-
-Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta at intel.com>
----
- quickassist/build_system/build_files/Core/ia.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/quickassist/build_system/build_files/Core/ia.mk b/quickassist/build_system/build_files/Core/ia.mk
-index 4a4d123..f9aca23 100755
---- a/quickassist/build_system/build_files/Core/ia.mk
-+++ b/quickassist/build_system/build_files/Core/ia.mk
-@@ -67,9 +67,9 @@
- # e.g. setenv CROSS_COMPILE x86_64-linux
- ifdef CROSS_COMPILE
- ifdef MACHINE
--CC = $(CROSS_COMPILE)gcc
--LD = $(CROSS_COMPILE)ld
--AR = $(CROSS_COMPILE)ar
-+CC ?= $(CROSS_COMPILE)gcc
-+LD ?= $(CROSS_COMPILE)ld
-+AR ?= $(CROSS_COMPILE)ar
- else
- $(error MACHINE is undefined. Please set your target i.e. x86_64 \
- 	"-> setenv MACHINE x86_64 or export MACHINE=x86_64")
--- 
-1.9.1
-
-- 
2.7.4

