ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-18 20:47:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

module ordering works, so include entire module/* directory; fix initrd/bin mkdir; correct spelling of coreboot dep on bzImage

Browse Source
This commit is contained in:
Trammell Hudson 2016-08-03 08:40:51 -04:00
parent ef9485e9bc
commit 1c64e4ce09
Failed to extract signature
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@ -6,14 +6,8 @@ config := $(pwd)/build
all: all:
include modules/qrencode
include modules/kexec include modules/*
include modules/tpmtotp
include modules/mbedtls
include modules/busybox
include modules/linux
include modules/coreboot
include modules/coreboot-blobs
all: $(modules) all: $(modules)
@ -22,7 +16,7 @@ $(foreach _, $2, $1$_)
endef endef
define outputs = define outputs =
$(call prefix,$(build)/$($1_dir)/,$($1_output)) $(foreach m,$1,$(call prefix,$(build)/$($m_dir)/,$($m_output)))
endef endef
# #
@ -41,7 +35,9 @@ define define_module =
# Unpack the tar file and touch the canary so that we know # Unpack the tar file and touch the canary so that we know
# that the files are all present # that the files are all present
$(build)/$($1_dir)/.canary: $(packages)/.$1_verify $(build)/$($1_dir)/.canary: \
$(packages)/.$1_verify \
$(call outputs,$($1_depends))
tar -xvf "$(packages)/$($1_tar)" -C "$(build)" tar -xvf "$(packages)/$($1_tar)" -C "$(build)"
touch "$$@" touch "$$@"
@ -76,7 +72,7 @@ $(foreach _, $(modules), $(eval $(call define_module,$_)))
# #
define initrd_bin = define initrd_bin =
initrd/bin/$(notdir $1): $1 initrd/bin/$(notdir $1): $1
@-mkdir "initrd/bin" @if [ ! -d initrd/bin ]; then mkdir "initrd/bin"; fi
cmp --quiet "$$@" "$$^" || \ cmp --quiet "$$@" "$$^" || \
cp -a "$$^" "$$@" cp -a "$$^" "$$@"
initrd_bins += initrd/bin/$(notdir $1) initrd_bins += initrd/bin/$(notdir $1)
@ -149,6 +145,7 @@ $(call outputs,linux): initrd.cpio
# hack for the coreboot to find the linux kernel # hack for the coreboot to find the linux kernel
$(build)/$(coreboot_dir)/bzImage: $(call outputs,linux) $(build)/$(coreboot_dir)/bzImage: $(call outputs,linux)
cmp --quiet "$$@" "$$^" || \ cmp --quiet "$@" "$^" || \
cp -a "$$^" "$$@" cp -a "$^" "$@"
$(call outputs,corebot): $(build)/$(coreboot_dir)/bzImage $(call outputs,coreboot): $(build)/$(coreboot_dir)/bzImage