diff options
Diffstat (limited to 'meta/recipes-core/meta')
-rw-r--r-- | meta/recipes-core/meta/build-sysroots.bb | 38 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-environment-extsdk.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-extsdk-toolchain.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-world-pkgdata.bb | 2 |
4 files changed, 42 insertions, 4 deletions
diff --git a/meta/recipes-core/meta/build-sysroots.bb b/meta/recipes-core/meta/build-sysroots.bb new file mode 100644 index 0000000000..7a712e2f38 --- /dev/null +++ b/meta/recipes-core/meta/build-sysroots.bb | |||
@@ -0,0 +1,38 @@ | |||
1 | INHIBIT_DEFAULT_DEPS = "1" | ||
2 | LICENSE = "MIT" | ||
3 | |||
4 | STANDALONE_SYSROOT = "${STAGING_DIR}/${MACHINE}" | ||
5 | STANDALONE_SYSROOT_NATIVE = "${STAGING_DIR}/${BUILD_ARCH}" | ||
6 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
7 | EXCLUDE_FROM_WORLD = "1" | ||
8 | |||
9 | inherit nopackages | ||
10 | deltask fetch | ||
11 | deltask unpack | ||
12 | deltask patch | ||
13 | deltask prepare_recipe_sysroot | ||
14 | deltask populate_lic | ||
15 | deltask configure | ||
16 | deltask compile | ||
17 | deltask install | ||
18 | deltask populate_sysroot | ||
19 | |||
20 | python do_build_native_sysroot () { | ||
21 | targetsysroot = d.getVar("STANDALONE_SYSROOT") | ||
22 | nativesysroot = d.getVar("STANDALONE_SYSROOT_NATIVE") | ||
23 | staging_populate_sysroot_dir(targetsysroot, nativesysroot, True, d) | ||
24 | } | ||
25 | do_build_native_sysroot[cleandirs] = "${STANDALONE_SYSROOT_NATIVE}" | ||
26 | do_build_native_sysroot[nostamp] = "1" | ||
27 | addtask do_build_native_sysroot before do_build | ||
28 | |||
29 | python do_build_target_sysroot () { | ||
30 | targetsysroot = d.getVar("STANDALONE_SYSROOT") | ||
31 | nativesysroot = d.getVar("STANDALONE_SYSROOT_NATIVE") | ||
32 | staging_populate_sysroot_dir(targetsysroot, nativesysroot, False, d) | ||
33 | } | ||
34 | do_build_target_sysroot[cleandirs] = "${STANDALONE_SYSROOT}" | ||
35 | do_build_target_sysroot[nostamp] = "1" | ||
36 | addtask do_build_target_sysroot before do_build | ||
37 | |||
38 | do_clean[cleandirs] += "${STANDALONE_SYSROOT} ${STANDALONE_SYSROOT_NATIVE}" | ||
diff --git a/meta/recipes-core/meta/meta-environment-extsdk.bb b/meta/recipes-core/meta/meta-environment-extsdk.bb index 757afc154f..2076b56f25 100644 --- a/meta/recipes-core/meta/meta-environment-extsdk.bb +++ b/meta/recipes-core/meta/meta-environment-extsdk.bb | |||
@@ -5,8 +5,8 @@ require meta-environment.bb | |||
5 | PN = "meta-environment-extsdk-${MACHINE}" | 5 | PN = "meta-environment-extsdk-${MACHINE}" |
6 | 6 | ||
7 | create_sdk_files_append() { | 7 | create_sdk_files_append() { |
8 | local sysroot=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR_TARGET'), d.getVar('TMPDIR'))} | 8 | local sysroot=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${MACHINE} |
9 | local sdkpathnative=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR_NATIVE'), d.getVar('TMPDIR'))} | 9 | local sdkpathnative=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${BUILD_ARCH} |
10 | 10 | ||
11 | toolchain_create_sdk_env_script '' '' $sysroot '' ${bindir_native} ${prefix_native} $sdkpathnative | 11 | toolchain_create_sdk_env_script '' '' $sysroot '' ${bindir_native} ${prefix_native} $sdkpathnative |
12 | } | 12 | } |
diff --git a/meta/recipes-core/meta/meta-extsdk-toolchain.bb b/meta/recipes-core/meta/meta-extsdk-toolchain.bb index fc6d6de99a..0b8fcf08dc 100644 --- a/meta/recipes-core/meta/meta-extsdk-toolchain.bb +++ b/meta/recipes-core/meta/meta-extsdk-toolchain.bb | |||
@@ -15,7 +15,7 @@ LOCKED_SIGS_INDIR = "${D}/locked-sigs" | |||
15 | addtask do_locked_sigs after do_populate_sysroot | 15 | addtask do_locked_sigs after do_populate_sysroot |
16 | SSTATETASKS += "do_locked_sigs" | 16 | SSTATETASKS += "do_locked_sigs" |
17 | do_locked_sigs[sstate-inputdirs] = "${LOCKED_SIGS_INDIR}" | 17 | do_locked_sigs[sstate-inputdirs] = "${LOCKED_SIGS_INDIR}" |
18 | do_locked_sigs[sstate-outputdirs] = "${STAGING_DIR_HOST}/locked-sigs" | 18 | do_locked_sigs[sstate-outputdirs] = "${STAGING_DIR}/${PACKAGE_ARCH}/${PN}/locked-sigs" |
19 | 19 | ||
20 | python do_locked_sigs() { | 20 | python do_locked_sigs() { |
21 | import oe.copy_buildsystem | 21 | import oe.copy_buildsystem |
diff --git a/meta/recipes-core/meta/meta-world-pkgdata.bb b/meta/recipes-core/meta/meta-world-pkgdata.bb index 0ce378ea2b..617f96a33e 100644 --- a/meta/recipes-core/meta/meta-world-pkgdata.bb +++ b/meta/recipes-core/meta/meta-world-pkgdata.bb | |||
@@ -32,7 +32,7 @@ do_configure[noexec] = "1" | |||
32 | do_compile[noexec] = "1" | 32 | do_compile[noexec] = "1" |
33 | do_install[noexec] = "1" | 33 | do_install[noexec] = "1" |
34 | 34 | ||
35 | do_configure[deptask] = "" | 35 | do_prepare_recipe_sysroot[deptask] = "" |
36 | 36 | ||
37 | WORLD_PKGDATA_EXCLUDE ?= "" | 37 | WORLD_PKGDATA_EXCLUDE ?= "" |
38 | 38 | ||