diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2018-04-11 21:38:43 +0800 |
---|---|---|
committer | Jia Zhang <zhang.jia@linux.alibaba.com> | 2018-04-11 14:45:15 +0800 |
commit | 4a6de140946ad438fa67481b812d141c42d33573 (patch) | |
tree | 664da68898e3e4b4679ae0c524ad5d51437cadcb | |
parent | 04c1072d8f4ebd697b902f1d88cd0c02e428384e (diff) | |
download | meta-secure-core-4a6de140946ad438fa67481b812d141c42d33573.tar.gz |
keyutils: refresh patches to fix QA warning
Refresh the following patches:
keyutils-fix-the-cflags-for-all-of-targets.patch
keyutils_fix_x86-64_cflags.patch
keyutils_fix_x86_cflags.patch
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
3 files changed, 26 insertions, 23 deletions
diff --git a/meta-integrity/recipes-support/keyutils/keyutils/keyutils-fix-the-cflags-for-all-of-targets.patch b/meta-integrity/recipes-support/keyutils/keyutils/keyutils-fix-the-cflags-for-all-of-targets.patch index 77cf528..74d36ae 100644 --- a/meta-integrity/recipes-support/keyutils/keyutils/keyutils-fix-the-cflags-for-all-of-targets.patch +++ b/meta-integrity/recipes-support/keyutils/keyutils/keyutils-fix-the-cflags-for-all-of-targets.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8a1331d4abf9a96ee65e5fb31a00c7a2e0eed7c8 Mon Sep 17 00:00:00 2001 | 1 | From 104146d812a5591738235699b02fc8ae3fc44743 Mon Sep 17 00:00:00 2001 |
2 | From: Lei Maohui <leimaohui at cn.fujitsu.com> | 2 | From: Lei Maohui <leimaohui at cn.fujitsu.com> |
3 | Date: Mon, 17 Aug 2015 13:53:28 +0900 | 3 | Date: Mon, 17 Aug 2015 13:53:28 +0900 |
4 | Subject: [PATCH] fix the cflags for all of targets. | 4 | Subject: [PATCH] fix the cflags for all of targets. |
@@ -9,19 +9,19 @@ Signed-off-by: Lei Maohui <leimaohui at cn.fujitsu.com> | |||
9 | 1 file changed, 2 deletions(-) | 9 | 1 file changed, 2 deletions(-) |
10 | 10 | ||
11 | diff --git a/Makefile b/Makefile | 11 | diff --git a/Makefile b/Makefile |
12 | index e2d7e2d..82e1a0f 100644 | 12 | index 824bbbf..d24cc44 100644 |
13 | --- a/Makefile | 13 | --- a/Makefile |
14 | +++ b/Makefile | 14 | +++ b/Makefile |
15 | @@ -64,7 +64,6 @@ BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')- | 15 | @@ -64,7 +64,6 @@ USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR)) |
16 | 16 | endif | |
17 | LNS := ln -sf | 17 | BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit |
18 | 18 | ||
19 | -ifeq ($(origin CFLAGS),undefined) | 19 | -ifeq ($(origin CFLAGS),undefined) |
20 | ifeq ($(BUILDFOR),32-bit) | 20 | ifeq ($(BUILDFOR),32-bit) |
21 | CFLAGS += -m32 | 21 | CFLAGS += -m32 |
22 | LIBDIR := /usr/lib | 22 | LIBDIR := /lib |
23 | @@ -76,7 +75,6 @@ LIBDIR := /usr/lib | 23 | @@ -76,7 +75,6 @@ LIBDIR := /lib64 |
24 | USRLIBDIR := /usr/lib | 24 | USRLIBDIR := /usr/lib64 |
25 | endif | 25 | endif |
26 | endif | 26 | endif |
27 | -endif | 27 | -endif |
@@ -29,4 +29,5 @@ index e2d7e2d..82e1a0f 100644 | |||
29 | ############################################################################### | 29 | ############################################################################### |
30 | # | 30 | # |
31 | -- | 31 | -- |
32 | 1.8.4.2 | 32 | 2.7.4 |
33 | |||
diff --git a/meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch b/meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch index b0c2d92..c557ff6 100644 --- a/meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch +++ b/meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d3b6b98984a28e782cb22dc6c7bd0ea9a0e74f15 Mon Sep 17 00:00:00 2001 | 1 | From f280d5af1d8654eaf1d767cf36abf3906b0fe3de Mon Sep 17 00:00:00 2001 |
2 | From: Lei Maohui <leimaohui at cn.fujitsu.com> | 2 | From: Lei Maohui <leimaohui at cn.fujitsu.com> |
3 | Date: Mon, 17 Aug 2015 15:53:02 +0900 | 3 | Date: Mon, 17 Aug 2015 15:53:02 +0900 |
4 | Subject: [PATCH] keyutils fix x86-64 cflags | 4 | Subject: [PATCH] keyutils fix x86-64 cflags |
@@ -8,17 +8,18 @@ Subject: [PATCH] keyutils fix x86-64 cflags | |||
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | 8 | 1 file changed, 1 insertion(+), 1 deletion(-) |
9 | 9 | ||
10 | diff --git a/Makefile b/Makefile | 10 | diff --git a/Makefile b/Makefile |
11 | index 82e1a0f..23aa466 100644 | 11 | index d24cc44..968ee84 100644 |
12 | --- a/Makefile | 12 | --- a/Makefile |
13 | +++ b/Makefile | 13 | +++ b/Makefile |
14 | @@ -60,7 +60,7 @@ endif | 14 | @@ -62,7 +62,7 @@ endif |
15 | ifeq ($(origin USRLIBDIR),undefined) | 15 | ifeq ($(origin USRLIBDIR),undefined) |
16 | USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR)) | 16 | USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR)) |
17 | endif | 17 | endif |
18 | -BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit | 18 | -BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit |
19 | +BUILDFOR := 64-bit | 19 | +BUILDFOR := 64-bit |
20 | 20 | ||
21 | LNS := ln -sf | 21 | ifeq ($(BUILDFOR),32-bit) |
22 | 22 | CFLAGS += -m32 | |
23 | -- | 23 | -- |
24 | 1.8.4.2 | 24 | 2.7.4 |
25 | |||
diff --git a/meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_x86_cflags.patch b/meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_x86_cflags.patch index f5d5f70..1957929 100644 --- a/meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_x86_cflags.patch +++ b/meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_x86_cflags.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3263917382af02e61f12f3774c32d3324a57059f Mon Sep 17 00:00:00 2001 | 1 | From fc675bd1e977a1bf04a3ba884476939461207bec Mon Sep 17 00:00:00 2001 |
2 | From: Lei Maohui <leimaohui at cn.fujitsu.com> | 2 | From: Lei Maohui <leimaohui at cn.fujitsu.com> |
3 | Date: Mon, 17 Aug 2015 11:48:22 +0900 | 3 | Date: Mon, 17 Aug 2015 11:48:22 +0900 |
4 | Subject: [PATCH] keyutils fix x86 cflags | 4 | Subject: [PATCH] keyutils fix x86 cflags |
@@ -8,17 +8,18 @@ Subject: [PATCH] keyutils fix x86 cflags | |||
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | 8 | 1 file changed, 1 insertion(+), 1 deletion(-) |
9 | 9 | ||
10 | diff --git a/Makefile b/Makefile | 10 | diff --git a/Makefile b/Makefile |
11 | index e2d7e2d..f05bada 100644 | 11 | index d24cc44..899d95e 100644 |
12 | --- a/Makefile | 12 | --- a/Makefile |
13 | +++ b/Makefile | 13 | +++ b/Makefile |
14 | @@ -60,7 +60,7 @@ endif | 14 | @@ -62,7 +62,7 @@ endif |
15 | ifeq ($(origin USRLIBDIR),undefined) | 15 | ifeq ($(origin USRLIBDIR),undefined) |
16 | USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR)) | 16 | USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR)) |
17 | endif | 17 | endif |
18 | -BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit | 18 | -BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit |
19 | +BUILDFOR := 32-bit | 19 | +BUILDFOR := 32-bit |
20 | 20 | ||
21 | LNS := ln -sf | 21 | ifeq ($(BUILDFOR),32-bit) |
22 | 22 | CFLAGS += -m32 | |
23 | -- | 23 | -- |
24 | 1.8.4.2 | 24 | 2.7.4 |
25 | |||