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>
This commit is contained in:
parent
551a996616
commit
80d6316574
|
@ -31,8 +31,8 @@ do_install () {
|
||||||
|
|
||||||
# ${libdir} is not applicable here, perl-native files are always
|
# ${libdir} is not applicable here, perl-native files are always
|
||||||
# installed to /usr/lib on both 32/64 bits targets.
|
# installed to /usr/lib on both 32/64 bits targets.
|
||||||
rm -rf ${D}/usr/lib/perl-native
|
rm -rf ${D}${exec_prefix}/lib/perl-native
|
||||||
rmdir ${D}/usr/lib || true
|
rmdir ${D}${exec_prefix}/lib || true
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install_append_class-native() {
|
do_install_append_class-native() {
|
||||||
|
@ -41,6 +41,12 @@ do_install_append_class-native() {
|
||||||
GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates
|
GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates
|
||||||
}
|
}
|
||||||
|
|
||||||
|
do_install_append_class-nativesdk() {
|
||||||
|
create_wrapper ${D}/${bindir}/git \
|
||||||
|
GIT_EXEC_PATH=${libexecdir}/git-core \
|
||||||
|
GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates
|
||||||
|
}
|
||||||
|
|
||||||
FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/"
|
FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/"
|
||||||
FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"
|
FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"
|
||||||
|
|
||||||
|
@ -78,4 +84,4 @@ PACKAGES =+ "gitweb"
|
||||||
FILES_gitweb = "${datadir}/gitweb/"
|
FILES_gitweb = "${datadir}/gitweb/"
|
||||||
|
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
|
@ -21,4 +21,4 @@ ALTERNATIVE_PRIORITY = "100"
|
||||||
# see diffutils.mk in buildroot)
|
# see diffutils.mk in buildroot)
|
||||||
EXTRA_OECONF_libc-uclibc = "--without-included-regex"
|
EXTRA_OECONF_libc-uclibc = "--without-included-regex"
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
|
@ -33,6 +33,10 @@ ALTERNATIVE_PRIORITY = "100"
|
||||||
|
|
||||||
ALTERNATIVE_${PN} = "tar"
|
ALTERNATIVE_${PN} = "tar"
|
||||||
ALTERNATIVE_${PN}-rmt = "rmt"
|
ALTERNATIVE_${PN}-rmt = "rmt"
|
||||||
|
ALTERNATIVE_${PN}_class-nativesdk = ""
|
||||||
|
ALTERNATIVE_${PN}-rmt_class-nativesdk = ""
|
||||||
|
|
||||||
ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar"
|
ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar"
|
||||||
ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt"
|
ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt"
|
||||||
|
|
||||||
|
BBCLASSEXTEND = "nativesdk"
|
||||||
|
|
Loading…
Reference in New Issue