diff options
| -rw-r--r-- | files/keyutils-use-relative-path-for-link.patch | 28 | ||||
| -rw-r--r-- | keyutils_1.6.bb (renamed from keyutils_1.5.10.bb) | 5 |
2 files changed, 2 insertions, 31 deletions
diff --git a/files/keyutils-use-relative-path-for-link.patch b/files/keyutils-use-relative-path-for-link.patch deleted file mode 100644 index dde1af44ac..0000000000 --- a/files/keyutils-use-relative-path-for-link.patch +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | Subject: [PATCH] keyutils: use relative path for link | ||
| 2 | |||
| 3 | The absolute path of the symlink will be invalid | ||
| 4 | when populated in sysroot, so use relative path instead. | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
| 9 | --- | ||
| 10 | Makefile | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/Makefile b/Makefile | ||
| 14 | index 824bbbf..8ce3a13 100644 | ||
| 15 | --- a/Makefile | ||
| 16 | +++ b/Makefile | ||
| 17 | @@ -167,7 +167,7 @@ ifeq ($(NO_SOLIB),0) | ||
| 18 | $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) | ||
| 19 | $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) | ||
| 20 | mkdir -p $(DESTDIR)$(USRLIBDIR) | ||
| 21 | - $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) | ||
| 22 | + $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) | ||
| 23 | endif | ||
| 24 | $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl | ||
| 25 | $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key | ||
| 26 | -- | ||
| 27 | 2.11.0 | ||
| 28 | |||
diff --git a/keyutils_1.5.10.bb b/keyutils_1.6.bb index a4222b9e99..1d7427da5f 100644 --- a/keyutils_1.5.10.bb +++ b/keyutils_1.6.bb | |||
| @@ -16,14 +16,13 @@ LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45 \ | |||
| 16 | inherit siteinfo ptest | 16 | inherit siteinfo ptest |
| 17 | 17 | ||
| 18 | SRC_URI = "http://people.redhat.com/dhowells/keyutils/${BP}.tar.bz2 \ | 18 | SRC_URI = "http://people.redhat.com/dhowells/keyutils/${BP}.tar.bz2 \ |
| 19 | file://keyutils-use-relative-path-for-link.patch \ | ||
| 20 | file://keyutils-test-fix-output-format.patch \ | 19 | file://keyutils-test-fix-output-format.patch \ |
| 21 | file://keyutils-fix-error-report-by-adding-default-message.patch \ | 20 | file://keyutils-fix-error-report-by-adding-default-message.patch \ |
| 22 | file://run-ptest \ | 21 | file://run-ptest \ |
| 23 | " | 22 | " |
| 24 | 23 | ||
| 25 | SRC_URI[md5sum] = "3771676319bc7b84b1549b5c63ff5243" | 24 | SRC_URI[md5sum] = "191987b0ab46bb5b50efd70a6e6ce808" |
| 26 | SRC_URI[sha256sum] = "115c3deae7f181778fd0e0ffaa2dad1bf1fe2f5677cf2e0e348cdb7a1c93afb6" | 25 | SRC_URI[sha256sum] = "d3aef20cec0005c0fa6b4be40079885567473185b1a57b629b030e67942c7115" |
| 27 | 26 | ||
| 28 | EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall' \ | 27 | EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} -Wall' \ |
| 29 | NO_ARLIB=1 \ | 28 | NO_ARLIB=1 \ |
