diff --git a/blueprints/fs-7.2.2-p373r-avx2/000.bash b/blueprints/fs-7.2.2-p373r-avx2/000.bash new file mode 100644 index 0000000000..3bb5dd4968 --- /dev/null +++ b/blueprints/fs-7.2.2-p373r-avx2/000.bash @@ -0,0 +1,16 @@ +#!/bin/bash + +avx2_nunja_dir=${nunja_dir/p373r-/} + +pushd $nunja_dir + # clone avx2 blueprint + /usr/bin/find $avx2_nunja_dir/ -maxdepth 1 -type f ! -name 000.bash -exec cp -av {} ./ \; +popd + +# source the original 000.bash +. ${avx2_nunja_dir}/000.bash + +# and p373r-ify it +rm -vf repo/p373r +ls -l repo/ +ht-ln repo/p373r-vrmod/p373r repo/p373r diff --git a/util/build.sh b/util/build.sh index ae1ceab7af..e587bb07ca 100755 --- a/util/build.sh +++ b/util/build.sh @@ -139,6 +139,10 @@ function 039_provision_p373r() {( $_dbgopts; patch --directory=newview --ignore-whitespace --verbose --merge -p1 < $p373r_dir/0001-sgeo_min_vr_7.1.9-baseline-diff.patch applied=0001-sgeo_min_vr_7.1.9-baseline-diff.patch fi + if patch --directory=newview --dry-run --ignore-whitespace --verbose --merge -p1 < $p373r_dir/0001-P373R-7.2.2-baseline-diff.patch > /dev/null ; then + patch --directory=newview --ignore-whitespace --verbose --merge -p1 < $p373r_dir/0001-P373R-7.2.2-baseline-diff.patch + applied=0001-P373R-7.2.2-baseline-diff.patch + fi if patch --directory=newview --dry-run --ignore-whitespace --verbose --merge -p1 < $p373r_dir/0001-P373R-6.6.8-baseline-diff.patch > /dev/null ; then patch --directory=newview --ignore-whitespace --verbose --merge -p1 < $p373r_dir/0001-P373R-6.6.8-baseline-diff.patch applied=0001-P373R-6.6.8-baseline-diff.patch