diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2021-08-06 02:30:11 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-12 06:26:15 +0100 |
| commit | 2e4d3aa2a351c5648dbd1df0203c99450329ccb4 (patch) | |
| tree | 42f0df9af31362eb168c32b8fef74f72238404c5 | |
| parent | 62372aedfe5e04b6b0c0bc5dba7c29bd4685e83b (diff) | |
| download | poky-2e4d3aa2a351c5648dbd1df0203c99450329ccb4.tar.gz | |
meta: use new override syntax in comments
(From OE-Core rev: 572e7db6e8831227911ff3e52bde3a4aa6df1c91)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/bitbake.conf | 4 | ||||
| -rw-r--r-- | meta/conf/machine/qemuppc64.conf | 4 | ||||
| -rw-r--r-- | meta/recipes-core/dbus/dbus-glib_0.112.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/elfutils/elfutils_0.185.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index afb82eb370..f6fb2aa698 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
| @@ -236,8 +236,8 @@ DESCRIPTION ?= "${SUMMARY}." | |||
| 236 | # The following two are commented out because they result in a recursive | 236 | # The following two are commented out because they result in a recursive |
| 237 | # definition of the variable in some corner cases. These are left in | 237 | # definition of the variable in some corner cases. These are left in |
| 238 | # to illustrate the intended behavior. | 238 | # to illustrate the intended behavior. |
| 239 | #SUMMARY_${PN} ?= "${SUMMARY}" | 239 | #SUMMARY:${PN} ?= "${SUMMARY}" |
| 240 | #DESCRIPTION_${PN} ?= "${DESCRIPTION}" | 240 | #DESCRIPTION:${PN} ?= "${DESCRIPTION}" |
| 241 | 241 | ||
| 242 | SUMMARY:${PN}-src ?= "${SUMMARY} - Source files" | 242 | SUMMARY:${PN}-src ?= "${SUMMARY} - Source files" |
| 243 | DESCRIPTION:${PN}-src ?= "${DESCRIPTION} \ | 243 | DESCRIPTION:${PN}-src ?= "${DESCRIPTION} \ |
diff --git a/meta/conf/machine/qemuppc64.conf b/meta/conf/machine/qemuppc64.conf index 0682e752be..a5270e98ed 100644 --- a/meta/conf/machine/qemuppc64.conf +++ b/meta/conf/machine/qemuppc64.conf | |||
| @@ -18,7 +18,7 @@ QB_KERNEL_CMDLINE_APPEND = "console=hvc0" | |||
| 18 | QB_OPT_APPEND = "-usb -device usb-tablet" | 18 | QB_OPT_APPEND = "-usb -device usb-tablet" |
| 19 | 19 | ||
| 20 | #prelink broken on ppc64 | 20 | #prelink broken on ppc64 |
| 21 | #USER_CLASSES_remove = "image-prelink" | 21 | #USER_CLASSES:remove = "image-prelink" |
| 22 | #IMAGE_PREPROCESS_COMMAND_remove = "prelink_image;" | 22 | #IMAGE_PREPROCESS_COMMAND:remove = "prelink_image;" |
| 23 | 23 | ||
| 24 | MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" | 24 | MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" |
diff --git a/meta/recipes-core/dbus/dbus-glib_0.112.bb b/meta/recipes-core/dbus/dbus-glib_0.112.bb index a03b2addfd..99b0a20004 100644 --- a/meta/recipes-core/dbus/dbus-glib_0.112.bb +++ b/meta/recipes-core/dbus/dbus-glib_0.112.bb | |||
| @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef71 | |||
| 20 | inherit autotools pkgconfig gettext bash-completion gtk-doc | 20 | inherit autotools pkgconfig gettext bash-completion gtk-doc |
| 21 | 21 | ||
| 22 | #default disable regression tests, some unit test code in non testing code | 22 | #default disable regression tests, some unit test code in non testing code |
| 23 | #PACKAGECONFIG_pn-${PN} = "tests" enable regression tests local.conf | 23 | #PACKAGECONFIG:pn-${PN} = "tests" enable regression tests local.conf |
| 24 | PACKAGECONFIG ??= "" | 24 | PACKAGECONFIG ??= "" |
| 25 | PACKAGECONFIG[tests] = "--enable-tests,,," | 25 | PACKAGECONFIG[tests] = "--enable-tests,,," |
| 26 | 26 | ||
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.185.bb b/meta/recipes-devtools/elfutils/elfutils_0.185.bb index 5031ab97e7..7a88c5259f 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.185.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.185.bb | |||
| @@ -127,7 +127,7 @@ FILES:libdw = "${libdir}/libdw-${PV}.so ${libdir}/libdw.so.* ${libdir}/elfutils | |||
| 127 | FILES:libdebuginfod = "${libdir}/libdebuginfod-${PV}.so ${libdir}/libdebuginfod.so.*" | 127 | FILES:libdebuginfod = "${libdir}/libdebuginfod-${PV}.so ${libdir}/libdebuginfod.so.*" |
| 128 | # Some packages have the version preceeding the .so instead properly | 128 | # Some packages have the version preceeding the .so instead properly |
| 129 | # versioned .so.<version>, so we need to reorder and repackage. | 129 | # versioned .so.<version>, so we need to reorder and repackage. |
| 130 | #FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so" | 130 | #FILES:${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so" |
| 131 | #FILES_SOLIBSDEV = "${libdir}/libasm.so ${libdir}/libdw.so ${libdir}/libelf.so" | 131 | #FILES_SOLIBSDEV = "${libdir}/libasm.so ${libdir}/libdw.so ${libdir}/libelf.so" |
| 132 | 132 | ||
| 133 | # The package contains symlinks that trip up insane | 133 | # The package contains symlinks that trip up insane |
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 4de8a9098b..0bbc4b1187 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
| @@ -110,7 +110,7 @@ export LIBTOOL="${HOST_SYS}-libtool" | |||
| 110 | 110 | ||
| 111 | B = "${WORKDIR}/build" | 111 | B = "${WORKDIR}/build" |
| 112 | 112 | ||
| 113 | #EXTRA_OECONF_append = " --python=${HOSTTOOLS_DIR}/python3" | 113 | #EXTRA_OECONF:append = " --python=${HOSTTOOLS_DIR}/python3" |
| 114 | 114 | ||
| 115 | do_configure:prepend:class-native() { | 115 | do_configure:prepend:class-native() { |
| 116 | # Append build host pkg-config paths for native target since the host may provide sdl | 116 | # Append build host pkg-config paths for native target since the host may provide sdl |
