| Message ID | 1399019186-19483-1-git-send-email-koen.kooi@linaro.org |
|---|---|
| State | New |
| Headers | show |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Wrong mailinglist, sorry. This is what happens when you run out of regular coffee and have a decaf in the morning! Koen Kooi schreef op 02-05-14 10:26: > Git.pm wasn't ending up in the package because do_install removed it with > a misleading comment about multilib. Workaround the problem so that > Git.pm ends up in the correct dir *and* doesn't get deleted. > > Signed-off-by: Koen Kooi <koen.kooi@linaro.org> --- > meta/recipes-devtools/git/git.inc | 7 ++++++- 1 file changed, 6 > insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-devtools/git/git.inc > b/meta/recipes-devtools/git/git.inc index 73e11eb..178b768 100644 --- > a/meta/recipes-devtools/git/git.inc +++ > b/meta/recipes-devtools/git/git.inc @@ -28,10 +28,14 @@ do_install () { > template_dir=${datadir}/git-core/templates \ > GIT_PYTHON_DIR=${D}${datadir}/git-core/python > > + cd ${B}/perl && oe_runmake install DESTDIR="${D}" bindir=${bindir} + # > ${libdir} is not applicable here, perl-native files are always # > installed to /usr/lib on both 32/64 bits targets. + # Fix up build paths > and point to target locations. + mv > ${D}${exec_prefix}/lib/perl-native/perl ${D}${exec_prefix}/lib/perl + sed > -i -e s:${D}::g ${D}${exec_prefix}/lib/perl/*/auto/Git/.packlist rm -rf > ${D}${exec_prefix}/lib/perl-native - rmdir ${D}${exec_prefix}/lib || > true } > > PERLSEDFIXUP = " \ @@ -75,6 +79,7 @@ PERLTOOLS = " \ PACKAGES =+ > "${PN}-perltools" FILES_${PN}-perltools += " \ ${PERLTOOLS} \ + > ${prefix}/lib/perl \ ${datadir}/perl \ " RDEPENDS_${PN}-perltools = > "${PN} perl perl-module-file-path liberror-perl findutils" > -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) Comment: GPGTools - http://gpgtools.org iD8DBQFTY1liMkyGM64RGpERAhjOAJ92r2TtyxOFLDc7sj8VVmpUiJzhOgCgthGJ EItT7lT4ZV5WAdjSxyO8Ttk= =oLc+ -----END PGP SIGNATURE-----
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 73e11eb..178b768 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -28,10 +28,14 @@ do_install () { template_dir=${datadir}/git-core/templates \ GIT_PYTHON_DIR=${D}${datadir}/git-core/python + cd ${B}/perl && oe_runmake install DESTDIR="${D}" bindir=${bindir} + # ${libdir} is not applicable here, perl-native files are always # installed to /usr/lib on both 32/64 bits targets. + # Fix up build paths and point to target locations. + mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${exec_prefix}/lib/perl + sed -i -e s:${D}::g ${D}${exec_prefix}/lib/perl/*/auto/Git/.packlist rm -rf ${D}${exec_prefix}/lib/perl-native - rmdir ${D}${exec_prefix}/lib || true } PERLSEDFIXUP = " \ @@ -75,6 +79,7 @@ PERLTOOLS = " \ PACKAGES =+ "${PN}-perltools" FILES_${PN}-perltools += " \ ${PERLTOOLS} \ + ${prefix}/lib/perl \ ${datadir}/perl \ " RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path liberror-perl findutils"
Git.pm wasn't ending up in the package because do_install removed it with a misleading comment about multilib. Workaround the problem so that Git.pm ends up in the correct dir *and* doesn't get deleted. Signed-off-by: Koen Kooi <koen.kooi@linaro.org> --- meta/recipes-devtools/git/git.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)