From 686ad14308639b0589a2971903066f56271033e7 Mon Sep 17 00:00:00 2001 From: Tom Dewey Date: Wed, 19 Jun 2024 10:50:03 +0100 Subject: [PATCH] embedded: Change how buildroot patch is applied - Apply with p1, using a patch generated from git-format-patch. - Use POSIX 'cd' over 'pushd, popd' - Use OLDPWD to the find the patch, rather than making assumptions about the relative location of it. --- embedded/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embedded/build.sh b/embedded/build.sh index 7f9ca8e..f60b79e 100755 --- a/embedded/build.sh +++ b/embedded/build.sh @@ -7,7 +7,7 @@ BUILDROOT_TAR=buildroot-2024.02.3.tar.gz if [ ! -e "${BUILDROOT}" ]; then tar xvf "${BUILDROOT_TAR}" - pushd ${BUILDROOT} && patch -p0 < buildroot-mesa3d.patch && popd + cd "${BUILDROOT}" && patch -p1 < "${OLDPWD}/buildroot-mesa3d.patch" && cd - fi if [ ! -e "${BUILDROOT}/.config" ]; then