Skip to contentSkip to conversation

bitbake.conf: drop ${PE} and ${PR} from -f{file,macro,debug}-prefix-map

PATCH Superseded Martin Jansa 2 participants 3 messages Nov 13, 2023 – Nov 15, 2023

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 bitbake.conf: drop ${PE} and ${PR} from -f{file,macro,debug}-prefix-map

* ${EXTENDPE} and ${PR} was already dropped from ${WORKDIR} in:
https://lists.openembedded.org/g/openembedded-core/message/185818
adjust -fmacro-prefix-map and -fdebug-prefix-map similarly. As we don't depend on PR in WORKDIR maybe we don't need it in /usr/src/debug paths as well anymore.

* The interesting side-effect of this is that for DISTROs which still use PR (e.g. webOS OSE), the difference in -fdebug-prefix-map causes all binaries to be slightly different when rebuilt with different PR (due to this path, even when otherwise they are binary reproducible) and when the number of digits in PR changes (e.g. from r9 to r10) it also results in slightly bigger binaries (and more unnecessary changes in buildhistory diffs).

For example this foo binary, the difference between "new" and "old" is extra patch applied in SRC_URI (which doesn't affect the foo binary, but was the reason for PR bump).

And the binary is bigger with r10, identical with r6 and slightly different due to debug-prefix-map between r6 and r7:

  $ ls -la 1.0.0-175-*/image/usr/sbin/foo
  -rwxr-xr-x 1 bitbake bitbake 30182460 Nov  8 08:29 1.0.0-175-new-r10/image/usr/sbin/foo
  -rwxr-xr-x 1 bitbake bitbake 30182224 Nov  8 08:02 1.0.0-175-new-r6/image/usr/sbin/foo
  -rwxr-xr-x 1 bitbake bitbake 30182224 Nov  8 07:49 1.0.0-175-new-r7/image/usr/sbin/foo
  -rwxr-xr-x 1 bitbake bitbake 30182224 Nov  8 07:39 1.0.0-175-old-r6/image/usr/sbin/foo
  $ md5sum 1.0.0-175-*/image/usr/sbin/foo
  8e3ab67d596f8cc2f9c6320dab10af01  1.0.0-175-new-r10/image/usr/sbin/foo
  f6ff1e64fe6affb9ba0d8f278cf7ed79  1.0.0-175-new-r6/image/usr/sbin/foo
  6469a0b10aac233911e63c5ea97b03c0  1.0.0-175-new-r7/image/usr/sbin/foo
  f6ff1e64fe6affb9ba0d8f278cf7ed79  1.0.0-175-old-r6/image/usr/sbin/foo

---
v2: shorten to summary to fix:
FAIL: test shortlog length: Edit shortlog so that it is 90 characters or less (currently 140 characters) (test_mbox.TestMbox.test_shortlog_length)

 meta/conf/bitbake.conf                            | 8 ++++----
 meta/recipes-core/ovmf/ovmf_git.bb                | 2 +-
 meta/recipes-devtools/go/go-cross-canadian.inc    | 2 +-
 meta/recipes-devtools/rust/cargo_1.70.0.bb        | 2 +-
 meta/recipes-extended/acpica/acpica_20230628.bb   | 2 +-
 meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb | 2 +-
 meta/recipes-kernel/perf/perf.bb                  | 2 +-
 meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb      | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)
meta/conf/bitbake.conf +4 -4
index 67ff769046..3836a389b8 100644
@@ -648,10 +648,10 @@ EXTRA_OEMAKE:prepend:task-install = "${PARALLEL_MAKEINST} "
 ##################################################################
 # Beware: applied last to first
 DEBUG_PREFIX_MAP ?= "-fcanon-prefix-map \
- -fmacro-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
- -fdebug-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
- -fmacro-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
- -fdebug-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+ -fmacro-prefix-map=${S}=/usr/src/debug/${PN}/${PV} \
+ -fdebug-prefix-map=${S}=/usr/src/debug/${PN}/${PV} \
+ -fmacro-prefix-map=${B}=/usr/src/debug/${PN}/${PV} \
+ -fdebug-prefix-map=${B}=/usr/src/debug/${PN}/${PV} \
  -fdebug-prefix-map=${STAGING_DIR_HOST}= \
  -fmacro-prefix-map=${STAGING_DIR_HOST}= \
  -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
