summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-23 08:18:42 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-25 21:34:50 +0000
commit605f4d4c32e228ac7fd824bafdf71be7c4b09861 (patch)
tree71045ce4fa6f966ece3e5f2b1b517cc4d0286596
parentaa72758866ecb9335919bd888528b58a2b873156 (diff)
downloadpoky-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.py12
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"
255BUILD_OS = "linux" 255BUILD_OS = "linux"
256SDKMACHINE = "x86_64" 256SDKMACHINE = "x86_64"
257PACKAGE_CLASSES = "package_rpm package_ipk package_deb" 257PACKAGE_CLASSES = "package_rpm package_ipk package_deb"
258BB_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"
266BUILD_OS = "linux" 267BUILD_OS = "linux"
267SDKMACHINE = "i686" 268SDKMACHINE = "i686"
268PACKAGE_CLASSES = "package_rpm package_ipk package_deb" 269PACKAGE_CLASSES = "package_rpm package_ipk package_deb"
270BB_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"
298TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" 300TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\"
299TCLIBCAPPEND = \"\" 301TCLIBCAPPEND = \"\"
300NATIVELSBSTRING = \"DistroA\" 302NATIVELSBSTRING = \"DistroA\"
303BB_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\"
305TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" 308TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\"
306TCLIBCAPPEND = \"\" 309TCLIBCAPPEND = \"\"
307NATIVELSBSTRING = \"DistroB\" 310NATIVELSBSTRING = \"DistroB\"
311BB_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\"
332TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" 336TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\"
333TCLIBCAPPEND = \"\" 337TCLIBCAPPEND = \"\"
334MACHINE = \"qemux86-64\" 338MACHINE = \"qemux86-64\"
339BB_SIGNATURE_HANDLER = "OEBasicHash"
335""" 340"""
336 configB = """ 341 configB = """
337TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" 342TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\"
338TCLIBCAPPEND = \"\" 343TCLIBCAPPEND = \"\"
339MACHINE = \"qemuarm\" 344MACHINE = \"qemuarm\"
345BB_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\"
352require conf/multilib.conf 358require conf/multilib.conf
353MULTILIBS = \"multilib:lib32\" 359MULTILIBS = \"multilib:lib32\"
354DEFAULTTUNE_virtclass-multilib-lib32 = \"x86\" 360DEFAULTTUNE_virtclass-multilib-lib32 = \"x86\"
361BB_SIGNATURE_HANDLER = "OEBasicHash"
355""" 362"""
356 configB = """ 363 configB = """
357TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" 364TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\"
@@ -359,6 +366,7 @@ TCLIBCAPPEND = \"\"
359MACHINE = \"qemuarm\" 366MACHINE = \"qemuarm\"
360require conf/multilib.conf 367require conf/multilib.conf
361MULTILIBS = \"\" 368MULTILIBS = \"\"
369BB_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\"
404require conf/multilib.conf 412require conf/multilib.conf
405MULTILIBS = "multilib:lib32" 413MULTILIBS = "multilib:lib32"
406DEFAULTTUNE_virtclass-multilib-lib32 = "x86" 414DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
415BB_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\"
414require conf/multilib.conf 423require conf/multilib.conf
415MULTILIBS = "multilib:lib32" 424MULTILIBS = "multilib:lib32"
416DEFAULTTUNE_virtclass-multilib-lib32 = "x86" 425DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
426BB_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"
452DATE = "20161111" 462DATE = "20161111"
453INHERIT_remove = "buildstats-summary buildhistory uninative" 463INHERIT_remove = "buildstats-summary buildhistory uninative"
454http_proxy = "" 464http_proxy = ""
465BB_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"
468INHERIT_remove = "uninative" 479INHERIT_remove = "uninative"
469INHERIT += "buildstats-summary buildhistory" 480INHERIT += "buildstats-summary buildhistory"
470http_proxy = "http://example.com/" 481http_proxy = "http://example.com/"
482BB_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")