There is only one user of these include files, expand the files inside the one user and remove the includes.
Signed-off-by: Andrew Davis <[email protected]> --- .../devtools/ti-xdctools-common.inc | 70 ----------------- .../recipes-ti/devtools/ti-xdctools-core.inc | 5 -- .../recipes-ti/devtools/ti-xdctools.inc | 10 --- .../devtools/ti-xdctools_3.55.02.22.bb | 75 ++++++++++++++++++- 4 files changed, 74 insertions(+), 86 deletions(-) delete mode 100644 meta-ti-extras/recipes-ti/devtools/ti-xdctools-common.inc delete mode 100644 meta-ti-extras/recipes-ti/devtools/ti-xdctools-core.inc delete mode 100644 meta-ti-extras/recipes-ti/devtools/ti-xdctools.inc diff --git a/meta-ti-extras/recipes-ti/devtools/ti-xdctools-common.inc b/meta-ti-extras/recipes-ti/devtools/ti-xdctools-common.inc deleted file mode 100644 index 7051fccc..00000000 --- a/meta-ti-extras/recipes-ti/devtools/ti-xdctools-common.inc +++ /dev/null @@ -1,70 +0,0 @@ -DESCRIPTION = "TI XDCtools (RTSC - Real Time Software Components - http://rtsc.eclipse.org)" -HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc"; -SECTION = "devel" -LICENSE = "BSD-3-Clause & GPL-2.0-only" - -require recipes-ti/includes/ti-paths.inc -require recipes-ti/includes/ti-staging.inc - -do_install() { - CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" - - install -d ${D}${XDC_INSTALL_DIR_RECIPE} - cp ${CP_ARGS} ${S}/* ${D}${XDC_INSTALL_DIR_RECIPE} -} - -FILES:${PN}-dev = "${XDC_INSTALL_DIR_RECIPE}" - -BBCLASSEXTEND = "native nativesdk" - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_SYSROOT_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INSANE_SKIP:${PN}-dev = "libdir dev-elf arch file-rdeps" - -# Prevent internal libs from getting picked up -PRIVATE_LIBS = " \ -libncdb.so \ -libcdb.so \ -libjavaplugin_oji.so \ -libjavaplugin_jni.so \ -libjsound.so \ -libinstrument.so \ -libjawt.so \ -libzip.so \ -libjava_crw_demo.so \ -libjavaplugin_nscp_gcc29.so \ -libhprof.so \ -libcmm.so \ -libjdwp.so \ -libmlib_image.so \ -libjpeg.so \ -libverify.so \ -libjavaplugin_nscp.so \ -libmanagement.so \ -libunpack.so \ -librmi.so \ -libJdbcOdbc.so \ -libawt.so \ -libnet.so \ -libjaas_unix.so \ -libnio.so \ -libdcpr.so \ -libioser12.so \ -libjsoundalsa.so \ -libjava.so \ -libfontmanager.so \ -libdt_socket.so \ -libmawt.so \ -libjvm.so \ -libhpi.so \ -lib.so \ -libcairo.so.2 \ -libjli.so \ -libawt_xawt.so \ -" - -COMPATIBLE_HOST ?= "null" -COMPATIBLE_HOST:ti-soc = "(.*)" -COMPATIBLE_HOST:class-native = "(.*)" -COMPATIBLE_HOST:class-nativesdk = "(.*)" diff --git a/meta-ti-extras/recipes-ti/devtools/ti-xdctools-core.inc b/meta-ti-extras/recipes-ti/devtools/ti-xdctools-core.inc deleted file mode 100644 index 47f73b6d..00000000 --- a/meta-ti-extras/recipes-ti/devtools/ti-xdctools-core.inc +++ /dev/null @@ -1,5 +0,0 @@ -require ti-xdctools-common.inc - -S = "${WORKDIR}/xdctools_${PV}_core" - -SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/${PV}/exports/xdccore/xdctools_${PV}_core_linux.zip;name=xdczip"; diff --git a/meta-ti-extras/recipes-ti/devtools/ti-xdctools.inc b/meta-ti-extras/recipes-ti/devtools/ti-xdctools.inc deleted file mode 100644 index 1415f83e..00000000 --- a/meta-ti-extras/recipes-ti/devtools/ti-xdctools.inc +++ /dev/null @@ -1,10 +0,0 @@ -require ti-xdctools-common.inc -require ../includes/ti-eula-unpack.inc - -S = "${WORKDIR}/xdctools_${PV}" - -SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/${PV}/exports/xdctools_setuplinux_${PV}.bin;name=xdcbin"; - -BINFILE="xdctools_setuplinux_${PV}.bin" -TI_BIN_UNPK_CMDS="Y:workdir:Y" -TI_BIN_UNPK_WDEXT="/ti" diff --git a/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb b/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb index 6c3fdeb2..b1361804 100644 --- a/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb +++ b/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb @@ -1,4 +1,77 @@ -require recipes-ti/devtools/ti-xdctools-core.inc +DESCRIPTION = "TI XDCtools (RTSC - Real Time Software Components - http://rtsc.eclipse.org)" +HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc"; +SECTION = "devel" +LICENSE = "BSD-3-Clause & GPL-2.0-only" + +require recipes-ti/includes/ti-paths.inc +require recipes-ti/includes/ti-staging.inc + +do_install() { + CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" + + install -d ${D}${XDC_INSTALL_DIR_RECIPE} + cp ${CP_ARGS} ${S}/* ${D}${XDC_INSTALL_DIR_RECIPE} +} + +FILES:${PN}-dev = "${XDC_INSTALL_DIR_RECIPE}" + +BBCLASSEXTEND = "native nativesdk" + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INSANE_SKIP:${PN}-dev = "libdir dev-elf arch file-rdeps" + +# Prevent internal libs from getting picked up +PRIVATE_LIBS = " \ +libncdb.so \ +libcdb.so \ +libjavaplugin_oji.so \ +libjavaplugin_jni.so \ +libjsound.so \ +libinstrument.so \ +libjawt.so \ +libzip.so \ +libjava_crw_demo.so \ +libjavaplugin_nscp_gcc29.so \ +libhprof.so \ +libcmm.so \ +libjdwp.so \ +libmlib_image.so \ +libjpeg.so \ +libverify.so \ +libjavaplugin_nscp.so \ +libmanagement.so \ +libunpack.so \ +librmi.so \ +libJdbcOdbc.so \ +libawt.so \ +libnet.so \ +libjaas_unix.so \ +libnio.so \ +libdcpr.so \ +libioser12.so \ +libjsoundalsa.so \ +libjava.so \ +libfontmanager.so \ +libdt_socket.so \ +libmawt.so \ +libjvm.so \ +libhpi.so \ +lib.so \ +libcairo.so.2 \ +libjli.so \ +libawt_xawt.so \ +" + +COMPATIBLE_HOST ?= "null" +COMPATIBLE_HOST:ti-soc = "(.*)" +COMPATIBLE_HOST:class-native = "(.*)" +COMPATIBLE_HOST:class-nativesdk = "(.*)" + +S = "${WORKDIR}/xdctools_${PV}_core" + +SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/${PV}/exports/xdccore/xdctools_${PV}_core_linux.zip;name=xdczip"; PE = "1" PV = "3_55_02_22" -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16572): https://lists.yoctoproject.org/g/meta-ti/message/16572 Mute This Topic: https://lists.yoctoproject.org/mt/99069052/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