meta/recipes-core/ovmf/ovmf_git.bb +1 -1
index 6bbe21ac5c..bf67a2a4a8 100644
@@ -122,7 +122,7 @@ fix_toolchain:append:class-native() {
 # --debug-prefix-map to nasm (we carry a patch to nasm for this). The
 # tools definitions are built by ovmf-native so we need to pass this in
 # at target build time when we know the right values.
-export NASM_PREFIX_MAP = "--debug-prefix-map=${WORKDIR}=/usr/src/debug/ovmf/${EXTENDPE}${PV}-${PR}"
+export NASM_PREFIX_MAP = "--debug-prefix-map=${WORKDIR}=/usr/src/debug/ovmf/${PV}"
 export GCC_PREFIX_MAP = "${DEBUG_PREFIX_MAP} -Wno-stringop-overflow -Wno-maybe-uninitialized"
 
 GCC_VER="$(${CC} -v 2>&1 | tail -n1 | awk '{print $3}')"
meta/recipes-devtools/go/go-cross-canadian.inc +1 -1
index 45758f3361..0a72e89bbd 100644
@@ -8,7 +8,7 @@ PN = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 # it uses gcc on build machine during go-cross-canadian bootstrap, but
 # the gcc version may be old and not support option '-fmacro-prefix-map'
 # which is one of default values of DEBUG_PREFIX_MAP
-DEBUG_PREFIX_MAP = "-fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+DEBUG_PREFIX_MAP = "-fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${PV} \
                     -fdebug-prefix-map=${STAGING_DIR_HOST}= \
                     -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
                     "
meta/recipes-devtools/rust/cargo_1.70.0.bb +1 -1
index a5c1064106..9a23ba9d5f 100644
@@ -19,7 +19,7 @@ CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor"
 
 inherit cargo pkgconfig
 
-DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${RUSTSRC}/vendor=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
+DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${RUSTSRC}/vendor=/usr/src/debug/${PN}/${PV}"
 
 do_cargo_setup_snapshot () {
 	${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig
meta/recipes-extended/acpica/acpica_20230628.bb +1 -1
index b7921516a2..8ca1f0892f 100644
@@ -36,7 +36,7 @@ EXTRA_OEMAKE = "CC='${CC}' \
                 INSTALLDIR=${bindir} \
                 INSTALLFLAGS= \
                 YACC=bison \
-                YFLAGS='-y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' \
+                YFLAGS='-y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${PV}' \
                 "
 
 do_install() {
meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb +1 -1
index 99ed82dac4..ca1910966e 100644
@@ -24,7 +24,7 @@ RCONFLICTS:${PN} += "jpeg"
 
 inherit cmake pkgconfig
 
-export NASMENV = "--reproducible --debug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
+export NASMENV = "--reproducible --debug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${PV}"
 
 # Add nasm-native dependency consistently for all build arches is hard
 EXTRA_OECMAKE:append:class-native = " -DWITH_SIMD=False"
meta/recipes-kernel/perf/perf.bb +1 -1
index a90acd55ef..dee8b50b31 100644
@@ -98,7 +98,7 @@ EXTRA_OEMAKE = '\
     AR="${AR}" \
     LD="${LD}" \
     EXTRA_CFLAGS="-ldw -I${S}" \
-    YFLAGS='-y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' \
+    YFLAGS='-y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${PV}' \
     EXTRA_LDFLAGS="${PERF_EXTRA_LDFLAGS}" \
     perfexecdir=${libexecdir} \
     NO_GTK2=1 \
meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb +1 -1
index e65f80d64b..0ad2f80217 100644
@@ -151,7 +151,7 @@ do_configure() {
     export TMPDIR="${B}/tmp"
     mkdir -p ${B}/tmp
     ${S}/configure ${EXTRA_OECONF}
-    sed -i -e "s,^X86ASMFLAGS=.*,& --debug-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} --debug-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR},g" ${B}/ffbuild/config.mak
+    sed -i -e "s,^X86ASMFLAGS=.*,& --debug-prefix-map=${S}=/usr/src/debug/${PN}/${PV} --debug-prefix-map=${B}=/usr/src/debug/${PN}/${PV},g" ${B}/ffbuild/config.mak
 }
 
 # patch out build host paths for reproducibility
Signature · 1 line
2.42.1
#1 lore raw

Hello Martin,

The perf change uncovers:
https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/8098/steps/12/logs/warnings
https://autobuilder.yoctoproject.org/typhoon/#/builders/59/builds/8056/steps/12/logs/warnings

And many more

Quoted 171 lines · Martin Jansa

* ${EXTENDPE} and ${PR} was already dropped from ${WORKDIR} in:
https://lists.openembedded.org/g/openembedded-core/message/185818
adjust -fmacro-prefix-map and -fdebug-prefix-map similarly. As we don't depend on PR in WORKDIR maybe we don't need it in /usr/src/debug paths as well anymore.

* The interesting side-effect of this is that for DISTROs which still use PR (e.g. webOS OSE), the difference in -fdebug-prefix-map causes all binaries to be slightly different when rebuilt with different PR (due to this path, even when otherwise they are binary reproducible) and when the number of digits in PR changes (e.g. from r9 to r10) it also results in slightly bigger binaries (and more unnecessary changes in buildhistory diffs).

For example this foo binary, the difference between "new" and "old" is extra patch applied in SRC_URI (which doesn't affect the foo binary, but was the reason for PR bump).

And the binary is bigger with r10, identical with r6 and slightly different due to debug-prefix-map between r6 and r7:

  $ ls -la 1.0.0-175-*/image/usr/sbin/foo
  -rwxr-xr-x 1 bitbake bitbake 30182460 Nov  8 08:29 1.0.0-175-new-r10/image/usr/sbin/foo
  -rwxr-xr-x 1 bitbake bitbake 30182224 Nov  8 08:02 1.0.0-175-new-r6/image/usr/sbin/foo
  -rwxr-xr-x 1 bitbake bitbake 30182224 Nov  8 07:49 1.0.0-175-new-r7/image/usr/sbin/foo
  -rwxr-xr-x 1 bitbake bitbake 30182224 Nov  8 07:39 1.0.0-175-old-r6/image/usr/sbin/foo
  $ md5sum 1.0.0-175-*/image/usr/sbin/foo
  8e3ab67d596f8cc2f9c6320dab10af01  1.0.0-175-new-r10/image/usr/sbin/foo
  f6ff1e64fe6affb9ba0d8f278cf7ed79  1.0.0-175-new-r6/image/usr/sbin/foo
  6469a0b10aac233911e63c5ea97b03c0  1.0.0-175-new-r7/image/usr/sbin/foo
  f6ff1e64fe6affb9ba0d8f278cf7ed79  1.0.0-175-old-r6/image/usr/sbin/foo

---
v2: shorten to summary to fix:
FAIL: test shortlog length: Edit shortlog so that it is 90 characters or less (currently 140 characters) (test_mbox.TestMbox.test_shortlog_length)

 meta/conf/bitbake.conf                            | 8 ++++----
 meta/recipes-core/ovmf/ovmf_git.bb                | 2 +-
 meta/recipes-devtools/go/go-cross-canadian.inc    | 2 +-
 meta/recipes-devtools/rust/cargo_1.70.0.bb        | 2 +-
 meta/recipes-extended/acpica/acpica_20230628.bb   | 2 +-
 meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb | 2 +-
 meta/recipes-kernel/perf/perf.bb                  | 2 +-
 meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb      | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)
meta/conf/bitbake.conf +4 -4
index 67ff769046..3836a389b8 100644
@@ -648,10 +648,10 @@ EXTRA_OEMAKE:prepend:task-install = "${PARALLEL_MAKEINST} "
 ##################################################################
 # Beware: applied last to first
 DEBUG_PREFIX_MAP ?= "-fcanon-prefix-map \
- -fmacro-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
- -fdebug-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
- -fmacro-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
- -fdebug-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+ -fmacro-prefix-map=${S}=/usr/src/debug/${PN}/${PV} \
+ -fdebug-prefix-map=${S}=/usr/src/debug/${PN}/${PV} \
+ -fmacro-prefix-map=${B}=/usr/src/debug/${PN}/${PV} \
+ -fdebug-prefix-map=${B}=/usr/src/debug/${PN}/${PV} \
  -fdebug-prefix-map=${STAGING_DIR_HOST}= \
  -fmacro-prefix-map=${STAGING_DIR_HOST}= \
  -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
meta/recipes-core/ovmf/ovmf_git.bb +1 -1
index 6bbe21ac5c..bf67a2a4a8 100644
@@ -122,7 +122,7 @@ fix_toolchain:append:class-native() {
 # --debug-prefix-map to nasm (we carry a patch to nasm for this). The
 # tools definitions are built by ovmf-native so we need to pass this in
 # at target build time when we know the right values.
-export NASM_PREFIX_MAP = "--debug-prefix-map=${WORKDIR}=/usr/src/debug/ovmf/${EXTENDPE}${PV}-${PR}"
+export NASM_PREFIX_MAP = "--debug-prefix-map=${WORKDIR}=/usr/src/debug/ovmf/${PV}"
 export GCC_PREFIX_MAP = "${DEBUG_PREFIX_MAP} -Wno-stringop-overflow -Wno-maybe-uninitialized"
 
 GCC_VER="$(${CC} -v 2>&1 | tail -n1 | awk '{print $3}')"
meta/recipes-devtools/go/go-cross-canadian.inc +1 -1
index 45758f3361..0a72e89bbd 100644
@@ -8,7 +8,7 @@ PN = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 # it uses gcc on build machine during go-cross-canadian bootstrap, but
 # the gcc version may be old and not support option '-fmacro-prefix-map'
 # which is one of default values of DEBUG_PREFIX_MAP
-DEBUG_PREFIX_MAP = "-fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+DEBUG_PREFIX_MAP = "-fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${PV} \
                     -fdebug-prefix-map=${STAGING_DIR_HOST}= \
                     -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
                     "
meta/recipes-devtools/rust/cargo_1.70.0.bb +1 -1
index a5c1064106..9a23ba9d5f 100644
@@ -19,7 +19,7 @@ CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor"
 
 inherit cargo pkgconfig
 
-DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${RUSTSRC}/vendor=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
+DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${RUSTSRC}/vendor=/usr/src/debug/${PN}/${PV}"
 
 do_cargo_setup_snapshot () {
 	${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig
meta/recipes-extended/acpica/acpica_20230628.bb +1 -1
index b7921516a2..8ca1f0892f 100644
@@ -36,7 +36,7 @@ EXTRA_OEMAKE = "CC='${CC}' \
                 INSTALLDIR=${bindir} \
                 INSTALLFLAGS= \
                 YACC=bison \
-                YFLAGS='-y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' \
+                YFLAGS='-y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${PV}' \
                 "
 
 do_install() {
meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb +1 -1
index 99ed82dac4..ca1910966e 100644
@@ -24,7 +24,7 @@ RCONFLICTS:${PN} += "jpeg"
 
 inherit cmake pkgconfig
 
-export NASMENV = "--reproducible --debug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
+export NASMENV = "--reproducible --debug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${PV}"
 
 # Add nasm-native dependency consistently for all build arches is hard
 EXTRA_OECMAKE:append:class-native = " -DWITH_SIMD=False"
meta/recipes-kernel/perf/perf.bb +1 -1
index a90acd55ef..dee8b50b31 100644
@@ -98,7 +98,7 @@ EXTRA_OEMAKE = '\
     AR="${AR}" \
     LD="${LD}" \
     EXTRA_CFLAGS="-ldw -I${S}" \
-    YFLAGS='-y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' \
+    YFLAGS='-y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${PV}' \
     EXTRA_LDFLAGS="${PERF_EXTRA_LDFLAGS}" \
     perfexecdir=${libexecdir} \
     NO_GTK2=1 \
meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb +1 -1
index e65f80d64b..0ad2f80217 100644
@@ -151,7 +151,7 @@ do_configure() {
     export TMPDIR="${B}/tmp"
     mkdir -p ${B}/tmp
     ${S}/configure ${EXTRA_OECONF}
-    sed -i -e "s,^X86ASMFLAGS=.*,& --debug-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} --debug-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR},g" ${B}/ffbuild/config.mak
+    sed -i -e "s,^X86ASMFLAGS=.*,& --debug-prefix-map=${S}=/usr/src/debug/${PN}/${PV} --debug-prefix-map=${B}=/usr/src/debug/${PN}/${PV},g" ${B}/ffbuild/config.mak
 }
 
 # patch out build host paths for reproducibility
Signature · 11 lines
2.42.1



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190461): https://lists.openembedded.org/g/openembedded-core/message/190461
Mute This Topic: https://lists.openembedded.org/mt/102557173/3617179
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

Hello,

thanks, I've reproduced the issue and added additional fix for perf (and few other recipes), will send updated series after more local testing.

Cheers,

Quoted 224 lines · Alexandre Belloni

Hello Martin,

The perf change uncovers:

https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/8098/steps/12/logs/warnings

https://autobuilder.yoctoproject.org/typhoon/#/builders/59/builds/8056/steps/12/logs/warnings

And many more

Quoted 18 lines · Martin Jansa

* ${EXTENDPE} and ${PR} was already dropped from ${WORKDIR} in:
https://lists.openembedded.org/g/openembedded-core/message/185818
adjust -fmacro-prefix-map and -fdebug-prefix-map similarly. As we don't depend on PR in WORKDIR maybe we don't need it in /usr/src/debug paths as well anymore.

* The interesting side-effect of this is that for DISTROs which still use PR (e.g. webOS OSE), the difference in -fdebug-prefix-map causes all binaries to be slightly different when rebuilt with different PR (due to this path, even when otherwise they are binary reproducible) and when the number of digits in PR changes (e.g. from r9 to r10) it also results in slightly bigger binaries (and more unnecessary changes in buildhistory diffs).

For example this foo binary, the difference between "new" and "old" is extra patch applied in SRC_URI (which doesn't affect the foo binary, but was the reason for PR bump).

Quoted 5 lines

And the binary is bigger with r10, identical with r6 and slightly different due to debug-prefix-map between r6 and r7:

  $ ls -la 1.0.0-175-*/image/usr/sbin/foo
  -rwxr-xr-x 1 bitbake bitbake 30182460 Nov  8 08:29

1.0.0-175-new-r10/image/usr/sbin/foo

Quoted 1 line

-rwxr-xr-x 1 bitbake bitbake 30182224 Nov 8 08:02

1.0.0-175-new-r6/image/usr/sbin/foo

Quoted 1 line

-rwxr-xr-x 1 bitbake bitbake 30182224 Nov 8 07:49

1.0.0-175-new-r7/image/usr/sbin/foo

Quoted 1 line

-rwxr-xr-x 1 bitbake bitbake 30182224 Nov 8 07:39

1.0.0-175-old-r6/image/usr/sbin/foo

Quoted 11 lines
  $ md5sum 1.0.0-175-*/image/usr/sbin/foo
  8e3ab67d596f8cc2f9c6320dab10af01  1.0.0-175-new-r10/image/usr/sbin/foo
  f6ff1e64fe6affb9ba0d8f278cf7ed79  1.0.0-175-new-r6/image/usr/sbin/foo
  6469a0b10aac233911e63c5ea97b03c0  1.0.0-175-new-r7/image/usr/sbin/foo
  f6ff1e64fe6affb9ba0d8f278cf7ed79  1.0.0-175-old-r6/image/usr/sbin/foo

---
v2: shorten to summary to fix:
FAIL: test shortlog length: Edit shortlog so that it is 90 characters or

less (currently 140 characters) (test_mbox.TestMbox.test_shortlog_length)

meta/conf/bitbake.conf EXTRA_OEMAKE:prepend:task-install =

Quoted 16 lines
 meta/conf/bitbake.conf                            | 8 ++++----
 meta/recipes-core/ovmf/ovmf_git.bb                | 2 +-
 meta/recipes-devtools/go/go-cross-canadian.inc    | 2 +-
 meta/recipes-devtools/rust/cargo_1.70.0.bb        | 2 +-
 meta/recipes-extended/acpica/acpica_20230628.bb   | 2 +-
 meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb | 2 +-
 meta/recipes-kernel/perf/perf.bb                  | 2 +-
 meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb      | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)
meta/conf/bitbake.conf +0 -0
index 67ff769046..3836a389b8 100644
@@ -648,10 +648,10 @@ EXTRA_OEMAKE:prepend:task-install =

"${PARALLEL_MAKEINST} "

Review

Quoted 15 lines
meta/conf/bitbake.conf +4 -4
 ##################################################################
 # Beware: applied last to first
 DEBUG_PREFIX_MAP ?= "-fcanon-prefix-map \
- -fmacro-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
- -fdebug-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
- -fmacro-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
- -fdebug-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+ -fmacro-prefix-map=${S}=/usr/src/debug/${PN}/${PV} \
+ -fdebug-prefix-map=${S}=/usr/src/debug/${PN}/${PV} \
+ -fmacro-prefix-map=${B}=/usr/src/debug/${PN}/${PV} \
+ -fdebug-prefix-map=${B}=/usr/src/debug/${PN}/${PV} \
  -fdebug-prefix-map=${STAGING_DIR_HOST}= \
  -fmacro-prefix-map=${STAGING_DIR_HOST}= \
  -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
(quoted diff) +0 -0

b/meta/recipes-core/ovmf/ovmf_git.bb

meta/recipes-core/ovmf/ovmf_git.bb fix_toolchain:append:class-native() { · line 125

Quoted 8 lines

index 6bbe21ac5c..bf67a2a4a8 100644

meta/recipes-core/ovmf/ovmf_git.bb +0 -1
@@ -122,7 +122,7 @@ fix_toolchain:append:class-native() {
 # --debug-prefix-map to nasm (we carry a patch to nasm for this). The
 # tools definitions are built by ovmf-native so we need to pass this in
 # at target build time when we know the right values.
-export NASM_PREFIX_MAP =

"--debug-prefix-map=${WORKDIR}=/usr/src/debug/ovmf/${EXTENDPE}${PV}-${PR}"

meta/recipes-core/ovmf/ovmf_git.bb fix_toolchain:append:class-native() { · line 125

Quoted 1 line
meta/recipes-core/ovmf/ovmf_git.bb +1 -0
+export NASM_PREFIX_MAP =

"--debug-prefix-map=${WORKDIR}=/usr/src/debug/ovmf/${PV}"

meta/recipes-core/ovmf/ovmf_git.bb fix_toolchain:append:class-native() { · line 126

Quoted 1 line
meta/recipes-core/ovmf/ovmf_git.bb +0 -0
 export GCC_PREFIX_MAP = "${DEBUG_PREFIX_MAP} -Wno-stringop-overflow

-Wno-maybe-uninitialized"

Review

Quoted 3 lines
meta/recipes-core/ovmf/ovmf_git.bb +0 -0
 GCC_VER="$(${CC} -v 2>&1 | tail -n1 | awk '{print $3}')"
(quoted diff) +0 -0

b/meta/recipes-devtools/go/go-cross-canadian.inc

meta/recipes-devtools/go/go-cross-canadian.inc PN = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}" · line 11

Quoted 8 lines

index 45758f3361..0a72e89bbd 100644

meta/recipes-devtools/go/go-cross-canadian.inc +0 -1
@@ -8,7 +8,7 @@ PN = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 # it uses gcc on build machine during go-cross-canadian bootstrap, but
 # the gcc version may be old and not support option '-fmacro-prefix-map'
 # which is one of default values of DEBUG_PREFIX_MAP
-DEBUG_PREFIX_MAP =

"-fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \

meta/recipes-devtools/go/go-cross-canadian.inc PN = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}" · line 11

Quoted 1 line
meta/recipes-devtools/go/go-cross-canadian.inc +1 -0
+DEBUG_PREFIX_MAP =

"-fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${PV} \

Review

Quoted 4 lines
meta/recipes-devtools/go/go-cross-canadian.inc +0 -0
                     -fdebug-prefix-map=${STAGING_DIR_HOST}= \
                     -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
                     "
(quoted diff) +0 -0

b/meta/recipes-devtools/rust/cargo_1.70.0.bb

meta/recipes-devtools/rust/cargo_1.70.0.bb CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor" · line 22

Quoted 8 lines

index a5c1064106..9a23ba9d5f 100644

meta/recipes-devtools/rust/cargo_1.70.0.bb +0 -1
@@ -19,7 +19,7 @@ CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor"
 
 inherit cargo pkgconfig
 
-DEBUG_PREFIX_MAP +=

"-fdebug-prefix-map=${RUSTSRC}/vendor=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"

meta/recipes-devtools/rust/cargo_1.70.0.bb CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor" · line 22

Quoted 1 line
meta/recipes-devtools/rust/cargo_1.70.0.bb +1 -0
+DEBUG_PREFIX_MAP +=

"-fdebug-prefix-map=${RUSTSRC}/vendor=/usr/src/debug/${PN}/${PV}"

meta/recipes-devtools/rust/cargo_1.70.0.bb CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor" · line 24

Quoted 3 lines
meta/recipes-devtools/rust/cargo_1.70.0.bb +0 -0
 do_cargo_setup_snapshot () {
      ${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh

--prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig

Review

Quoted 1 line
(quoted diff) +0 -0

b/meta/recipes-extended/acpica/acpica_20230628.bb

meta/recipes-extended/acpica/acpica_20230628.bb EXTRA_OEMAKE = "CC='${CC}' \ · line 39

Quoted 8 lines

index b7921516a2..8ca1f0892f 100644

meta/recipes-extended/acpica/acpica_20230628.bb +0 -1
@@ -36,7 +36,7 @@ EXTRA_OEMAKE = "CC='${CC}' \
                 INSTALLDIR=${bindir} \
                 INSTALLFLAGS= \
                 YACC=bison \
-                YFLAGS='-y

--file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' \

meta/recipes-extended/acpica/acpica_20230628.bb EXTRA_OEMAKE = "CC='${CC}' \ · line 39

Quoted 1 line
meta/recipes-extended/acpica/acpica_20230628.bb +1 -0
+                YFLAGS='-y

--file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${PV}' \

Review

Quoted 4 lines
meta/recipes-extended/acpica/acpica_20230628.bb +0 -0
                 "
 
 do_install() {
(quoted diff) +0 -0

b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb

meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb RCONFLICTS:${PN} += "jpeg" · line 27

Quoted 8 lines

index 99ed82dac4..ca1910966e 100644

meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb +0 -1
@@ -24,7 +24,7 @@ RCONFLICTS:${PN} += "jpeg"
 
 inherit cmake pkgconfig
 
-export NASMENV = "--reproducible

--debug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"

meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb RCONFLICTS:${PN} += "jpeg" · line 27

Quoted 1 line
meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb +1 -0
+export NASMENV = "--reproducible

--debug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${PV}"

Review

Quoted 4 lines
meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.1.bb +0 -0
 # Add nasm-native dependency consistently for all build arches is hard
 EXTRA_OECMAKE:append:class-native = " -DWITH_SIMD=False"
(quoted diff) +0 -0

b/meta/recipes-kernel/perf/perf.bb

meta/recipes-kernel/perf/perf.bb EXTRA_OEMAKE = '\ · line 101

Quoted 8 lines

index a90acd55ef..dee8b50b31 100644

meta/recipes-kernel/perf/perf.bb +0 -1
@@ -98,7 +98,7 @@ EXTRA_OEMAKE = '\
     AR="${AR}" \
     LD="${LD}" \
     EXTRA_CFLAGS="-ldw -I${S}" \
-    YFLAGS='-y

--file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' \

meta/recipes-kernel/perf/perf.bb EXTRA_OEMAKE = '\ · line 101

Quoted 1 line
meta/recipes-kernel/perf/perf.bb +1 -0
+    YFLAGS='-y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${PV}'

\

Review

Quoted 4 lines
meta/recipes-kernel/perf/perf.bb +0 -0
     EXTRA_LDFLAGS="${PERF_EXTRA_LDFLAGS}" \
     perfexecdir=${libexecdir} \
     NO_GTK2=1 \
(quoted diff) +0 -0

b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb

meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb do_configure() { · line 154

Quoted 8 lines

index e65f80d64b..0ad2f80217 100644

meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb +0 -1
@@ -151,7 +151,7 @@ do_configure() {
     export TMPDIR="${B}/tmp"
     mkdir -p ${B}/tmp
     ${S}/configure ${EXTRA_OECONF}
-    sed -i -e "s,^X86ASMFLAGS=.*,&

--debug-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} --debug-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR},g" ${B}/ffbuild/config.mak

meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb do_configure() { · line 154

Quoted 1 line
meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb +1 -0
+    sed -i -e "s,^X86ASMFLAGS=.*,&

--debug-prefix-map=${S}=/usr/src/debug/${PN}/${PV} --debug-prefix-map=${B}=/usr/src/debug/${PN}/${PV},g" ${B}/ffbuild/config.mak

Quoted 11 lines
meta/recipes-multimedia/ffmpeg/ffmpeg_6.0.bb +0 -1
 }
 
 # patch out build host paths for reproducibility
--

2.42.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#190461):

https://lists.openembedded.org/g/openembedded-core/message/190461

Quoted 3 lines

Mute This Topic: https://lists.openembedded.org/mt/102557173/3617179
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [

[email protected]]

Quoted 2 lines

-=-=-=-=-=-=-=-=-=-=-=-

--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com