mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 21:32:12 +02:00
staging: Use relative path in sysroot-destdir for target recipes
Original we used absolute path in sysroot-destdir for both native and target recipes. This commit changes target recipes to use relative path which is same as the image directory. [sgw: merged with libtool sysroot work] Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
This commit is contained in:
committed by
Richard Purdie
parent
b1025bd538
commit
bc9d2fbfd4
@@ -17,6 +17,9 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
|
||||
${EXTRA_OECONF_INTERMEDIATE} \
|
||||
${@get_gcc_fpu_setting(bb, d)}"
|
||||
|
||||
do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST} ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}"
|
||||
do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST} ${STAGING_DIR_TARGET}/${target_base_libdir}"
|
||||
|
||||
do_compile () {
|
||||
oe_runmake
|
||||
}
|
||||
|
||||
@@ -26,6 +26,6 @@ do_install () {
|
||||
SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess"
|
||||
|
||||
libtoolcross_sysroot_preprocess () {
|
||||
install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/
|
||||
install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool
|
||||
install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
|
||||
install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${bindir_crossscripts}/${HOST_SYS}-libtool
|
||||
}
|
||||
|
||||
@@ -21,6 +21,6 @@ do_install () {
|
||||
SYSROOT_PREPROCESS_FUNCS += "libtoolnativesdk_sysroot_preprocess"
|
||||
|
||||
libtoolnativesdk_sysroot_preprocess () {
|
||||
install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/
|
||||
install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool
|
||||
install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
|
||||
install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${bindir_crossscripts}/${HOST_SYS}-libtool
|
||||
}
|
||||
|
||||
@@ -8,8 +8,8 @@ PR = "r1"
|
||||
SYSROOT_PREPROCESS_FUNCS += "libtool_sysroot_preprocess"
|
||||
|
||||
libtool_sysroot_preprocess () {
|
||||
rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${bindir}/*
|
||||
rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/aclocal/*
|
||||
rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/libtool/config/*
|
||||
rm -rf ${SYSROOT_DESTDIR}${bindir}/*
|
||||
rm -rf ${SYSROOT_DESTDIR}${datadir}/aclocal/*
|
||||
rm -rf ${SYSROOT_DESTDIR}${datadir}/libtool/config/*
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user