From 60f64b2a3f6630d61e303d143e082fb902a3c51a Mon Sep 17 00:00:00 2001 From: Joel Fernandes Date: Tue, 10 Jul 2018 09:33:13 -0700 Subject: [PATCH] bcc: use patch to apply patches Signed-off-by: Joel Fernandes --- buildstrap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildstrap b/buildstrap index d14173a..b046d20 100755 --- a/buildstrap +++ b/buildstrap @@ -64,8 +64,8 @@ if [ $INSTALL_BCC -eq 1 ]; then cp $spath/bcc/build-bcc.sh $TDIR/debian/bcc-master/; pushd $TDIR/debian/bcc-master - git am $spath/bcc/misc/0001-clang-Allow-user-to-override-kernel-version.patch - git am $spath/bcc/misc/0001-DONOT-MERGE-Remove-version-override-warnings.patch + patch -p1 < $spath/bcc/misc/0001-clang-Allow-user-to-override-kernel-version.patch + patch -p1 < $spath/bcc/misc/0001-DONOT-MERGE-Remove-version-override-warnings.patch popd fi