[Buildroot] [PATCH 19/21 RFC] core/apply-patches: store full path of applied patches
Yann E. MORIN
yann.morin.1998 at free.fr
Mon Nov 16 22:47:14 UTC 2015
Currently, we only store the filename of the applied patches.
However, we are soon to want to install those ptches in the legal-info
directory, so we'll have to know where those patches come from.
Instead of duplicating the logic to find the patches, just store the
full path to each of those patches so we can retrieve them more easily
later on.
Also always create the list-file, even if empty, so that we need not
test for its existence before reading it.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
---
support/scripts/apply-patches.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index af6df9e..3d538ba 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -64,6 +64,10 @@ find ${builddir}/ '(' -name '*.rej' -o -name '.*.rej' ')' -print0 | \
function apply_patch {
path=$1
patch=$2
+ case "${path}" in
+ /*) ;;
+ *) path="$(pwd)/${path}";;
+ esac
case "$patch" in
*.gz)
type="gzip"; uncomp="gunzip -dc"; ;;
@@ -94,7 +98,7 @@ function apply_patch {
echo "Error: missing patch file ${path}/$patch"
exit 1
fi
- echo $patch >> ${builddir}/.applied_patches_list
+ echo "${path}/${patch}" >> ${builddir}/.applied_patches_list
${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t -N $silent
if [ $? != 0 ] ; then
echo "Patch failed! Please fix ${patch}!"
@@ -130,6 +134,7 @@ function scan_patchdir {
fi
}
+touch ${builddir}/.applied_patches_list
scan_patchdir "$patchdir" "$patchpattern"
# Check for rejects...
--
1.9.1
More information about the buildroot
mailing list