summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-08-02 11:10:09 +0800
committerJia Zhang <zhang.jia@linux.alibaba.com>2019-08-02 12:57:36 +0800
commit73bc9f68f91b28e5e4300f76a622c761053b7c32 (patch)
treed29876981b152b349809faa5500f63910b466709
parenta32ad2f61d4c63fc5bfef08f25d5e28a5ecd1d7a (diff)
downloadmeta-secure-core-73bc9f68f91b28e5e4300f76a622c761053b7c32.tar.gz
keyutils: remove it
keyutils under meta-security have been moved to meta-openembeded by this commit https://git.openembedded.org/meta-openembedded/commit/?id=415e213ad75ec9a93171c963395a1c4b92c6233b and is higher version than keyutils, so remove this one Signed-off-by: Changqing Li <changqing.li@windriver.com>
-rw-r--r--meta-integrity/recipes-support/keyutils/keyutils/keyutils-fix-the-cflags-for-all-of-targets.patch33
-rw-r--r--meta-integrity/recipes-support/keyutils/keyutils/keyutils-remove-m32-m64.patch38
-rw-r--r--meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_library_install.patch32
-rw-r--r--meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch25
-rw-r--r--meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_x86_cflags.patch25
-rw-r--r--meta-integrity/recipes-support/keyutils/keyutils_git.bb51
6 files changed, 0 insertions, 204 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
deleted file mode 100644
index 74d36ae..0000000
--- a/meta-integrity/recipes-support/keyutils/keyutils/keyutils-fix-the-cflags-for-all-of-targets.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 104146d812a5591738235699b02fc8ae3fc44743 Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui at cn.fujitsu.com>
3Date: Mon, 17 Aug 2015 13:53:28 +0900
4Subject: [PATCH] fix the cflags for all of targets.
5
6Signed-off-by: Lei Maohui <leimaohui at cn.fujitsu.com>
7---
8 Makefile | 2 --
9 1 file changed, 2 deletions(-)
10
11diff --git a/Makefile b/Makefile
12index 824bbbf..d24cc44 100644
13--- a/Makefile
14+++ b/Makefile
15@@ -64,7 +64,6 @@ USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR))
16 endif
17 BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit
18
19-ifeq ($(origin CFLAGS),undefined)
20 ifeq ($(BUILDFOR),32-bit)
21 CFLAGS += -m32
22 LIBDIR := /lib
23@@ -76,7 +75,6 @@ LIBDIR := /lib64
24 USRLIBDIR := /usr/lib64
25 endif
26 endif
27-endif
28
29 ###############################################################################
30 #
31--
322.7.4
33
diff --git a/meta-integrity/recipes-support/keyutils/keyutils/keyutils-remove-m32-m64.patch b/meta-integrity/recipes-support/keyutils/keyutils/keyutils-remove-m32-m64.patch
deleted file mode 100644
index 120532b..0000000
--- a/meta-integrity/recipes-support/keyutils/keyutils/keyutils-remove-m32-m64.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From a47fef08f065003d417750abf1077387f755153f Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Tue, 26 Sep 2017 07:15:41 +0000
4Subject: [PATCH] keyutils: fix cflags for arm, aarch64, mips, mips64, powerpc
5
6Remove m32, m64 from the CFLAGS to fix error:
7
8 error: unrecognized command line option '-m32/-m64'
9
10Upstream-Status: Pending
11
12Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
13---
14 Makefile | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/Makefile b/Makefile
18index d24cc44..230d4b6 100644
19--- a/Makefile
20+++ b/Makefile
21@@ -65,12 +65,12 @@ endif
22 BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit
23
24 ifeq ($(BUILDFOR),32-bit)
25-CFLAGS += -m32
26+#CFLAGS += -m32
27 LIBDIR := /lib
28 USRLIBDIR := /usr/lib
29 else
30 ifeq ($(BUILDFOR),64-bit)
31-CFLAGS += -m64
32+#CFLAGS += -m64
33 LIBDIR := /lib64
34 USRLIBDIR := /usr/lib64
35 endif
36--
372.11.0
38
diff --git a/meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_library_install.patch b/meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_library_install.patch
deleted file mode 100644
index 8df21a0..0000000
--- a/meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_library_install.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From b0355cc205543ffd33752874295139d57c4fbc3e Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Tue, 26 Sep 2017 07:59:51 +0000
4Subject: [PATCH] Subject: [PATCH] keyutils: use relative path for link
5
6The absolute path of the symlink will be invalid
7when populated in sysroot, so use relative path instead.
8
9Upstream-Status: Pending
10
11Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
12Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
13---
14 Makefile | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/Makefile b/Makefile
18index 824bbbf..8ce3a13 100644
19--- a/Makefile
20+++ b/Makefile
21@@ -167,7 +167,7 @@ ifeq ($(NO_SOLIB),0)
22 $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
23 $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
24 mkdir -p $(DESTDIR)$(USRLIBDIR)
25- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
26+ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
27 endif
28 $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
29 $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
30--
312.11.0
32
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
deleted file mode 100644
index c557ff6..0000000
--- a/meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From f280d5af1d8654eaf1d767cf36abf3906b0fe3de Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui at cn.fujitsu.com>
3Date: Mon, 17 Aug 2015 15:53:02 +0900
4Subject: [PATCH] keyutils fix x86-64 cflags
5
6---
7 Makefile | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10diff --git a/Makefile b/Makefile
11index d24cc44..968ee84 100644
12--- a/Makefile
13+++ b/Makefile
14@@ -62,7 +62,7 @@ endif
15 ifeq ($(origin USRLIBDIR),undefined)
16 USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR))
17 endif
18-BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit
19+BUILDFOR := 64-bit
20
21 ifeq ($(BUILDFOR),32-bit)
22 CFLAGS += -m32
23--
242.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
deleted file mode 100644
index 1957929..0000000
--- a/meta-integrity/recipes-support/keyutils/keyutils/keyutils_fix_x86_cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From fc675bd1e977a1bf04a3ba884476939461207bec Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui at cn.fujitsu.com>
3Date: Mon, 17 Aug 2015 11:48:22 +0900
4Subject: [PATCH] keyutils fix x86 cflags
5
6---
7 Makefile | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10diff --git a/Makefile b/Makefile
11index d24cc44..899d95e 100644
12--- a/Makefile
13+++ b/Makefile
14@@ -62,7 +62,7 @@ endif
15 ifeq ($(origin USRLIBDIR),undefined)
16 USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR))
17 endif
18-BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit
19+BUILDFOR := 32-bit
20
21 ifeq ($(BUILDFOR),32-bit)
22 CFLAGS += -m32
23--
242.7.4
25
diff --git a/meta-integrity/recipes-support/keyutils/keyutils_git.bb b/meta-integrity/recipes-support/keyutils/keyutils_git.bb
deleted file mode 100644
index f5fcd93..0000000
--- a/meta-integrity/recipes-support/keyutils/keyutils_git.bb
+++ /dev/null
@@ -1,51 +0,0 @@
1SUMMARY = "Linux Key Management Utilities"
2DESCRIPTION = "Keyutils is a set of utilities for managing the key retention \
3facility in the kernel, which can be used by filesystems, block devices and \
4more to gain and retain the authorization and encryption keys required to \
5perform secure operations."
6SECTION = "base"
7
8LICENSE = "GPLv2"
9LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45"
10
11PV = "1.5.10+git${SRCPV}"
12
13SRC_URI = "\
14 git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git \
15 file://keyutils_fix_library_install.patch \
16 file://keyutils-fix-the-cflags-for-all-of-targets.patch \
17"
18SRC_URI_append_arm = " file://keyutils-remove-m32-m64.patch"
19SRC_URI_append_aarch64 = " file://keyutils-remove-m32-m64.patch"
20SRC_URI_append_mips = " file://keyutils-remove-m32-m64.patch"
21SRC_URI_append_mips64 = " file://keyutils-remove-m32-m64.patch"
22SRC_URI_append_x86 = " file://keyutils_fix_x86_cflags.patch"
23SRC_URI_append_x86-64 = " file://keyutils_fix_x86-64_cflags.patch"
24SRC_URI_append_powerpc = "file://keyutils-remove-m32-m64.patch"
25SRCREV = "308119c61e94bcc4c710404b9f679e3bb8316713"
26
27S = "${WORKDIR}/git"
28
29inherit autotools-brokensep
30
31EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall'"
32
33INSTALL_FLAGS = "\
34 LIBDIR=${libdir} \
35 USRLIBDIR=${libdir} \
36 BINDIR=${bindir} \
37 SBINDIR=${sbindir} \
38 ETCDIR=${sysconfdir} \
39 SHAREDIR=${datadir} \
40 MANDIR=${mandir} \
41 INCLUDEDIR=${includedir} \
42 DESTDIR=${D} \
43"
44
45do_install() {
46 cd ${S} && oe_runmake ${INSTALL_FLAGS} install
47}
48
49FILES_${PN} += "${datadir}/request-key-debug.sh"
50
51BBCLASSEXTEND = "native nativesdk"