mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-08 17:39:24 +00:00
Code Issues Projects Releases Wiki Activity

libhugetlbfs: install perl lib to directory perl instead of perl5

Browse Source 
*libhugetlbfs depends on perl, and perl installs a directory 'perl'
    and make a symlink 'perl5' to it. So just install perl libs in
    libhugetlbfs to directory 'perl' instead of 'perl5'. This can avoid
    the following error:
    | CalledProcessError: Command 'tar -cf - -C .../perl/5.14.3-r1/sysroot-destdir
    | -ps . | tar -xf - -C .../tmp/sysroots/t4240qds'
    | returned non-zero exit status 2 with output
    | tar: ./usr/lib/perl5: Cannot create symlink to `perl': File exists
    | tar: Exiting with failure status due to previous errors

Signed-off-by: Chunrong Guo <B40290@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Chunrong Guo
2013-10-12 09:19:53 +00:00
committed by Martin Jansa
parent 0e2a691f78
commit f8903f53db
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-benchmark/libhugetlbfs/files/0001-install-perl-lib-to-directory-perl-instead-of-perl5.patch
+39
View File
@@ -0,0 +1,39 @@
Upstream-Status: Inappropriate [oe-core specific]
libhugetlbfs depends on perl, and perl installs a directory 'perl'
and make a symlink 'perl5' to it. So just install perl libs in
libhugetlbfs to directory 'perl' instead of 'perl5'. This can avoid
the following error:
| CalledProcessError: Command 'tar -cf - -C .../perl/5.14.3-r1/sysroot-destdir
| -ps . | tar -xf - -C .../tmp/sysroots/t4240qds'
| returned non-zero exit status 2 with output
| tar: ./usr/lib/perl5: Cannot create symlink to `perl': File exists
| tar: Exiting with failure status due to previous errors
Signed-off-by: Ting Liu <b28495@freescale.com>
--- a/Makefileold 2013-10-11 23:07:31.759421318 -0500
+++ b/Makefile 2013-10-11 23:08:01.935571122 -0500
@@ -173,17 +173,17 @@
DOCDIR = $(PREFIX)/share/doc/libhugetlbfs
ifdef CC32
-PMDIR = $(PREFIX)/lib/perl5/TLBC
+PMDIR = $(PREFIX)/lib/perl/TLBC
endif
ifdef CC64
ifeq ($(ARCH),x86_64)
-PMDIR = $(PREFIX)/lib/perl5/TLBC
+PMDIR = $(PREFIX)/lib/perl/TLBC
else
ifeq ($(ARCH),aarch64)
-PMDIR = $(PREFIX)/lib/perl5/TLBC
+PMDIR = $(PREFIX)/lib/perl/TLBC
else
-PMDIR = $(PREFIX)/lib64/perl5/TLBC
+PMDIR = $(PREFIX)/lib64/perl/TLBC
endif
endif
endif
meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+2 -2
View File
@@ -15,6 +15,7 @@ SRC_URI = "git://git.code.sf.net/p/libhugetlbfs/code \
file://fix-lib64-can-not-be-shiped-in-64bit-target.patch \ file://fix-lib64-can-not-be-shiped-in-64bit-target.patch \
file://tests-Makefile-install-static-4G-edge-testcases.patch \ file://tests-Makefile-install-static-4G-edge-testcases.patch \
file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \ file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \
file://0001-install-perl-lib-to-directory-perl-instead-of-perl5.patch \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
@@ -43,10 +44,9 @@ do_install() {
PARALLEL_MAKE_pn-${PN} = "" PARALLEL_MAKE_pn-${PN} = ""
PACKAGES =+ "${PN}-perl ${PN}-tests ${PN}-perl5" PACKAGES =+ "${PN}-perl ${PN}-tests "
FILES_${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug ${libdir}/libhugetlbfs/tests/obj64/.debug" FILES_${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug ${libdir}/libhugetlbfs/tests/obj64/.debug"
FILES_${PN}-perl = "${libdir}/perl" FILES_${PN}-perl = "${libdir}/perl"
FILES_${PN}-perl5 = "${libdir}/perl5 "
FILES_${PN}-tests += "/opt/libhugetlbfs/tests" FILES_${PN}-tests += "/opt/libhugetlbfs/tests"
INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1"