From 027ae39abe602a8d229746e100fbf62375563cdf Mon Sep 17 00:00:00 2001 From: Trammell hudson Date: Tue, 3 Dec 2019 10:48:10 +0100 Subject: [PATCH] modules: add module_tar_opt to allow different strip options Signed-off-by: Trammell hudson --- Makefile | 2 +- modules/coreboot | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 21e38108..c95527aa 100644 --- a/Makefile +++ b/Makefile @@ -265,7 +265,7 @@ define define_module = # that the files are all present $(build)/$($1_base_dir)/.canary: $(packages)/.$1-$($1_version)_verify mkdir -p "$$(dir $$@)" - tar -xf "$(packages)/$($1_tar)" --strip 1 -C "$$(dir $$@)" + tar -xf "$(packages)/$($1_tar)" $(or $($1_tar_opt),--strip 1) -C "$$(dir $$@)" if [ -r patches/$1-$($1_version).patch ]; then \ ( cd $$(dir $$@) ; patch -p1 ) \ < patches/$1-$($1_version).patch \ diff --git a/modules/coreboot b/modules/coreboot index b2dfec59..15441ca1 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -108,6 +108,7 @@ modules-y += coreboot-blobs coreboot-blobs_version := $(coreboot_version) coreboot-blobs_tar := coreboot-blobs-$(coreboot-blobs_version).tar.xz +coreboot-blobs_tar_opt := --strip 3 coreboot-blobs_dir := coreboot-$(coreboot-blobs_version)/3rdparty/blobs coreboot-blobs_url := https://www.coreboot.org/releases/$(coreboot-blobs_tar) coreboot-blobs_hash := 18aa509ae3af005a05d7b1e0b0246dc640249c14fc828f5144b6fd20bb10e295