diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-07 11:05:20 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-07 16:48:30 +0100 |
commit | 80d631657404669dbbf0ee88f68e5eb79a469bc6 (patch) | |
tree | 5f01504f02feca95665415d3016133ce48419fc0 /meta/recipes-devtools/git/git.inc | |
parent | 551a996616cd1cd37eb5ec4ba03b6b816e9b6e0e (diff) | |
download | poky-80d631657404669dbbf0ee88f68e5eb79a469bc6.tar.gz |
git/tar/findutils: Add nativesdk versions
We need to be able to generate a standalone tarball containing tar/git so
add nativesdk versions of the appropriate recipes to allow this to be possible.
Tweak the git perl paths to avoid warnings when building the nativesdk version,
ensure the binaries are wrapped correctly and avoid update-alternatives in
nativesdk-tar.
(From OE-Core rev: c91bb8c76e3bd45690e66f3de79cd3adfe45f600)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/git/git.inc')
-rw-r--r-- | meta/recipes-devtools/git/git.inc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 9829eec6ec..183a93cde6 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc | |||
@@ -31,8 +31,8 @@ do_install () { | |||
31 | 31 | ||
32 | # ${libdir} is not applicable here, perl-native files are always | 32 | # ${libdir} is not applicable here, perl-native files are always |
33 | # installed to /usr/lib on both 32/64 bits targets. | 33 | # installed to /usr/lib on both 32/64 bits targets. |
34 | rm -rf ${D}/usr/lib/perl-native | 34 | rm -rf ${D}${exec_prefix}/lib/perl-native |
35 | rmdir ${D}/usr/lib || true | 35 | rmdir ${D}${exec_prefix}/lib || true |
36 | } | 36 | } |
37 | 37 | ||
38 | do_install_append_class-native() { | 38 | do_install_append_class-native() { |
@@ -41,6 +41,12 @@ do_install_append_class-native() { | |||
41 | GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates | 41 | GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates |
42 | } | 42 | } |
43 | 43 | ||
44 | do_install_append_class-nativesdk() { | ||
45 | create_wrapper ${D}/${bindir}/git \ | ||
46 | GIT_EXEC_PATH=${libexecdir}/git-core \ | ||
47 | GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates | ||
48 | } | ||
49 | |||
44 | FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/" | 50 | FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/" |
45 | FILES_${PN}-dbg += "${libexecdir}/git-core/.debug" | 51 | FILES_${PN}-dbg += "${libexecdir}/git-core/.debug" |
46 | 52 | ||
@@ -78,4 +84,4 @@ PACKAGES =+ "gitweb" | |||
78 | FILES_gitweb = "${datadir}/gitweb/" | 84 | FILES_gitweb = "${datadir}/gitweb/" |
79 | 85 | ||
80 | 86 | ||
81 | BBCLASSEXTEND = "native" | 87 | BBCLASSEXTEND = "native nativesdk" |