mirror of
https://github.com/jiazhang0/meta-secure-core.git
synced 2026-01-12 01:00:15 +00:00
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>
This commit is contained in:
Changqing Li
Jia Zhang
@@ -1,33 +0,0 @@
|
||||
From 104146d812a5591738235699b02fc8ae3fc44743 Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui at cn.fujitsu.com>
|
||||
Date: Mon, 17 Aug 2015 13:53:28 +0900
|
||||
Subject: [PATCH] fix the cflags for all of targets.
|
||||
|
||||
Signed-off-by: Lei Maohui <leimaohui at cn.fujitsu.com>
|
||||
---
|
||||
Makefile | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 824bbbf..d24cc44 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -64,7 +64,6 @@ USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR))
|
||||
endif
|
||||
BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit
|
||||
|
||||
-ifeq ($(origin CFLAGS),undefined)
|
||||
ifeq ($(BUILDFOR),32-bit)
|
||||
CFLAGS += -m32
|
||||
LIBDIR := /lib
|
||||
@@ -76,7 +75,6 @@ LIBDIR := /lib64
|
||||
USRLIBDIR := /usr/lib64
|
||||
endif
|
||||
endif
|
||||
-endif
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
From a47fef08f065003d417750abf1077387f755153f Mon Sep 17 00:00:00 2001
|
||||
From: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
Date: Tue, 26 Sep 2017 07:15:41 +0000
|
||||
Subject: [PATCH] keyutils: fix cflags for arm, aarch64, mips, mips64, powerpc
|
||||
|
||||
Remove m32, m64 from the CFLAGS to fix error:
|
||||
|
||||
error: unrecognized command line option '-m32/-m64'
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
---
|
||||
Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d24cc44..230d4b6 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -65,12 +65,12 @@ endif
|
||||
BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit
|
||||
|
||||
ifeq ($(BUILDFOR),32-bit)
|
||||
-CFLAGS += -m32
|
||||
+#CFLAGS += -m32
|
||||
LIBDIR := /lib
|
||||
USRLIBDIR := /usr/lib
|
||||
else
|
||||
ifeq ($(BUILDFOR),64-bit)
|
||||
-CFLAGS += -m64
|
||||
+#CFLAGS += -m64
|
||||
LIBDIR := /lib64
|
||||
USRLIBDIR := /usr/lib64
|
||||
endif
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
From b0355cc205543ffd33752874295139d57c4fbc3e Mon Sep 17 00:00:00 2001
|
||||
From: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
Date: Tue, 26 Sep 2017 07:59:51 +0000
|
||||
Subject: [PATCH] Subject: [PATCH] keyutils: use relative path for link
|
||||
|
||||
The absolute path of the symlink will be invalid
|
||||
when populated in sysroot, so use relative path instead.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
||||
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 824bbbf..8ce3a13 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -167,7 +167,7 @@ ifeq ($(NO_SOLIB),0)
|
||||
$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
|
||||
$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
|
||||
mkdir -p $(DESTDIR)$(USRLIBDIR)
|
||||
- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
|
||||
+ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
|
||||
endif
|
||||
$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
|
||||
$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From f280d5af1d8654eaf1d767cf36abf3906b0fe3de Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui at cn.fujitsu.com>
|
||||
Date: Mon, 17 Aug 2015 15:53:02 +0900
|
||||
Subject: [PATCH] keyutils fix x86-64 cflags
|
||||
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d24cc44..968ee84 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -62,7 +62,7 @@ endif
|
||||
ifeq ($(origin USRLIBDIR),undefined)
|
||||
USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR))
|
||||
endif
|
||||
-BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit
|
||||
+BUILDFOR := 64-bit
|
||||
|
||||
ifeq ($(BUILDFOR),32-bit)
|
||||
CFLAGS += -m32
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From fc675bd1e977a1bf04a3ba884476939461207bec Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui at cn.fujitsu.com>
|
||||
Date: Mon, 17 Aug 2015 11:48:22 +0900
|
||||
Subject: [PATCH] keyutils fix x86 cflags
|
||||
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d24cc44..899d95e 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -62,7 +62,7 @@ endif
|
||||
ifeq ($(origin USRLIBDIR),undefined)
|
||||
USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR))
|
||||
endif
|
||||
-BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit
|
||||
+BUILDFOR := 32-bit
|
||||
|
||||
ifeq ($(BUILDFOR),32-bit)
|
||||
CFLAGS += -m32
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
SUMMARY = "Linux Key Management Utilities"
|
||||
DESCRIPTION = "Keyutils is a set of utilities for managing the key retention \
|
||||
facility in the kernel, which can be used by filesystems, block devices and \
|
||||
more to gain and retain the authorization and encryption keys required to \
|
||||
perform secure operations."
|
||||
SECTION = "base"
|
||||
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45"
|
||||
|
||||
PV = "1.5.10+git${SRCPV}"
|
||||
|
||||
SRC_URI = "\
|
||||
git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git \
|
||||
file://keyutils_fix_library_install.patch \
|
||||
file://keyutils-fix-the-cflags-for-all-of-targets.patch \
|
||||
"
|
||||
SRC_URI_append_arm = " file://keyutils-remove-m32-m64.patch"
|
||||
SRC_URI_append_aarch64 = " file://keyutils-remove-m32-m64.patch"
|
||||
SRC_URI_append_mips = " file://keyutils-remove-m32-m64.patch"
|
||||
SRC_URI_append_mips64 = " file://keyutils-remove-m32-m64.patch"
|
||||
SRC_URI_append_x86 = " file://keyutils_fix_x86_cflags.patch"
|
||||
SRC_URI_append_x86-64 = " file://keyutils_fix_x86-64_cflags.patch"
|
||||
SRC_URI_append_powerpc = "file://keyutils-remove-m32-m64.patch"
|
||||
SRCREV = "308119c61e94bcc4c710404b9f679e3bb8316713"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit autotools-brokensep
|
||||
|
||||
EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall'"
|
||||
|
||||
INSTALL_FLAGS = "\
|
||||
LIBDIR=${libdir} \
|
||||
USRLIBDIR=${libdir} \
|
||||
BINDIR=${bindir} \
|
||||
SBINDIR=${sbindir} \
|
||||
ETCDIR=${sysconfdir} \
|
||||
SHAREDIR=${datadir} \
|
||||
MANDIR=${mandir} \
|
||||
INCLUDEDIR=${includedir} \
|
||||
DESTDIR=${D} \
|
||||
"
|
||||
|
||||
do_install() {
|
||||
cd ${S} && oe_runmake ${INSTALL_FLAGS} install
|
||||
}
|
||||
|
||||
FILES_${PN} += "${datadir}/request-key-debug.sh"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
Reference in New Issue
Block a user