diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-23 08:18:42 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-25 21:34:50 +0000 |
commit | 605f4d4c32e228ac7fd824bafdf71be7c4b09861 (patch) | |
tree | 71045ce4fa6f966ece3e5f2b1b517cc4d0286596 | |
parent | aa72758866ecb9335919bd888528b58a2b873156 (diff) | |
download | poky-605f4d4c32e228ac7fd824bafdf71be7c4b09861.tar.gz |
oeqa/selftest/sstatetests: Ensure we don't use hashequiv for sstatesigs tests
(From OE-Core rev: 7f424c32589b94192842f52235c064cb8c19288e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oeqa/selftest/cases/sstatetests.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index 2867cb78ab..6757a0ec68 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py | |||
@@ -255,6 +255,7 @@ BUILD_ARCH = "x86_64" | |||
255 | BUILD_OS = "linux" | 255 | BUILD_OS = "linux" |
256 | SDKMACHINE = "x86_64" | 256 | SDKMACHINE = "x86_64" |
257 | PACKAGE_CLASSES = "package_rpm package_ipk package_deb" | 257 | PACKAGE_CLASSES = "package_rpm package_ipk package_deb" |
258 | BB_SIGNATURE_HANDLER = "OEBasicHash" | ||
258 | """) | 259 | """) |
259 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") | 260 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") |
260 | bitbake("core-image-sato -S none") | 261 | bitbake("core-image-sato -S none") |
@@ -266,6 +267,7 @@ BUILD_ARCH = "i686" | |||
266 | BUILD_OS = "linux" | 267 | BUILD_OS = "linux" |
267 | SDKMACHINE = "i686" | 268 | SDKMACHINE = "i686" |
268 | PACKAGE_CLASSES = "package_rpm package_ipk package_deb" | 269 | PACKAGE_CLASSES = "package_rpm package_ipk package_deb" |
270 | BB_SIGNATURE_HANDLER = "OEBasicHash" | ||
269 | """) | 271 | """) |
270 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") | 272 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") |
271 | bitbake("core-image-sato -S none") | 273 | bitbake("core-image-sato -S none") |
@@ -298,6 +300,7 @@ PACKAGE_CLASSES = "package_rpm package_ipk package_deb" | |||
298 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" | 300 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" |
299 | TCLIBCAPPEND = \"\" | 301 | TCLIBCAPPEND = \"\" |
300 | NATIVELSBSTRING = \"DistroA\" | 302 | NATIVELSBSTRING = \"DistroA\" |
303 | BB_SIGNATURE_HANDLER = "OEBasicHash" | ||
301 | """) | 304 | """) |
302 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") | 305 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") |
303 | bitbake("core-image-sato -S none") | 306 | bitbake("core-image-sato -S none") |
@@ -305,6 +308,7 @@ NATIVELSBSTRING = \"DistroA\" | |||
305 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" | 308 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" |
306 | TCLIBCAPPEND = \"\" | 309 | TCLIBCAPPEND = \"\" |
307 | NATIVELSBSTRING = \"DistroB\" | 310 | NATIVELSBSTRING = \"DistroB\" |
311 | BB_SIGNATURE_HANDLER = "OEBasicHash" | ||
308 | """) | 312 | """) |
309 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") | 313 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") |
310 | bitbake("core-image-sato -S none") | 314 | bitbake("core-image-sato -S none") |
@@ -332,11 +336,13 @@ NATIVELSBSTRING = \"DistroB\" | |||
332 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" | 336 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" |
333 | TCLIBCAPPEND = \"\" | 337 | TCLIBCAPPEND = \"\" |
334 | MACHINE = \"qemux86-64\" | 338 | MACHINE = \"qemux86-64\" |
339 | BB_SIGNATURE_HANDLER = "OEBasicHash" | ||
335 | """ | 340 | """ |
336 | configB = """ | 341 | configB = """ |
337 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" | 342 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" |
338 | TCLIBCAPPEND = \"\" | 343 | TCLIBCAPPEND = \"\" |
339 | MACHINE = \"qemuarm\" | 344 | MACHINE = \"qemuarm\" |
345 | BB_SIGNATURE_HANDLER = "OEBasicHash" | ||
340 | """ | 346 | """ |
341 | self.sstate_allarch_samesigs(configA, configB) | 347 | self.sstate_allarch_samesigs(configA, configB) |
342 | 348 | ||
@@ -352,6 +358,7 @@ MACHINE = \"qemux86-64\" | |||
352 | require conf/multilib.conf | 358 | require conf/multilib.conf |
353 | MULTILIBS = \"multilib:lib32\" | 359 | MULTILIBS = \"multilib:lib32\" |
354 | DEFAULTTUNE_virtclass-multilib-lib32 = \"x86\" | 360 | DEFAULTTUNE_virtclass-multilib-lib32 = \"x86\" |
361 | BB_SIGNATURE_HANDLER = "OEBasicHash" | ||
355 | """ | 362 | """ |
356 | configB = """ | 363 | configB = """ |
357 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" | 364 | TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" |
@@ -359,6 +366,7 @@ TCLIBCAPPEND = \"\" | |||
359 | MACHINE = \"qemuarm\" | 366 | MACHINE = \"qemuarm\" |
360 | require conf/multilib.conf | 367 | require conf/multilib.conf |
361 | MULTILIBS = \"\" | 368 | MULTILIBS = \"\" |
369 | BB_SIGNATURE_HANDLER = "OEBasicHash" | ||
362 | """ | 370 | """ |
363 | self.sstate_allarch_samesigs(configA, configB) | 371 | self.sstate_allarch_samesigs(configA, configB) |
364 | 372 | ||
@@ -404,6 +412,7 @@ MACHINE = \"qemux86\" | |||
404 | require conf/multilib.conf | 412 | require conf/multilib.conf |
405 | MULTILIBS = "multilib:lib32" | 413 | MULTILIBS = "multilib:lib32" |
406 | DEFAULTTUNE_virtclass-multilib-lib32 = "x86" | 414 | DEFAULTTUNE_virtclass-multilib-lib32 = "x86" |
415 | BB_SIGNATURE_HANDLER = "OEBasicHash" | ||
407 | """) | 416 | """) |
408 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") | 417 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") |
409 | bitbake("world meta-toolchain -S none") | 418 | bitbake("world meta-toolchain -S none") |
@@ -414,6 +423,7 @@ MACHINE = \"qemux86copy\" | |||
414 | require conf/multilib.conf | 423 | require conf/multilib.conf |
415 | MULTILIBS = "multilib:lib32" | 424 | MULTILIBS = "multilib:lib32" |
416 | DEFAULTTUNE_virtclass-multilib-lib32 = "x86" | 425 | DEFAULTTUNE_virtclass-multilib-lib32 = "x86" |
426 | BB_SIGNATURE_HANDLER = "OEBasicHash" | ||
417 | """) | 427 | """) |
418 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") | 428 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") |
419 | bitbake("world meta-toolchain -S none") | 429 | bitbake("world meta-toolchain -S none") |
@@ -452,6 +462,7 @@ TIME = "111111" | |||
452 | DATE = "20161111" | 462 | DATE = "20161111" |
453 | INHERIT_remove = "buildstats-summary buildhistory uninative" | 463 | INHERIT_remove = "buildstats-summary buildhistory uninative" |
454 | http_proxy = "" | 464 | http_proxy = "" |
465 | BB_SIGNATURE_HANDLER = "OEBasicHash" | ||
455 | """) | 466 | """) |
456 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") | 467 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") |
457 | self.track_for_cleanup(self.topdir + "/download1") | 468 | self.track_for_cleanup(self.topdir + "/download1") |
@@ -468,6 +479,7 @@ DATE = "20161212" | |||
468 | INHERIT_remove = "uninative" | 479 | INHERIT_remove = "uninative" |
469 | INHERIT += "buildstats-summary buildhistory" | 480 | INHERIT += "buildstats-summary buildhistory" |
470 | http_proxy = "http://example.com/" | 481 | http_proxy = "http://example.com/" |
482 | BB_SIGNATURE_HANDLER = "OEBasicHash" | ||
471 | """) | 483 | """) |
472 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") | 484 | self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") |
473 | self.track_for_cleanup(self.topdir + "/download2") | 485 | self.track_for_cleanup(self.topdir + "/download2") |