diff --git a/.circleci/config.yml b/.circleci/config.yml index ec4607f41..9764c6d8c 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: @@ -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 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 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)