diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-02 08:11:37 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-04 18:26:50 +0100 |
| commit | 6dff1bc80f4e398f5b045a8a75acedfd5f854637 (patch) | |
| tree | e3cb905d09d5168c34063a883f361e9d5b9b27f0 | |
| parent | d299444adcc02b9a40ba0651059d0ba283108231 (diff) | |
| download | poky-6dff1bc80f4e398f5b045a8a75acedfd5f854637.tar.gz | |
cross/crosssdl/native/nativesdk: Fix do_packagedata stamps
If you build nativesdk for machine A, then change to B you will see sstate
manifest warnings for the packagedata files. The stamps are machine
specific and should not be, ditto for native.
This patch copies the populate-sysroot extra stamp entries to avoid
these warnings.
(From OE-Core rev: a64de25d6006ec6dd777d8f3820a48244dfbf62b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/cross.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/crosssdk.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/native.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/nativesdk.bbclass | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index f6e7dc1b39..bd1448965c 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass | |||
| @@ -56,6 +56,7 @@ libexecdir = "${exec_prefix}/libexec/${CROSS_TARGET_SYS_DIR}" | |||
| 56 | 56 | ||
| 57 | do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}/" | 57 | do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}/" |
| 58 | do_populate_sysroot[stamp-extra-info] = "" | 58 | do_populate_sysroot[stamp-extra-info] = "" |
| 59 | do_packagedata[stamp-extra-info] = "" | ||
| 59 | 60 | ||
| 60 | python cross_virtclass_handler () { | 61 | python cross_virtclass_handler () { |
| 61 | classextend = e.data.getVar('BBCLASSEXTEND', True) or "" | 62 | classextend = e.data.getVar('BBCLASSEXTEND', True) or "" |
diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index bcc285bdbf..261a37465e 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass | |||
| @@ -27,6 +27,7 @@ target_exec_prefix = "${SDKPATHNATIVE}${prefix_nativesdk}" | |||
| 27 | baselib = "lib" | 27 | baselib = "lib" |
| 28 | 28 | ||
| 29 | do_populate_sysroot[stamp-extra-info] = "" | 29 | do_populate_sysroot[stamp-extra-info] = "" |
| 30 | do_packagedata[stamp-extra-info] = "" | ||
| 30 | 31 | ||
| 31 | # Need to force this to ensure consitency accross architectures | 32 | # Need to force this to ensure consitency accross architectures |
| 32 | EXTRA_OECONF_FPU = "" | 33 | EXTRA_OECONF_FPU = "" |
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 6704e66ba0..7c4e8c35c6 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass | |||
| @@ -157,6 +157,7 @@ do_package_write_ipk[noexec] = "1" | |||
| 157 | do_package_write_deb[noexec] = "1" | 157 | do_package_write_deb[noexec] = "1" |
| 158 | do_package_write_rpm[noexec] = "1" | 158 | do_package_write_rpm[noexec] = "1" |
| 159 | 159 | ||
| 160 | do_packagedata[stamp-extra-info] = "" | ||
| 160 | do_populate_sysroot[stamp-extra-info] = "" | 161 | do_populate_sysroot[stamp-extra-info] = "" |
| 161 | 162 | ||
| 162 | USE_NLS = "no" | 163 | USE_NLS = "no" |
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 26d1e4a3e5..ed276ef0a4 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass | |||
| @@ -87,5 +87,6 @@ addhandler nativesdk_virtclass_handler | |||
| 87 | nativesdk_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise" | 87 | nativesdk_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise" |
| 88 | 88 | ||
| 89 | do_populate_sysroot[stamp-extra-info] = "" | 89 | do_populate_sysroot[stamp-extra-info] = "" |
| 90 | do_packagedata[stamp-extra-info] = "" | ||
| 90 | 91 | ||
| 91 | USE_NLS = "${SDKUSE_NLS}" | 92 | USE_NLS = "${SDKUSE_NLS}" |
