@@ -220,16 +220,16 @@ python copy_buildsystem () {
if os.path.exists(os.path.join(baseoutpath, relpath)):
conf_initpath = relpath
- relpath = os.path.join('layers', path, 'scripts', 'devtool')
+ relpath = os.path.join('layers', path, 'scripts', 'esdk-tools', 'devtool')
if os.path.exists(os.path.join(baseoutpath, relpath)):
- scriptrelpath = os.path.dirname(relpath)
+ esdk_tools_path = os.path.dirname(relpath)
relpath = os.path.join('layers', path, 'meta')
if os.path.exists(os.path.join(baseoutpath, relpath, 'lib', 'oe')):
core_meta_subdir = relpath
d.setVar('oe_init_build_env_path', conf_initpath)
- d.setVar('scriptrelpath', scriptrelpath)
+ d.setVar('esdk_tools_path', esdk_tools_path)
# Write out config file for devtool
import configparser
@@ -627,14 +627,6 @@ def get_sdk_required_utilities(buildtools_fn, d):
return ' '.join(sanity_required_utilities)
install_tools() {
- install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}
- scripts="devtool recipetool oe-find-native-sysroot runqemu* wic"
- for script in $scripts; do
- for scriptfn in `find ${SDK_OUTPUT}/${SDKPATH}/${scriptrelpath} -maxdepth 1 -executable -name "$script"`; do
- targetscriptfn="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/$(basename $scriptfn)"
- test -e ${targetscriptfn} || ln -rs ${scriptfn} ${targetscriptfn}
- done
- done
touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase
# find latest buildtools-tarball and install it
@@ -713,7 +705,7 @@ sdk_ext_postinst() {
# A bit of another hack, but we need this in the path only for devtool
# so put it at the end of $PATH.
- echo "export PATH=\"$target_sdk_dir/sysroots/${SDK_SYS}${bindir_nativesdk}:\$PATH\"" >> $env_setup_script
+ echo "export PATH=\"$target_sdk_dir/${esdk_tools_path}:\$PATH\"" >> $env_setup_script
echo "printf 'SDK environment now set up; additionally you may now run devtool to perform development tasks.\nRun devtool --help for further details.\n'" >> $env_setup_script
new file mode 120000
@@ -0,0 +1 @@
+../devtool
\ No newline at end of file
new file mode 120000
@@ -0,0 +1 @@
+../oe-find-native-sysroot
\ No newline at end of file
new file mode 120000
@@ -0,0 +1 @@
+../recipetool
\ No newline at end of file
new file mode 120000
@@ -0,0 +1 @@
+../runqemu
\ No newline at end of file
new file mode 120000
@@ -0,0 +1 @@
+../runqemu-addptable2image
\ No newline at end of file
new file mode 120000
@@ -0,0 +1 @@
+../runqemu-export-rootfs
\ No newline at end of file
new file mode 120000
@@ -0,0 +1 @@
+../runqemu-extract-sdk
\ No newline at end of file
new file mode 120000
@@ -0,0 +1 @@
+../runqemu-gen-tapdevs
\ No newline at end of file
new file mode 120000
@@ -0,0 +1 @@
+../runqemu-ifdown
\ No newline at end of file
new file mode 120000
@@ -0,0 +1 @@
+../runqemu-ifup
\ No newline at end of file
new file mode 120000
@@ -0,0 +1 @@
+../wic
\ No newline at end of file
This allows easier replication of esdk environment (which provides a curated, limited set of tools that for example does not include bitbake) in a standard yocto build. Switchover between various sets can be achieved via PATH manipulation. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- meta/classes-recipe/populate_sdk_ext.bbclass | 16 ++++------------ scripts/esdk-tools/devtool | 1 + scripts/esdk-tools/oe-find-native-sysroot | 1 + scripts/esdk-tools/recipetool | 1 + scripts/esdk-tools/runqemu | 1 + scripts/esdk-tools/runqemu-addptable2image | 1 + scripts/esdk-tools/runqemu-export-rootfs | 1 + scripts/esdk-tools/runqemu-extract-sdk | 1 + scripts/esdk-tools/runqemu-gen-tapdevs | 1 + scripts/esdk-tools/runqemu-ifdown | 1 + scripts/esdk-tools/runqemu-ifup | 1 + scripts/esdk-tools/wic | 1 + 12 files changed, 15 insertions(+), 12 deletions(-) create mode 120000 scripts/esdk-tools/devtool create mode 120000 scripts/esdk-tools/oe-find-native-sysroot create mode 120000 scripts/esdk-tools/recipetool create mode 120000 scripts/esdk-tools/runqemu create mode 120000 scripts/esdk-tools/runqemu-addptable2image create mode 120000 scripts/esdk-tools/runqemu-export-rootfs create mode 120000 scripts/esdk-tools/runqemu-extract-sdk create mode 120000 scripts/esdk-tools/runqemu-gen-tapdevs create mode 120000 scripts/esdk-tools/runqemu-ifdown create mode 120000 scripts/esdk-tools/runqemu-ifup create mode 120000 scripts/esdk-tools/wic