summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2024-09-04 11:26:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-09-05 21:50:10 +0100
commitbd102d1275c2fbafe454cb86af03a3a7193308a4 (patch)
tree5010d57d7a209905f705c6c81096a059603c9707 /meta/lib/oeqa
parent1948bdf63908e869d85d07d69e5dc24cf78603b9 (diff)
downloadpoky-bd102d1275c2fbafe454cb86af03a3a7193308a4.tar.gz
conf/defaultsetup.conf: Drop TCLIBCAPPEND
We've been able to run musl and glibc builds in the same TMPDIR for many years and a separate directory is not required. Most distros disable this value for that reason. Drop support for the variable to make it clear and easy for distros to be able to set multiconfigs which behave consistently for distros which do and don't clear it by dropping it entirely. (From OE-Core rev: ebcd355a32e2711263e22d9b45b502696ecbb4d2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/selftest/cases/sstatetests.py15
1 files changed, 0 insertions, 15 deletions
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py
index 49d650bac7..ae295bef5f 100644
--- a/meta/lib/oeqa/selftest/cases/sstatetests.py
+++ b/meta/lib/oeqa/selftest/cases/sstatetests.py
@@ -378,7 +378,6 @@ class SStateHashSameSigs(SStateBase):
378 self.write_config(""" 378 self.write_config("""
379MACHINE = "qemux86" 379MACHINE = "qemux86"
380TMPDIR = "${TOPDIR}/tmp-sstatesamehash" 380TMPDIR = "${TOPDIR}/tmp-sstatesamehash"
381TCLIBCAPPEND = ""
382BUILD_ARCH = "x86_64" 381BUILD_ARCH = "x86_64"
383BUILD_OS = "linux" 382BUILD_OS = "linux"
384SDKMACHINE = "x86_64" 383SDKMACHINE = "x86_64"
@@ -390,7 +389,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash"
390 self.write_config(""" 389 self.write_config("""
391MACHINE = "qemux86" 390MACHINE = "qemux86"
392TMPDIR = "${TOPDIR}/tmp-sstatesamehash2" 391TMPDIR = "${TOPDIR}/tmp-sstatesamehash2"
393TCLIBCAPPEND = ""
394BUILD_ARCH = "i686" 392BUILD_ARCH = "i686"
395BUILD_OS = "linux" 393BUILD_OS = "linux"
396SDKMACHINE = "i686" 394SDKMACHINE = "i686"
@@ -426,7 +424,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash"
426 424
427 self.write_config(""" 425 self.write_config("""
428TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" 426TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\"
429TCLIBCAPPEND = \"\"
430NATIVELSBSTRING = \"DistroA\" 427NATIVELSBSTRING = \"DistroA\"
431BB_SIGNATURE_HANDLER = "OEBasicHash" 428BB_SIGNATURE_HANDLER = "OEBasicHash"
432""") 429""")
@@ -434,7 +431,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash"
434 bitbake("core-image-weston -S none") 431 bitbake("core-image-weston -S none")
435 self.write_config(""" 432 self.write_config("""
436TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" 433TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\"
437TCLIBCAPPEND = \"\"
438NATIVELSBSTRING = \"DistroB\" 434NATIVELSBSTRING = \"DistroB\"
439BB_SIGNATURE_HANDLER = "OEBasicHash" 435BB_SIGNATURE_HANDLER = "OEBasicHash"
440""") 436""")
@@ -463,14 +459,12 @@ class SStateHashSameSigs2(SStateBase):
463 459
464 configA = """ 460 configA = """
465TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" 461TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\"
466TCLIBCAPPEND = \"\"
467MACHINE = \"qemux86-64\" 462MACHINE = \"qemux86-64\"
468BB_SIGNATURE_HANDLER = "OEBasicHash" 463BB_SIGNATURE_HANDLER = "OEBasicHash"
469""" 464"""
470 #OLDEST_KERNEL is arch specific so set to a different value here for testing 465 #OLDEST_KERNEL is arch specific so set to a different value here for testing
471 configB = """ 466 configB = """
472TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" 467TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\"
473TCLIBCAPPEND = \"\"
474MACHINE = \"qemuarm\" 468MACHINE = \"qemuarm\"
475OLDEST_KERNEL = \"3.3.0\" 469OLDEST_KERNEL = \"3.3.0\"
476BB_SIGNATURE_HANDLER = "OEBasicHash" 470BB_SIGNATURE_HANDLER = "OEBasicHash"
@@ -486,7 +480,6 @@ WARN_QA:append = " someotheroption"
486 480
487 configA = """ 481 configA = """
488TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" 482TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\"
489TCLIBCAPPEND = \"\"
490MACHINE = \"qemux86-64\" 483MACHINE = \"qemux86-64\"
491require conf/multilib.conf 484require conf/multilib.conf
492MULTILIBS = \"multilib:lib32\" 485MULTILIBS = \"multilib:lib32\"
@@ -495,7 +488,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash"
495""" 488"""
496 configB = """ 489 configB = """
497TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" 490TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\"
498TCLIBCAPPEND = \"\"
499MACHINE = \"qemuarm\" 491MACHINE = \"qemuarm\"
500require conf/multilib.conf 492require conf/multilib.conf
501MULTILIBS = \"\" 493MULTILIBS = \"\"
@@ -513,7 +505,6 @@ class SStateHashSameSigs3(SStateBase):
513 505
514 self.write_config(""" 506 self.write_config("""
515TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" 507TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\"
516TCLIBCAPPEND = \"\"
517MACHINE = \"qemux86\" 508MACHINE = \"qemux86\"
518require conf/multilib.conf 509require conf/multilib.conf
519MULTILIBS = "multilib:lib32" 510MULTILIBS = "multilib:lib32"
@@ -524,7 +515,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash"
524 bitbake("world meta-toolchain -S none") 515 bitbake("world meta-toolchain -S none")
525 self.write_config(""" 516 self.write_config("""
526TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" 517TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\"
527TCLIBCAPPEND = \"\"
528MACHINE = \"qemux86copy\" 518MACHINE = \"qemux86copy\"
529require conf/multilib.conf 519require conf/multilib.conf
530MULTILIBS = "multilib:lib32" 520MULTILIBS = "multilib:lib32"
@@ -561,7 +551,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash"
561 551
562 self.write_config(""" 552 self.write_config("""
563TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\" 553TMPDIR = \"${TOPDIR}/tmp-sstatesamehash\"
564TCLIBCAPPEND = \"\"
565MACHINE = \"qemux86\" 554MACHINE = \"qemux86\"
566require conf/multilib.conf 555require conf/multilib.conf
567MULTILIBS = "multilib:lib32" 556MULTILIBS = "multilib:lib32"
@@ -572,7 +561,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash"
572 bitbake("binutils-native -S none") 561 bitbake("binutils-native -S none")
573 self.write_config(""" 562 self.write_config("""
574TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\" 563TMPDIR = \"${TOPDIR}/tmp-sstatesamehash2\"
575TCLIBCAPPEND = \"\"
576MACHINE = \"qemux86copy\" 564MACHINE = \"qemux86copy\"
577BB_SIGNATURE_HANDLER = "OEBasicHash" 565BB_SIGNATURE_HANDLER = "OEBasicHash"
578""") 566""")
@@ -600,7 +588,6 @@ class SStateHashSameSigs4(SStateBase):
600 588
601 self.write_config(""" 589 self.write_config("""
602TMPDIR = "${TOPDIR}/tmp-sstatesamehash" 590TMPDIR = "${TOPDIR}/tmp-sstatesamehash"
603TCLIBCAPPEND = ""
604BB_NUMBER_THREADS = "${@oe.utils.cpu_count()}" 591BB_NUMBER_THREADS = "${@oe.utils.cpu_count()}"
605PARALLEL_MAKE = "-j 1" 592PARALLEL_MAKE = "-j 1"
606DL_DIR = "${TOPDIR}/download1" 593DL_DIR = "${TOPDIR}/download1"
@@ -615,7 +602,6 @@ BB_SIGNATURE_HANDLER = "OEBasicHash"
615 bitbake("world meta-toolchain -S none") 602 bitbake("world meta-toolchain -S none")
616 self.write_config(""" 603 self.write_config("""
617TMPDIR = "${TOPDIR}/tmp-sstatesamehash2" 604TMPDIR = "${TOPDIR}/tmp-sstatesamehash2"
618TCLIBCAPPEND = ""
619BB_NUMBER_THREADS = "${@oe.utils.cpu_count()+1}" 605BB_NUMBER_THREADS = "${@oe.utils.cpu_count()+1}"
620PARALLEL_MAKE = "-j 2" 606PARALLEL_MAKE = "-j 2"
621DL_DIR = "${TOPDIR}/download2" 607DL_DIR = "${TOPDIR}/download2"
@@ -726,7 +712,6 @@ class SStateFindSiginfo(SStateBase):
726 """ 712 """
727 self.write_config(""" 713 self.write_config("""
728TMPDIR = \"${TOPDIR}/tmp-sstates-findsiginfo\" 714TMPDIR = \"${TOPDIR}/tmp-sstates-findsiginfo\"
729TCLIBCAPPEND = \"\"
730MACHINE = \"qemux86-64\" 715MACHINE = \"qemux86-64\"
731require conf/multilib.conf 716require conf/multilib.conf
732MULTILIBS = "multilib:lib32" 717MULTILIBS = "multilib:lib32"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-22 06:39:05 +0000