summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-30 13:47:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commit2d7cf6c056691b6de81bdbb029225d7e0e16f37b (patch)
tree3c3c0abaa8c1e40946b445de659d4fd339d335de /bitbake
parent2abf8a699edd513405befbd1a0eafc8f55d6b514 (diff)
downloadpoky-2d7cf6c056691b6de81bdbb029225d7e0e16f37b.tar.gz
bitbake: doc/lib: Update to use new override syntax containing colons
This runs the overrides conversion script in OE-Core over the bitbake code base including the docs. A handful of things were excluded in toaster and for the Changelog file. (Bitbake rev: 47f8d3b24fd52381bf3b41e2f55a53e57841344c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/contrib/vim/plugin/newbbappend.vim2
-rw-r--r--bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst64
-rw-r--r--bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst14
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py2
-rw-r--r--bitbake/lib/bb/tests/data.py52
-rw-r--r--bitbake/lib/bb/tests/parse.py16
-rw-r--r--bitbake/lib/toaster/orm/models.py2
-rw-r--r--bitbake/lib/toaster/toastergui/views.py6
-rw-r--r--bitbake/lib/toaster/toastermain/management/commands/buildimport.py2
9 files changed, 80 insertions, 80 deletions
diff --git a/bitbake/contrib/vim/plugin/newbbappend.vim b/bitbake/contrib/vim/plugin/newbbappend.vim
index e04174cf62..3f65f79cdc 100644
--- a/bitbake/contrib/vim/plugin/newbbappend.vim
+++ b/bitbake/contrib/vim/plugin/newbbappend.vim
@@ -20,7 +20,7 @@ fun! NewBBAppendTemplate()
20 set nopaste 20 set nopaste
21 21
22 " New bbappend template 22 " New bbappend template
23 0 put ='FILESEXTRAPATHS_prepend := \"${THISDIR}/${PN}:\"' 23 0 put ='FILESEXTRAPATHS:prepend := \"${THISDIR}/${PN}:\"'
24 2 24 2
25 25
26 if paste == 1 26 if paste == 1
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst
index 3e14163ebe..db44e26fbd 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst
@@ -281,11 +281,11 @@ operators in that their effects are applied at variable expansion time
281rather than being immediately applied. Here are some examples:: 281rather than being immediately applied. Here are some examples::
282 282
283 B = "bval" 283 B = "bval"
284 B_append = " additional data" 284 B:append = " additional data"
285 C = "cval" 285 C = "cval"
286 C_prepend = "additional data " 286 C:prepend = "additional data "
287 D = "dval" 287 D = "dval"
288 D_append = "additional data" 288 D:append = "additional data"
289 289
290The variable :term:`B` 290The variable :term:`B`
291becomes "bval additional data" and ``C`` becomes "additional data cval". 291becomes "bval additional data" and ``C`` becomes "additional data cval".
@@ -312,10 +312,10 @@ When you use this syntax, BitBake expects one or more strings.
312Surrounding spaces and spacing are preserved. Here is an example:: 312Surrounding spaces and spacing are preserved. Here is an example::
313 313
314 FOO = "123 456 789 123456 123 456 123 456" 314 FOO = "123 456 789 123456 123 456 123 456"
315 FOO_remove = "123" 315 FOO:remove = "123"
316 FOO_remove = "456" 316 FOO:remove = "456"
317 FOO2 = " abc def ghi abcdef abc def abc def def" 317 FOO2 = " abc def ghi abcdef abc def abc def def"
318 FOO2_remove = "\ 318 FOO2:remove = "\
319 def \ 319 def \
320 abc \ 320 abc \
321 ghi \ 321 ghi \
@@ -349,15 +349,15 @@ If, on the other hand, ``foo.bbclass``
349uses the "_append" operator, then the final value of ``FOO`` will be 349uses the "_append" operator, then the final value of ``FOO`` will be
350"initial val", as intended:: 350"initial val", as intended::
351 351
352 FOO_append = " val" 352 FOO:append = " val"
353 353
354.. note:: 354.. note::
355 355
356 It is never necessary to use "+=" together with "_append". The following 356 It is never necessary to use "+=" together with "_append". The following
357 sequence of assignments appends "barbaz" to FOO:: 357 sequence of assignments appends "barbaz" to FOO::
358 358
359 FOO_append = "bar" 359 FOO:append = "bar"
360 FOO_append = "baz" 360 FOO:append = "baz"
361 361
362 362
363 The only effect of changing the second assignment in the previous 363 The only effect of changing the second assignment in the previous
@@ -538,12 +538,12 @@ variable.
538 that value based on the architecture of the build:: 538 that value based on the architecture of the build::
539 539
540 KBRANCH = "standard/base" 540 KBRANCH = "standard/base"
541 KBRANCH_qemuarm = "standard/arm-versatile-926ejs" 541 KBRANCH:qemuarm = "standard/arm-versatile-926ejs"
542 KBRANCH_qemumips = "standard/mti-malta32" 542 KBRANCH:qemumips = "standard/mti-malta32"
543 KBRANCH_qemuppc = "standard/qemuppc" 543 KBRANCH:qemuppc = "standard/qemuppc"
544 KBRANCH_qemux86 = "standard/common-pc/base" 544 KBRANCH:qemux86 = "standard/common-pc/base"
545 KBRANCH_qemux86-64 = "standard/common-pc-64/base" 545 KBRANCH:qemux86-64 = "standard/common-pc-64/base"
546 KBRANCH_qemumips64 = "standard/mti-malta64" 546 KBRANCH:qemumips64 = "standard/mti-malta64"
547 547
548- *Appending and Prepending:* BitBake also supports append and prepend 548- *Appending and Prepending:* BitBake also supports append and prepend
549 operations to variable values based on whether a specific item is 549 operations to variable values based on whether a specific item is
@@ -551,7 +551,7 @@ variable.
551 551
552 DEPENDS = "glibc ncurses" 552 DEPENDS = "glibc ncurses"
553 OVERRIDES = "machine:local" 553 OVERRIDES = "machine:local"
554 DEPENDS_append_machine = "libmad" 554 DEPENDS:append_machine = "libmad"
555 555
556 In this example, :term:`DEPENDS` becomes "glibc ncurses libmad". 556 In this example, :term:`DEPENDS` becomes "glibc ncurses libmad".
557 557
@@ -559,15 +559,15 @@ variable.
559 example, the following lines will conditionally append to the 559 example, the following lines will conditionally append to the
560 ``KERNEL_FEATURES`` variable based on the architecture:: 560 ``KERNEL_FEATURES`` variable based on the architecture::
561 561
562 KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" 562 KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
563 KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" 563 KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
564 KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" 564 KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
565 565
566- *Setting a Variable for a Single Task:* BitBake supports setting a 566- *Setting a Variable for a Single Task:* BitBake supports setting a
567 variable just for the duration of a single task. Here is an example:: 567 variable just for the duration of a single task. Here is an example::
568 568
569 FOO_task-configure = "val 1" 569 FOO_task-configure = "val 1"
570 FOO_task-compile = "val 2" 570 FOO:task-compile = "val 2"
571 571
572 In the 572 In the
573 previous example, ``FOO`` has the value "val 1" while the 573 previous example, ``FOO`` has the value "val 1" while the
@@ -582,7 +582,7 @@ variable.
582 You can also use this syntax with other combinations (e.g. 582 You can also use this syntax with other combinations (e.g.
583 "``_prepend``") as shown in the following example:: 583 "``_prepend``") as shown in the following example::
584 584
585 EXTRA_OEMAKE_prepend_task-compile = "${PARALLEL_MAKE} " 585 EXTRA_OEMAKE:prepend:task-compile = "${PARALLEL_MAKE} "
586 586
587Key Expansion 587Key Expansion
588------------- 588-------------
@@ -618,7 +618,7 @@ example::
618 618
619 OVERRIDES = "foo" 619 OVERRIDES = "foo"
620 A = "Z" 620 A = "Z"
621 A_foo_append = "X" 621 A_foo:append = "X"
622 622
623For this case, 623For this case,
624``A`` is unconditionally set to "Z" and "X" is unconditionally and 624``A`` is unconditionally set to "Z" and "X" is unconditionally and
@@ -635,7 +635,7 @@ This next example changes the order of the override and the append::
635 635
636 OVERRIDES = "foo" 636 OVERRIDES = "foo"
637 A = "Z" 637 A = "Z"
638 A_append_foo = "X" 638 A:append_foo = "X"
639 639
640For this case, before 640For this case, before
641overrides are handled, ``A`` is set to "Z" and ``A_append_foo`` is set 641overrides are handled, ``A`` is set to "Z" and ``A_append_foo`` is set
@@ -648,8 +648,8 @@ back as in the first example::
648 648
649 OVERRIDES = "foo" 649 OVERRIDES = "foo"
650 A = "Y" 650 A = "Y"
651 A_foo_append = "Z" 651 A_foo:append = "Z"
652 A_foo_append = "X" 652 A_foo:append = "X"
653 653
654For this case, before any overrides are resolved, 654For this case, before any overrides are resolved,
655``A`` is set to "Y" using an immediate assignment. After this immediate 655``A`` is set to "Y" using an immediate assignment. After this immediate
@@ -661,8 +661,8 @@ leaving the variable set to "ZX". Finally, applying the override for
661This final example mixes in some varying operators:: 661This final example mixes in some varying operators::
662 662
663 A = "1" 663 A = "1"
664 A_append = "2" 664 A:append = "2"
665 A_append = "3" 665 A:append = "3"
666 A += "4" 666 A += "4"
667 A .= "5" 667 A .= "5"
668 668
@@ -919,7 +919,7 @@ As an example, consider the following::
919 fn 919 fn
920 } 920 }
921 921
922 fn_prepend() { 922 fn:prepend() {
923 bbplain second 923 bbplain second
924 } 924 }
925 925
@@ -927,7 +927,7 @@ As an example, consider the following::
927 bbplain third 927 bbplain third
928 } 928 }
929 929
930 do_foo_append() { 930 do_foo:append() {
931 bbplain fourth 931 bbplain fourth
932 } 932 }
933 933
@@ -977,7 +977,7 @@ override-style operators to BitBake-style Python functions.
977 977
978As an example, consider the following:: 978As an example, consider the following::
979 979
980 python do_foo_prepend() { 980 python do_foo:prepend() {
981 bb.plain("first") 981 bb.plain("first")
982 } 982 }
983 983
@@ -985,7 +985,7 @@ As an example, consider the following::
985 bb.plain("second") 985 bb.plain("second")
986 } 986 }
987 987
988 python do_foo_append() { 988 python do_foo:append() {
989 bb.plain("third") 989 bb.plain("third")
990 } 990 }
991 991
@@ -1139,7 +1139,7 @@ before anonymous functions run. In the following example, ``FOO`` ends
1139up with the value "foo from anonymous":: 1139up with the value "foo from anonymous"::
1140 1140
1141 FOO = "foo" 1141 FOO = "foo"
1142 FOO_append = " from outside" 1142 FOO:append = " from outside"
1143 1143
1144 python () { 1144 python () {
1145 d.setVar("FOO", "foo from anonymous") 1145 d.setVar("FOO", "foo from anonymous")
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst
index 797e2a00cc..6283c2654c 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst
@@ -1118,7 +1118,7 @@ overview of their function and contents.
1118 attempt before any others by adding something like the following to 1118 attempt before any others by adding something like the following to
1119 your configuration:: 1119 your configuration::
1120 1120
1121 PREMIRRORS_prepend = "\ 1121 PREMIRRORS:prepend = "\
1122 git://.*/.* http://www.yoctoproject.org/sources/ \n \ 1122 git://.*/.* http://www.yoctoproject.org/sources/ \n \
1123 ftp://.*/.* http://www.yoctoproject.org/sources/ \n \ 1123 ftp://.*/.* http://www.yoctoproject.org/sources/ \n \
1124 http://.*/.* http://www.yoctoproject.org/sources/ \n \ 1124 http://.*/.* http://www.yoctoproject.org/sources/ \n \
@@ -1184,7 +1184,7 @@ overview of their function and contents.
1184 that depends on the ``perl`` package. In this case, you would use the 1184 that depends on the ``perl`` package. In this case, you would use the
1185 following :term:`RDEPENDS` statement:: 1185 following :term:`RDEPENDS` statement::
1186 1186
1187 RDEPENDS_${PN}-dev += "perl" 1187 RDEPENDS:${PN}-dev += "perl"
1188 1188
1189 In the example, the development package depends on the ``perl`` package. 1189 In the example, the development package depends on the ``perl`` package.
1190 Thus, the :term:`RDEPENDS` variable has the ``${PN}-dev`` package name as part 1190 Thus, the :term:`RDEPENDS` variable has the ``${PN}-dev`` package name as part
@@ -1195,7 +1195,7 @@ overview of their function and contents.
1195 differences from you. Here is the general syntax to specify versions 1195 differences from you. Here is the general syntax to specify versions
1196 with the :term:`RDEPENDS` variable:: 1196 with the :term:`RDEPENDS` variable::
1197 1197
1198 RDEPENDS_${PN} = "package (operator version)" 1198 RDEPENDS:${PN} = "package (operator version)"
1199 1199
1200 For ``operator``, you can specify the following:: 1200 For ``operator``, you can specify the following::
1201 1201
@@ -1208,7 +1208,7 @@ overview of their function and contents.
1208 For example, the following sets up a dependency on version 1.2 or 1208 For example, the following sets up a dependency on version 1.2 or
1209 greater of the package ``foo``:: 1209 greater of the package ``foo``::
1210 1210
1211 RDEPENDS_${PN} = "foo (>= 1.2)" 1211 RDEPENDS:${PN} = "foo (>= 1.2)"
1212 1212
1213 For information on build-time dependencies, see the :term:`DEPENDS` 1213 For information on build-time dependencies, see the :term:`DEPENDS`
1214 variable. 1214 variable.
@@ -1237,7 +1237,7 @@ overview of their function and contents.
1237 variable in conjunction with a package name override. Here is an 1237 variable in conjunction with a package name override. Here is an
1238 example:: 1238 example::
1239 1239
1240 RPROVIDES_${PN} = "widget-abi-2" 1240 RPROVIDES:${PN} = "widget-abi-2"
1241 1241
1242 :term:`RRECOMMENDS` 1242 :term:`RRECOMMENDS`
1243 A list of packages that extends the usability of a package being 1243 A list of packages that extends the usability of a package being
@@ -1251,7 +1251,7 @@ overview of their function and contents.
1251 differences from you. Here is the general syntax to specify versions 1251 differences from you. Here is the general syntax to specify versions
1252 with the :term:`RRECOMMENDS` variable:: 1252 with the :term:`RRECOMMENDS` variable::
1253 1253
1254 RRECOMMENDS_${PN} = "package (operator version)" 1254 RRECOMMENDS:${PN} = "package (operator version)"
1255 1255
1256 For ``operator``, you can specify the following:: 1256 For ``operator``, you can specify the following::
1257 1257
@@ -1264,7 +1264,7 @@ overview of their function and contents.
1264 For example, the following sets up a recommend on version 1264 For example, the following sets up a recommend on version
1265 1.2 or greater of the package ``foo``:: 1265 1.2 or greater of the package ``foo``::
1266 1266
1267 RRECOMMENDS_${PN} = "foo (>= 1.2)" 1267 RRECOMMENDS:${PN} = "foo (>= 1.2)"
1268 1268
1269 :term:`SECTION` 1269 :term:`SECTION`
1270 The section in which packages should be categorized. 1270 The section in which packages should be categorized.
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 0d49e1da37..60aaf3902a 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -1150,7 +1150,7 @@ def srcrev_internal_helper(ud, d, name):
1150 if name != '': 1150 if name != '':
1151 attempts.append("SRCREV_%s" % name) 1151 attempts.append("SRCREV_%s" % name)
1152 if pn: 1152 if pn:
1153 attempts.append("SRCREV_pn-%s" % pn) 1153 attempts.append("SRCREV:pn-%s" % pn)
1154 attempts.append("SRCREV") 1154 attempts.append("SRCREV")
1155 1155
1156 for a in attempts: 1156 for a in attempts:
diff --git a/bitbake/lib/bb/tests/data.py b/bitbake/lib/bb/tests/data.py
index 1d4a64b109..add1b13600 100644
--- a/bitbake/lib/bb/tests/data.py
+++ b/bitbake/lib/bb/tests/data.py
@@ -245,35 +245,35 @@ class TestConcatOverride(unittest.TestCase):
245 245
246 def test_prepend(self): 246 def test_prepend(self):
247 self.d.setVar("TEST", "${VAL}") 247 self.d.setVar("TEST", "${VAL}")
248 self.d.setVar("TEST_prepend", "${FOO}:") 248 self.d.setVar("TEST:prepend", "${FOO}:")
249 self.assertEqual(self.d.getVar("TEST"), "foo:val") 249 self.assertEqual(self.d.getVar("TEST"), "foo:val")
250 250
251 def test_append(self): 251 def test_append(self):
252 self.d.setVar("TEST", "${VAL}") 252 self.d.setVar("TEST", "${VAL}")
253 self.d.setVar("TEST_append", ":${BAR}") 253 self.d.setVar("TEST:append", ":${BAR}")
254 self.assertEqual(self.d.getVar("TEST"), "val:bar") 254 self.assertEqual(self.d.getVar("TEST"), "val:bar")
255 255
256 def test_multiple_append(self): 256 def test_multiple_append(self):
257 self.d.setVar("TEST", "${VAL}") 257 self.d.setVar("TEST", "${VAL}")
258 self.d.setVar("TEST_prepend", "${FOO}:") 258 self.d.setVar("TEST:prepend", "${FOO}:")
259 self.d.setVar("TEST_append", ":val2") 259 self.d.setVar("TEST:append", ":val2")
260 self.d.setVar("TEST_append", ":${BAR}") 260 self.d.setVar("TEST:append", ":${BAR}")
261 self.assertEqual(self.d.getVar("TEST"), "foo:val:val2:bar") 261 self.assertEqual(self.d.getVar("TEST"), "foo:val:val2:bar")
262 262
263 def test_append_unset(self): 263 def test_append_unset(self):
264 self.d.setVar("TEST_prepend", "${FOO}:") 264 self.d.setVar("TEST:prepend", "${FOO}:")
265 self.d.setVar("TEST_append", ":val2") 265 self.d.setVar("TEST:append", ":val2")
266 self.d.setVar("TEST_append", ":${BAR}") 266 self.d.setVar("TEST:append", ":${BAR}")
267 self.assertEqual(self.d.getVar("TEST"), "foo::val2:bar") 267 self.assertEqual(self.d.getVar("TEST"), "foo::val2:bar")
268 268
269 def test_remove(self): 269 def test_remove(self):
270 self.d.setVar("TEST", "${VAL} ${BAR}") 270 self.d.setVar("TEST", "${VAL} ${BAR}")
271 self.d.setVar("TEST_remove", "val") 271 self.d.setVar("TEST:remove", "val")
272 self.assertEqual(self.d.getVar("TEST"), " bar") 272 self.assertEqual(self.d.getVar("TEST"), " bar")
273 273
274 def test_remove_cleared(self): 274 def test_remove_cleared(self):
275 self.d.setVar("TEST", "${VAL} ${BAR}") 275 self.d.setVar("TEST", "${VAL} ${BAR}")
276 self.d.setVar("TEST_remove", "val") 276 self.d.setVar("TEST:remove", "val")
277 self.d.setVar("TEST", "${VAL} ${BAR}") 277 self.d.setVar("TEST", "${VAL} ${BAR}")
278 self.assertEqual(self.d.getVar("TEST"), "val bar") 278 self.assertEqual(self.d.getVar("TEST"), "val bar")
279 279
@@ -281,42 +281,42 @@ class TestConcatOverride(unittest.TestCase):
281 # (including that whitespace is preserved) 281 # (including that whitespace is preserved)
282 def test_remove_inactive_override(self): 282 def test_remove_inactive_override(self):
283 self.d.setVar("TEST", "${VAL} ${BAR} 123") 283 self.d.setVar("TEST", "${VAL} ${BAR} 123")
284 self.d.setVar("TEST_remove_inactiveoverride", "val") 284 self.d.setVar("TEST:remove_inactiveoverride", "val")
285 self.assertEqual(self.d.getVar("TEST"), "val bar 123") 285 self.assertEqual(self.d.getVar("TEST"), "val bar 123")
286 286
287 def test_doubleref_remove(self): 287 def test_doubleref_remove(self):
288 self.d.setVar("TEST", "${VAL} ${BAR}") 288 self.d.setVar("TEST", "${VAL} ${BAR}")
289 self.d.setVar("TEST_remove", "val") 289 self.d.setVar("TEST:remove", "val")
290 self.d.setVar("TEST_TEST", "${TEST} ${TEST}") 290 self.d.setVar("TEST_TEST", "${TEST} ${TEST}")
291 self.assertEqual(self.d.getVar("TEST_TEST"), " bar bar") 291 self.assertEqual(self.d.getVar("TEST_TEST"), " bar bar")
292 292
293 def test_empty_remove(self): 293 def test_empty_remove(self):
294 self.d.setVar("TEST", "") 294 self.d.setVar("TEST", "")
295 self.d.setVar("TEST_remove", "val") 295 self.d.setVar("TEST:remove", "val")
296 self.assertEqual(self.d.getVar("TEST"), "") 296 self.assertEqual(self.d.getVar("TEST"), "")
297 297
298 def test_remove_expansion(self): 298 def test_remove_expansion(self):
299 self.d.setVar("BAR", "Z") 299 self.d.setVar("BAR", "Z")
300 self.d.setVar("TEST", "${BAR}/X Y") 300 self.d.setVar("TEST", "${BAR}/X Y")
301 self.d.setVar("TEST_remove", "${BAR}/X") 301 self.d.setVar("TEST:remove", "${BAR}/X")
302 self.assertEqual(self.d.getVar("TEST"), " Y") 302 self.assertEqual(self.d.getVar("TEST"), " Y")
303 303
304 def test_remove_expansion_items(self): 304 def test_remove_expansion_items(self):
305 self.d.setVar("TEST", "A B C D") 305 self.d.setVar("TEST", "A B C D")
306 self.d.setVar("BAR", "B D") 306 self.d.setVar("BAR", "B D")
307 self.d.setVar("TEST_remove", "${BAR}") 307 self.d.setVar("TEST:remove", "${BAR}")
308 self.assertEqual(self.d.getVar("TEST"), "A C ") 308 self.assertEqual(self.d.getVar("TEST"), "A C ")
309 309
310 def test_remove_preserve_whitespace(self): 310 def test_remove_preserve_whitespace(self):
311 # When the removal isn't active, the original value should be preserved 311 # When the removal isn't active, the original value should be preserved
312 self.d.setVar("TEST", " A B") 312 self.d.setVar("TEST", " A B")
313 self.d.setVar("TEST_remove", "C") 313 self.d.setVar("TEST:remove", "C")
314 self.assertEqual(self.d.getVar("TEST"), " A B") 314 self.assertEqual(self.d.getVar("TEST"), " A B")
315 315
316 def test_remove_preserve_whitespace2(self): 316 def test_remove_preserve_whitespace2(self):
317 # When the removal is active preserve the whitespace 317 # When the removal is active preserve the whitespace
318 self.d.setVar("TEST", " A B") 318 self.d.setVar("TEST", " A B")
319 self.d.setVar("TEST_remove", "B") 319 self.d.setVar("TEST:remove", "B")
320 self.assertEqual(self.d.getVar("TEST"), " A ") 320 self.assertEqual(self.d.getVar("TEST"), " A ")
321 321
322class TestOverrides(unittest.TestCase): 322class TestOverrides(unittest.TestCase):
@@ -362,10 +362,10 @@ class TestOverrides(unittest.TestCase):
362 self.assertEqual(self.d.getVar("TEST"), "testvalue3") 362 self.assertEqual(self.d.getVar("TEST"), "testvalue3")
363 363
364 def test_rename_override(self): 364 def test_rename_override(self):
365 self.d.setVar("ALTERNATIVE_ncurses-tools_class-target", "a") 365 self.d.setVar("ALTERNATIVE:ncurses-tools:class-target", "a")
366 self.d.setVar("OVERRIDES", "class-target") 366 self.d.setVar("OVERRIDES", "class-target")
367 self.d.renameVar("ALTERNATIVE_ncurses-tools", "ALTERNATIVE_lib32-ncurses-tools") 367 self.d.renameVar("ALTERNATIVE:ncurses-tools", "ALTERNATIVE:lib32-ncurses-tools")
368 self.assertEqual(self.d.getVar("ALTERNATIVE_lib32-ncurses-tools"), "a") 368 self.assertEqual(self.d.getVar("ALTERNATIVE:lib32-ncurses-tools"), "a")
369 369
370 def test_underscore_override(self): 370 def test_underscore_override(self):
371 self.d.setVar("TEST_bar", "testvalue2") 371 self.d.setVar("TEST_bar", "testvalue2")
@@ -377,22 +377,22 @@ class TestOverrides(unittest.TestCase):
377 def test_remove_with_override(self): 377 def test_remove_with_override(self):
378 self.d.setVar("TEST_bar", "testvalue2") 378 self.d.setVar("TEST_bar", "testvalue2")
379 self.d.setVar("TEST_some_val", "testvalue3 testvalue5") 379 self.d.setVar("TEST_some_val", "testvalue3 testvalue5")
380 self.d.setVar("TEST_some_val_remove", "testvalue3") 380 self.d.setVar("TEST_some_val:remove", "testvalue3")
381 self.d.setVar("TEST_foo", "testvalue4") 381 self.d.setVar("TEST_foo", "testvalue4")
382 self.d.setVar("OVERRIDES", "foo:bar:some_val") 382 self.d.setVar("OVERRIDES", "foo:bar:some_val")
383 self.assertEqual(self.d.getVar("TEST"), " testvalue5") 383 self.assertEqual(self.d.getVar("TEST"), " testvalue5")
384 384
385 def test_append_and_override_1(self): 385 def test_append_and_override_1(self):
386 self.d.setVar("TEST_append", "testvalue2") 386 self.d.setVar("TEST:append", "testvalue2")
387 self.d.setVar("TEST_bar", "testvalue3") 387 self.d.setVar("TEST_bar", "testvalue3")
388 self.assertEqual(self.d.getVar("TEST"), "testvalue3testvalue2") 388 self.assertEqual(self.d.getVar("TEST"), "testvalue3testvalue2")
389 389
390 def test_append_and_override_2(self): 390 def test_append_and_override_2(self):
391 self.d.setVar("TEST_append_bar", "testvalue2") 391 self.d.setVar("TEST:append_bar", "testvalue2")
392 self.assertEqual(self.d.getVar("TEST"), "testvaluetestvalue2") 392 self.assertEqual(self.d.getVar("TEST"), "testvaluetestvalue2")
393 393
394 def test_append_and_override_3(self): 394 def test_append_and_override_3(self):
395 self.d.setVar("TEST_bar_append", "testvalue2") 395 self.d.setVar("TEST_bar:append", "testvalue2")
396 self.assertEqual(self.d.getVar("TEST"), "testvalue2") 396 self.assertEqual(self.d.getVar("TEST"), "testvalue2")
397 397
398 # Test an override with _<numeric> in it based on a real world OE issue 398 # Test an override with _<numeric> in it based on a real world OE issue
@@ -400,7 +400,7 @@ class TestOverrides(unittest.TestCase):
400 self.d.setVar("TARGET_ARCH", "x86_64") 400 self.d.setVar("TARGET_ARCH", "x86_64")
401 self.d.setVar("PN", "test-${TARGET_ARCH}") 401 self.d.setVar("PN", "test-${TARGET_ARCH}")
402 self.d.setVar("VERSION", "1") 402 self.d.setVar("VERSION", "1")
403 self.d.setVar("VERSION_pn-test-${TARGET_ARCH}", "2") 403 self.d.setVar("VERSION:pn-test-${TARGET_ARCH}", "2")
404 self.d.setVar("OVERRIDES", "pn-${PN}") 404 self.d.setVar("OVERRIDES", "pn-${PN}")
405 bb.data.expandKeys(self.d) 405 bb.data.expandKeys(self.d)
406 self.assertEqual(self.d.getVar("VERSION"), "2") 406 self.assertEqual(self.d.getVar("VERSION"), "2")
@@ -498,7 +498,7 @@ class TaskHash(unittest.TestCase):
498 d.setVar("VAR", "val") 498 d.setVar("VAR", "val")
499 # Adding an inactive removal shouldn't change the hash 499 # Adding an inactive removal shouldn't change the hash
500 d.setVar("BAR", "notbar") 500 d.setVar("BAR", "notbar")
501 d.setVar("MYCOMMAND_remove", "${BAR}") 501 d.setVar("MYCOMMAND:remove", "${BAR}")
502 nexthash = gettask_bashhash("mytask", d) 502 nexthash = gettask_bashhash("mytask", d)
503 self.assertEqual(orighash, nexthash) 503 self.assertEqual(orighash, nexthash)
504 504
diff --git a/bitbake/lib/bb/tests/parse.py b/bitbake/lib/bb/tests/parse.py
index 9e21e18425..02a5c4952a 100644
--- a/bitbake/lib/bb/tests/parse.py
+++ b/bitbake/lib/bb/tests/parse.py
@@ -98,8 +98,8 @@ exportD = "d"
98 98
99 99
100 overridetest = """ 100 overridetest = """
101RRECOMMENDS_${PN} = "a" 101RRECOMMENDS:${PN} = "a"
102RRECOMMENDS_${PN}_libc = "b" 102RRECOMMENDS:${PN}_libc = "b"
103OVERRIDES = "libc:${PN}" 103OVERRIDES = "libc:${PN}"
104PN = "gtk+" 104PN = "gtk+"
105""" 105"""
@@ -110,13 +110,13 @@ PN = "gtk+"
110 self.assertEqual(d.getVar("RRECOMMENDS"), "b") 110 self.assertEqual(d.getVar("RRECOMMENDS"), "b")
111 bb.data.expandKeys(d) 111 bb.data.expandKeys(d)
112 self.assertEqual(d.getVar("RRECOMMENDS"), "b") 112 self.assertEqual(d.getVar("RRECOMMENDS"), "b")
113 d.setVar("RRECOMMENDS_gtk+", "c") 113 d.setVar("RRECOMMENDS:gtk+", "c")
114 self.assertEqual(d.getVar("RRECOMMENDS"), "c") 114 self.assertEqual(d.getVar("RRECOMMENDS"), "c")
115 115
116 overridetest2 = """ 116 overridetest2 = """
117EXTRA_OECONF = "" 117EXTRA_OECONF = ""
118EXTRA_OECONF_class-target = "b" 118EXTRA_OECONF:class-target = "b"
119EXTRA_OECONF_append = " c" 119EXTRA_OECONF:append = " c"
120""" 120"""
121 121
122 def test_parse_overrides(self): 122 def test_parse_overrides(self):
@@ -128,7 +128,7 @@ EXTRA_OECONF_append = " c"
128 128
129 overridetest3 = """ 129 overridetest3 = """
130DESCRIPTION = "A" 130DESCRIPTION = "A"
131DESCRIPTION_${PN}-dev = "${DESCRIPTION} B" 131DESCRIPTION:${PN}-dev = "${DESCRIPTION} B"
132PN = "bc" 132PN = "bc"
133""" 133"""
134 134
@@ -136,9 +136,9 @@ PN = "bc"
136 f = self.parsehelper(self.overridetest3) 136 f = self.parsehelper(self.overridetest3)
137 d = bb.parse.handle(f.name, self.d)[''] 137 d = bb.parse.handle(f.name, self.d)['']
138 bb.data.expandKeys(d) 138 bb.data.expandKeys(d)
139 self.assertEqual(d.getVar("DESCRIPTION_bc-dev"), "A B") 139 self.assertEqual(d.getVar("DESCRIPTION:bc-dev"), "A B")
140 d.setVar("DESCRIPTION", "E") 140 d.setVar("DESCRIPTION", "E")
141 d.setVar("DESCRIPTION_bc-dev", "C D") 141 d.setVar("DESCRIPTION:bc-dev", "C D")
142 d.setVar("OVERRIDES", "bc-dev") 142 d.setVar("OVERRIDES", "bc-dev")
143 self.assertEqual(d.getVar("DESCRIPTION"), "C D") 143 self.assertEqual(d.getVar("DESCRIPTION"), "C D")
144 144
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 7f7e922ade..4c94b407d7 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -1719,7 +1719,7 @@ class CustomImageRecipe(Recipe):
1719 """Generate the contents for the recipe file.""" 1719 """Generate the contents for the recipe file."""
1720 # If we have no excluded packages we only need to _append 1720 # If we have no excluded packages we only need to _append
1721 if self.excludes_set.count() == 0: 1721 if self.excludes_set.count() == 0:
1722 packages_conf = "IMAGE_INSTALL_append = \" " 1722 packages_conf = "IMAGE_INSTALL:append = \" "
1723 1723
1724 for pkg in self.appends_set.all(): 1724 for pkg in self.appends_set.all():
1725 packages_conf += pkg.name+' ' 1725 packages_conf += pkg.name+' '
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 9a5e48e3bb..04ab8bcb04 100644
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -1708,7 +1708,7 @@ if True:
1708 except ProjectVariable.DoesNotExist: 1708 except ProjectVariable.DoesNotExist:
1709 pass 1709 pass
1710 try: 1710 try:
1711 return_data['image_install_append'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_INSTALL_append").value, 1711 return_data['image_install:append'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_INSTALL:append").value,
1712 except ProjectVariable.DoesNotExist: 1712 except ProjectVariable.DoesNotExist:
1713 pass 1713 pass
1714 try: 1714 try:
@@ -1839,8 +1839,8 @@ if True:
1839 except ProjectVariable.DoesNotExist: 1839 except ProjectVariable.DoesNotExist:
1840 pass 1840 pass
1841 try: 1841 try:
1842 context['image_install_append'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_INSTALL_append").value 1842 context['image_install:append'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_INSTALL:append").value
1843 context['image_install_append_defined'] = "1" 1843 context['image_install:append_defined'] = "1"
1844 except ProjectVariable.DoesNotExist: 1844 except ProjectVariable.DoesNotExist:
1845 pass 1845 pass
1846 try: 1846 try:
diff --git a/bitbake/lib/toaster/toastermain/management/commands/buildimport.py b/bitbake/lib/toaster/toastermain/management/commands/buildimport.py
index 59da6ff7ac..e25b55e5ab 100644
--- a/bitbake/lib/toaster/toastermain/management/commands/buildimport.py
+++ b/bitbake/lib/toaster/toastermain/management/commands/buildimport.py
@@ -451,7 +451,7 @@ class Command(BaseCommand):
451 # Catch vars relevant to Toaster (in case no Toaster section) 451 # Catch vars relevant to Toaster (in case no Toaster section)
452 self.update_project_vars(project,'DISTRO') 452 self.update_project_vars(project,'DISTRO')
453 self.update_project_vars(project,'MACHINE') 453 self.update_project_vars(project,'MACHINE')
454 self.update_project_vars(project,'IMAGE_INSTALL_append') 454 self.update_project_vars(project,'IMAGE_INSTALL:append')
455 self.update_project_vars(project,'IMAGE_FSTYPES') 455 self.update_project_vars(project,'IMAGE_FSTYPES')
456 self.update_project_vars(project,'PACKAGE_CLASSES') 456 self.update_project_vars(project,'PACKAGE_CLASSES')
457 # These vars are typically only assigned by Toaster 457 # These vars are typically only assigned by Toaster