mirror of
https://github.com/linuxboot/heads.git
synced 2024-12-18 20:47:55 +00:00
Incorporate architecture into directory layout
* build/ -> build/<arch>/ * crossgcc/ -> crossgcc/<arch>/ * install/ -> install/<arch>/ * packages/ -> packages/<arch>/ Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
This commit is contained in:
Sergii Dmytruk
parent
5dc06bdbf1
commit
2a44e5e7ee
@ -3,6 +3,8 @@ version: 2.1
|
||||
commands:
|
||||
build_board:
|
||||
parameters:
|
||||
arch:
|
||||
type: string
|
||||
target:
|
||||
type: string
|
||||
subcommand:
|
||||
@ -17,22 +19,22 @@ commands:
|
||||
- run:
|
||||
name: Make Board
|
||||
command: |
|
||||
rm -rf build/<<parameters.target>>/* build/log/* && make V=1 BOARD=<<parameters.target>> <<parameters.subcommand>> || touch ./tmpDir/failed_build
|
||||
rm -rf build/<<parameters.arch>>/<<parameters.target>>/* build/<<parameters.arch>>/log/* && make V=1 BOARD=<<parameters.target>> <<parameters.subcommand>> || touch ./tmpDir/failed_build
|
||||
no_output_timeout: 3h
|
||||
- run:
|
||||
name: Output hashes
|
||||
command: |
|
||||
cat build/<<parameters.target>>/hashes.txt || echo "No hashes for this build step..."\
|
||||
cat build/<<parameters.arch>>/<<parameters.target>>/hashes.txt || echo "No hashes for this build step..."\
|
||||
- run:
|
||||
name: Archiving build logs.
|
||||
command: |
|
||||
tar zcvf build/<<parameters.target>>/logs.tar.gz $(find build/ -name "*.log")
|
||||
tar zcvf build/<<parameters.arch>>/<<parameters.target>>/logs.tar.gz $(find build/ -name "*.log")
|
||||
- run:
|
||||
name: Output build failing logs
|
||||
command: |
|
||||
if [[ -f ./tmpDir/failed_build ]]; then find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1;else echo "Step hasn't failed. Continuing with next step..."; fi \
|
||||
if [[ -f ./tmpDir/failed_build ]]; then find ./build/<<parameters.arch>>/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1;else echo "Step hasn't failed. Continuing with next step..."; fi \
|
||||
- store_artifacts:
|
||||
path: build/<<parameters.target>>
|
||||
path: build/<<parameters.arch>>/<<parameters.target>>
|
||||
|
||||
jobs:
|
||||
prep_env:
|
||||
@ -115,6 +117,9 @@ jobs:
|
||||
- image: debian:11
|
||||
resource_class: large
|
||||
parameters:
|
||||
arch:
|
||||
type: string
|
||||
default: x86
|
||||
target:
|
||||
type: string
|
||||
subcommand:
|
||||
@ -123,6 +128,7 @@ jobs:
|
||||
- attach_workspace:
|
||||
at: ~/
|
||||
- build_board:
|
||||
arch: <<parameters.arch>>
|
||||
target: <<parameters.target>>
|
||||
subcommand: <<parameters.subcommand>>
|
||||
- persist_to_workspace:
|
||||
@ -135,6 +141,9 @@ jobs:
|
||||
- image: debian:11
|
||||
resource_class: large
|
||||
parameters:
|
||||
arch:
|
||||
type: string
|
||||
default: x86
|
||||
target:
|
||||
type: string
|
||||
subcommand:
|
||||
@ -143,6 +152,7 @@ jobs:
|
||||
- attach_workspace:
|
||||
at: ~/
|
||||
- build_board:
|
||||
arch: <<parameters.arch>>
|
||||
target: <<parameters.target>>
|
||||
subcommand: <<parameters.subcommand>>
|
||||
|
||||
@ -159,7 +169,7 @@ jobs:
|
||||
key: heads-musl-cross-{{ checksum "./tmpDir/musl-cross.sha256sums" }}{{ .Environment.CACHE_VERSION }}
|
||||
paths:
|
||||
- crossgcc
|
||||
- build/musl-cross-38e52db8358c043ae82b346a2e6e66bc86a53bc1
|
||||
- build/x86/musl-cross-38e52db8358c043ae82b346a2e6e66bc86a53bc1
|
||||
- packages
|
||||
- save_cache:
|
||||
#Generate cache for the same coreboot mnd musl-cross-make modules definition if hash is not previously existing
|
||||
@ -167,12 +177,12 @@ jobs:
|
||||
key: heads-coreboot-musl-cross-{{ checksum "./tmpDir/coreboot_musl-cross.sha256sums" }}{{ .Environment.CACHE_VERSION }}
|
||||
paths:
|
||||
- crossgcc
|
||||
- build/musl-cross-38e52db8358c043ae82b346a2e6e66bc86a53bc1
|
||||
- build/x86/musl-cross-38e52db8358c043ae82b346a2e6e66bc86a53bc1
|
||||
- packages
|
||||
- build/coreboot-4.11
|
||||
- build/coreboot-4.13
|
||||
- build/coreboot-4.14
|
||||
- build/coreboot-4.15
|
||||
- build/x86/coreboot-4.11
|
||||
- build/x86/coreboot-4.13
|
||||
- build/x86/coreboot-4.14
|
||||
- build/x86/coreboot-4.15
|
||||
- save_cache:
|
||||
#Generate cache for the exact same modules definitions if hash is not previously existing
|
||||
key: heads-modules-and-patches-{{ checksum "./tmpDir/all_modules_and_patches.sha256sums" }}{{ .Environment.CACHE_VERSION }}
|
||||
|
||||
20
Makefile
20
Makefile
@ -20,21 +20,18 @@ all:
|
||||
|
||||
modules-y :=
|
||||
pwd := $(shell pwd)
|
||||
packages := $(pwd)/packages
|
||||
build := $(pwd)/build
|
||||
config := $(pwd)/config
|
||||
INSTALL := $(pwd)/install
|
||||
log_dir := $(build)/log
|
||||
# This is dynamic, must not expand right here
|
||||
# These are dynamic, must not expand right here
|
||||
build = $(pwd)/build/$(CONFIG_TARGET_ARCH)
|
||||
packages = $(pwd)/packages/$(CONFIG_TARGET_ARCH)
|
||||
INSTALL = $(pwd)/install/$(CONFIG_TARGET_ARCH)
|
||||
log_dir = $(build)/log
|
||||
board_build = $(build)/$(BOARD)
|
||||
|
||||
# Controls how many parallel jobs are invoked in subshells
|
||||
CPUS ?= $(shell nproc)
|
||||
MAKE_JOBS ?= -j$(CPUS) --max-load 16
|
||||
|
||||
# Create the log directory if it doesn't already exist
|
||||
BUILD_LOG := $(shell mkdir -p "$(log_dir)" )
|
||||
|
||||
WGET ?= wget
|
||||
|
||||
# Timestamps should be in ISO format
|
||||
@ -47,11 +44,18 @@ ifneq "y" "$(shell [ -r '$(CONFIG)' ] && echo y)"
|
||||
$(error $(CONFIG): board configuration does not exist)
|
||||
endif
|
||||
|
||||
# By default, we are building for x86, up to a board to change this variable
|
||||
CONFIG_TARGET_ARCH := x86
|
||||
|
||||
include $(CONFIG)
|
||||
|
||||
# Unless otherwise specified, we are building for heads
|
||||
CONFIG_HEADS ?= y
|
||||
|
||||
# Create directories if they don't already exist
|
||||
BUILD_LOG := $(shell mkdir -p "$(log_dir)")
|
||||
PACKAGES := $(shell mkdir -p "$(packages)")
|
||||
|
||||
# record the build date / git hashes and other files here
|
||||
HASHES := $(board_build)/hashes.txt
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@ musl-cross_configure := \
|
||||
/bin/echo -e >> Makefile 'musl-i386: extract_all' ; \
|
||||
/bin/echo -e >> Makefile '\t$$$$''(MAKE) TARGET=i386-linux-musl install' ; \
|
||||
|
||||
CROSS_PATH ?= $(pwd)/crossgcc
|
||||
CROSS_PATH ?= $(pwd)/crossgcc/$(CONFIG_TARGET_ARCH)
|
||||
|
||||
musl-cross_target := \
|
||||
OUTPUT="$(CROSS_PATH)" \
|
||||
|
||||
@ -43,6 +43,6 @@ pciutils_output := \
|
||||
|
||||
pciutils_libraries := \
|
||||
lib/libpci.so.3.5.4 \
|
||||
../../install/lib/libpci.so.3\
|
||||
$(INSTALL)/lib/libpci.so.3\
|
||||
|
||||
pciutils_configure :=
|
||||
|
||||
Loading…
Reference in New Issue
Block a user