From de80fda4d9a58ce0ab06b26fd900fc5cc7ebc60c Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Fri, 2 May 2025 13:42:14 -0400 Subject: [PATCH 1/3] Bump nix develop based docker image to tlaurion/heads-dev-env:v0.2.5 : we add procps+psmisc in flake.nix to be able to troubleshoot processes and /proc related info from docker image Signed-off-by: Thierry Laurion --- .circleci/config.yml | 8 ++++---- flake.nix | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ec4607f41..86efe02b3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,7 +48,7 @@ commands: jobs: prep_env: docker: - - image: tlaurion/heads-dev-env:v0.2.4 + - image: tlaurion/heads-dev-env:v0.2.5 resource_class: large working_directory: ~/heads steps: @@ -122,7 +122,7 @@ jobs: build_and_persist: docker: - - image: tlaurion/heads-dev-env:v0.2.4 + - image: tlaurion/heads-dev-env:v0.2.5 resource_class: large working_directory: ~/heads parameters: @@ -150,7 +150,7 @@ jobs: build: docker: - - image: tlaurion/heads-dev-env:v0.2.4 + - image: tlaurion/heads-dev-env:v0.2.5 resource_class: large working_directory: ~/heads parameters: @@ -171,7 +171,7 @@ jobs: save_cache: docker: - - image: tlaurion/heads-dev-env:v0.2.4 + - image: tlaurion/heads-dev-env:v0.2.5 resource_class: large working_directory: ~/heads steps: diff --git a/flake.nix b/flake.nix index bee186b05..ba0afa9cd 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ autoconf automake bashInteractive - coreutils + coreutils #basic tools like ls, cp, mv, kill) bc bison # Generate flashmap descriptor parser bzip2 @@ -58,6 +58,8 @@ patch perl pkg-config + procps #process tools like free, pidof, pkill, top, vmstat, watch, etc + psmisc #process tools like killall, pstree, etc python3 # me_cleaner, coreboot rsync # coreboot sharutils From 59ade6981763ef77170b0ce5c29f7cfa1753858f Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Fri, 2 May 2025 14:47:23 -0400 Subject: [PATCH 2/3] CircleCI: fix prep_env changing x230-hotp-maximized step for building musl-cross-make from x230 to t480 (t480 is part of save_cache, not x230...) Signed-off-by: Thierry Laurion --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 86efe02b3..9764c6d8c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -219,7 +219,7 @@ workflows: # This step builds musl-cross-make for x86 architecture, which will be used by subsequent x86 board builds - build_and_persist: name: x86-musl-cross-make - target: x230-hotp-maximized + target: t480-hotp-maximized subcommand: "musl-cross-make" requires: - prep_env From 4eb038c7cc0dc3697f6efa711a0e79daf986118c Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Fri, 2 May 2025 15:26:51 -0400 Subject: [PATCH 3/3] modules/musl-cross-make: use $(MAKE) correctly at configure step (what generating error since $$$$(MAKE) was resolved to MAKE in configure.log, but was still working correctly) See: https://app.circleci.com/pipelines/github/tlaurion/heads/3314/workflows/e588480d-d13a-49e0-a1b6-78fed839b70b/jobs/67601?invite=true#step-102-1420_53 Signed-off-by: Thierry Laurion --- modules/musl-cross-make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/musl-cross-make b/modules/musl-cross-make index f10a159e7..e4662e8ba 100644 --- a/modules/musl-cross-make +++ b/modules/musl-cross-make @@ -35,7 +35,7 @@ else # No need to build i386 for x86 since coreboot uses its own compiler musl-cross-make_configure := \ echo -e >> Makefile 'musl-target:' ; \ - echo -e >> Makefile '\t$$$$(MAKE) TARGET="$(MUSL_ARCH)-linux-musl" install' ; + echo -e >> Makefile '\t$$(MAKE) TARGET="$(MUSL_ARCH)-linux-musl" install' ; CROSS_PATH ?= $(pwd)/crossgcc/$(CONFIG_TARGET_ARCH)