Skip to content

build: inherit logging in base.bbclass; drop redundant per-recipe inherits #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daniel-rossier merged 1 commit into from
Jul 16, 2026
Merged

build: inherit logging in base.bbclass; drop redundant per-recipe inherits #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build/meta-bsp/classes/bsp.bbclass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ addtask do_render_its before do_itb
# This is the uEnv.txt file related to U-boot depending on the BSP
IB_UENV = "${FILE_DIRNAME}/files/uEnv_${IB_PLATFORM}.txt"

inherit logging
inherit filesystem

# Platform boot chain — produces the bootloader-side artefacts (flash0.img
Expand Down
1 change: 0 additions & 1 deletion build/meta-bsp/recipes-bsp/capsule/bsp-capsules_1.0.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ PR = "r0"

inherit filesystem
inherit uboot
inherit logging
inherit bsp

# Capsules reuse the SO3 ITS templates (e.g. <plat>_capsule.its)
Expand Down
1 change: 0 additions & 1 deletion build/meta-bsp/recipes-bsp/linux/bsp-linux_1.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ PR = "r0"

inherit filesystem
inherit linux
inherit logging
inherit bsp
inherit uboot
inherit atf
Expand Down
1 change: 0 additions & 1 deletion build/meta-bsp/recipes-bsp/so3/bsp-so3_1.0.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ PR = "r0"

inherit filesystem
inherit uboot
inherit logging
inherit bsp

# ITS templates live in the layer (rendered into IB_ITB_PATH by do_itb)
Expand Down
1 change: 0 additions & 1 deletion build/meta-filesystem/classes/filesystem.bbclass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#
###################################################################

inherit logging
inherit utils
inherit fs_${IB_PLATFORM}

Expand Down
1 change: 0 additions & 1 deletion build/meta-filesystem/classes/fs_verdin-imx8mp.bbclass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
# The caller (deploy.sh / build.sh / mount.sh / umount.sh) is expected
# to have opened a sudo session beforehand.

inherit logging
inherit utils

IB_FILESYSTEM_PATH = "${IB_DIR}/filesystem"
Expand Down
1 change: 0 additions & 1 deletion build/meta-filesystem/recipes-filesystem/generic/filesystem_1.0.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ PV = "1.0.0"
PR = "r0"

inherit filesystem
inherit logging

do_configure[noexec] = "1"
do_attach_infrabase[noexec] = "1"
Expand Down
1 change: 0 additions & 1 deletion build/meta-linux/classes/linux.bbclass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

# Class of Linux layer

inherit logging

IB_LINUX_PATH = "${IB_DIR}/linux/linux"

Expand Down
1 change: 0 additions & 1 deletion build/meta-rootfs/recipes-rootfs/buildroot/buildroot_2024.11.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ PV = "2024.11"

OVERRIDES += ":linux"

inherit logging
inherit rootfs

SRC_URI = "https://buildroot.org/downloads/buildroot-2024.11.tar.gz;protocol=https"
Expand Down
1 change: 0 additions & 1 deletion build/meta-uboot/recipes-uboot/uboot/uboot_2024.07.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ inherit filesystem
inherit uboot
inherit bsp
inherit atf
inherit logging

SRCREV = "3f772959501c99fbe5aa0b22a36efe3478d1ae1c"
SRC_URI = "git://gitlab.com/u-boot/u-boot.git;nobranch=1;protocol=https"
Expand Down
1 change: 0 additions & 1 deletion build/meta-usr/classes/usr.bbclass
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (c) 2025-2026 EDGEMTech SA

inherit filesystem
inherit logging
inherit rootfs

# Class for managing the user space environment
Expand Down
6 changes: 3 additions & 3 deletions build/meta/classes/base.bbclass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# SPDX-License-Identifier: MIT
#

inherit logging
inherit patch
inherit utils

Expand Down Expand Up @@ -205,10 +206,9 @@ do_attach_infrabase () {
if [ -d "${IB_TARGET}" ] && [ -f "$ib_manifest" ] && [ "${IB_FORCE_ATTACH}" != "1" ]; then
ib_dirty=$(cd "${IB_TARGET}" && LC_ALL=C sha256sum -c --quiet "$ib_manifest" 2>/dev/null | sed -n 's/: FAILED.*$//p')
if [ -n "$ib_dirty" ]; then
echo "WARNING: Local modifications detected in ${IB_TARGET}, not captured in the ${PN} patch set:" >&2
bbwarn "Local modifications detected in ${IB_TARGET}, not captured in the ${PN} patch set:"
echo "$ib_dirty" | sed 's|^\./| |' >&2
echo "ERROR: Refusing to re-attach ${PN} (would overwrite the files above). Run 'bitbake ${PN} -c updiff' to fold them into the patch set, or set IB_FORCE_ATTACH=1 to discard them and re-attach (prior tree is kept in ${IB_TARGET}.back)." >&2
exit 1
bbfatal "Refusing to re-attach ${PN} (would overwrite the files above). Run 'bitbake ${PN} -c updiff' to fold them into the patch set, or set IB_FORCE_ATTACH=1 to discard them and re-attach (prior tree is kept in ${IB_TARGET}.back)."
fi
fi

Expand Down
Loading