diff --git a/buildscript b/buildscript index 098a70db..306b91fd 100755 --- a/buildscript +++ b/buildscript @@ -131,10 +131,9 @@ prepare() { patch_target - # set the variant for this build - cp "./src/packages/fff/fff/variant-$(cat selected_variant).mk" "$builddir"/variant.mk - # force the reevaluation of this Makefile to make note of the new variant - touch ./src/packages/fff/fff/Makefile + # apply variant to ensure the included file "variant.mk" + # exists in builddir. + apply_variant #saves ~200MB for each build test -d ./src/dl || mkdir ./src/dl @@ -143,6 +142,13 @@ prepare() { update_feeds } +apply_variant() { + # set the variant for this build + cp "./src/packages/fff/fff/variant-$(cat selected_variant).mk" "$builddir"/variant.mk + # force the reevaluation of this Makefile to make note of the new variant + touch ./src/packages/fff/fff/Makefile +} + update_feeds() { ## generate own feeds.conf #this local variable should be globally configure variable used in get_source and here @@ -177,6 +183,8 @@ update_feeds() { } prebuild() { + apply_variant + #create filesdir for our config /bin/rm -rf "$builddir"/files mkdir "$builddir"/files