diff options
-rw-r--r-- | recipes-security/keyutils/files/fix_library_install_path.patch | 28 | ||||
-rw-r--r-- | recipes-security/keyutils/keyutils_1.6.bb | 14 |
2 files changed, 36 insertions, 6 deletions
diff --git a/recipes-security/keyutils/files/fix_library_install_path.patch b/recipes-security/keyutils/files/fix_library_install_path.patch new file mode 100644 index 0000000..938fe2e --- /dev/null +++ b/recipes-security/keyutils/files/fix_library_install_path.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From b0355cc205543ffd33752874295139d57c4fbc3e Mon Sep 17 00:00:00 2001 | ||
2 | From: Wenzong Fan <wenzong.fan@windriver.com> | ||
3 | Date: Tue, 26 Sep 2017 07:59:51 +0000 | ||
4 | Subject: [PATCH] Subject: [PATCH] keyutils: use relative path for link | ||
5 | |||
6 | The absolute path of the symlink will be invalid | ||
7 | when populated in sysroot, so use relative path instead. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
12 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||
13 | {rebased for 1.6] | ||
14 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
15 | |||
16 | Index: keyutils-1.6/Makefile | ||
17 | =================================================================== | ||
18 | --- keyutils-1.6.orig/Makefile | ||
19 | +++ keyutils-1.6/Makefile | ||
20 | @@ -184,7 +184,7 @@ ifeq ($(NO_SOLIB),0) | ||
21 | $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) | ||
22 | $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) | ||
23 | mkdir -p $(DESTDIR)$(USRLIBDIR) | ||
24 | - $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) | ||
25 | + $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) | ||
26 | sed \ | ||
27 | -e 's,@VERSION\@,$(VERSION),g' \ | ||
28 | -e 's,@prefix\@,$(PREFIX),g' \ | ||
diff --git a/recipes-security/keyutils/keyutils_1.6.bb b/recipes-security/keyutils/keyutils_1.6.bb index c961fa2..4d3a96f 100644 --- a/recipes-security/keyutils/keyutils_1.6.bb +++ b/recipes-security/keyutils/keyutils_1.6.bb | |||
@@ -12,13 +12,13 @@ LICENSE = "LGPLv2.1+ & GPLv2.0+" | |||
12 | LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \ | 12 | LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \ |
13 | file://LICENCE.LGPL;md5=7d1cacaa3ea752b72ea5e525df54a21f" | 13 | file://LICENCE.LGPL;md5=7d1cacaa3ea752b72ea5e525df54a21f" |
14 | 14 | ||
15 | 15 | inherit siteinfo autotools-brokensep ptest | |
16 | inherit siteinfo ptest | ||
17 | 16 | ||
18 | SRC_URI = "http://people.redhat.com/dhowells/keyutils/${BP}.tar.bz2 \ | 17 | SRC_URI = "http://people.redhat.com/dhowells/keyutils/${BP}.tar.bz2 \ |
19 | file://keyutils-test-fix-output-format.patch \ | 18 | file://keyutils-test-fix-output-format.patch \ |
20 | file://keyutils-fix-error-report-by-adding-default-message.patch \ | 19 | file://keyutils-fix-error-report-by-adding-default-message.patch \ |
21 | file://run-ptest \ | 20 | file://run-ptest \ |
21 | file://fix_library_install_path.patch \ | ||
22 | " | 22 | " |
23 | 23 | ||
24 | SRC_URI[md5sum] = "191987b0ab46bb5b50efd70a6e6ce808" | 24 | SRC_URI[md5sum] = "191987b0ab46bb5b50efd70a6e6ce808" |
@@ -28,14 +28,15 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall' \ | |||
28 | NO_ARLIB=1 \ | 28 | NO_ARLIB=1 \ |
29 | BINDIR=${base_bindir} \ | 29 | BINDIR=${base_bindir} \ |
30 | SBINDIR=${base_sbindir} \ | 30 | SBINDIR=${base_sbindir} \ |
31 | LIBDIR=${base_libdir} \ | 31 | LIBDIR=${libdir} \ |
32 | USRLIBDIR=${base_libdir} \ | 32 | USRLIBDIR=${libdir} \ |
33 | INCLUDEDIR=${includedir} \ | ||
33 | BUILDFOR=${SITEINFO_BITS}-bit \ | 34 | BUILDFOR=${SITEINFO_BITS}-bit \ |
34 | NO_GLIBC_KEYERR=1 \ | 35 | NO_GLIBC_KEYERR=1 \ |
35 | " | 36 | " |
36 | 37 | ||
37 | do_install () { | 38 | do_install () { |
38 | install -d ${D}/${nonarch_base_libdir}/pkgconfig | 39 | install -d ${D}/${libdir}/pkgconfig |
39 | oe_runmake DESTDIR=${D} install | 40 | oe_runmake DESTDIR=${D} install |
40 | } | 41 | } |
41 | 42 | ||
@@ -44,8 +45,9 @@ do_install_ptest () { | |||
44 | sed -i -e 's/OSDIST=Unknown/OSDIST=${DISTRO}/' ${D}${PTEST_PATH}/tests/prepare.inc.sh | 45 | sed -i -e 's/OSDIST=Unknown/OSDIST=${DISTRO}/' ${D}${PTEST_PATH}/tests/prepare.inc.sh |
45 | } | 46 | } |
46 | 47 | ||
47 | FILES_${PN}-dev += "${nonarch_base_libdir}/pkgconfig/libkeyutils.pc" | ||
48 | 48 | ||
49 | RDEPENDS_${PN}-ptest += "lsb" | 49 | RDEPENDS_${PN}-ptest += "lsb" |
50 | RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" | 50 | RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" |
51 | RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils" | 51 | RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils" |
52 | |||
53 | BBCLASSEXTEND = "native nativesdk" | ||