All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 10/16 v4] core/apply-patches: store full path of applied patches
Date: Wed,  3 Feb 2016 23:22:00 +0100	[thread overview]
Message-ID: <dee59ce3d408b1479a3c087b89c338d37d17d34d.1454536753.git.yann.morin.1998@free.fr> (raw)
In-Reply-To: <cover.1454536753.git.yann.morin.1998@free.fr>

Currently, we only store the filename of the applied patches.

However, we are soon to want to install those patches 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 (bundled,
downloaded, from a global patch dir...), 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@free.fr>
Cc: Luca Ceresoli <luca@lucaceresoli.net>
Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
[Tested only with patches in the Buildroot sources]
Tested-by: Luca Ceresoli <luca@lucaceresoli.net>

---
Changes v1 -> v2:
  - do not duplicate '/' in paths  (Luca)
---
 support/scripts/apply-patches.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 201278d..20a1552 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -63,8 +63,12 @@ find ${builddir}/ '(' -name '*.rej' -o -name '.*.rej' ')' -print0 | \
     xargs -0 -r rm -f
 
 function apply_patch {
-    path=$1
-    patch=$2
+    path="${1%%/}"
+    patch="${2}"
+    case "${path}" in
+        /*) ;;
+        *)  path="$(pwd)/${path}";;
+    esac
     if [ "$3" ]; then
         type="series"; uncomp="cat"
     else
@@ -99,7 +103,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}!"
@@ -141,6 +145,7 @@ function scan_patchdir {
     fi
 }
 
+touch ${builddir}/.applied_patches_list
 scan_patchdir "$patchdir" "$patchpattern"
 
 # Check for rejects...
-- 
1.9.1

  parent reply	other threads:[~2016-02-03 22:22 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-03 22:22 [Buildroot] [PATCH 00/16 v4] legal-info improvements and completeness (branch yem/legal-2) Yann E. MORIN
2016-02-03 22:21 ` [Buildroot] [PATCH 01/16 v4] toolchain/external: newer Linaro toolchains do not provide source code Yann E. MORIN
2016-02-03 22:46   ` Thomas Petazzoni
2016-02-03 22:21 ` [Buildroot] [PATCH 02/16 v4] toolchain/external: add hashes for actual sources Yann E. MORIN
2016-02-03 22:21 ` [Buildroot] [PATCH 03/16 v4] core/pkg-utils: add macro to hardlink-or-copy Yann E. MORIN
2016-02-12 22:28   ` Luca Ceresoli
2016-02-12 22:46     ` Yann E. MORIN
2016-02-12 22:57       ` Arnout Vandecappelle
2016-02-12 22:58       ` Yann E. MORIN
2016-02-03 22:21 ` [Buildroot] [PATCH 04/16 v4] core/legal-info: use the macro to install source archives Yann E. MORIN
2016-02-03 22:21 ` [Buildroot] [PATCH 05/16 v4] core/pkg-generic: reorder variables definitions for legal-info Yann E. MORIN
2016-02-11 22:22   ` Luca Ceresoli
2016-02-03 22:21 ` [Buildroot] [PATCH 06/16 v4] core/legal-info: ensure legal-info works in off-line mode Yann E. MORIN
2016-02-03 23:35   ` Yann E. MORIN
2016-02-12 13:00   ` Luca Ceresoli
2016-02-03 22:21 ` [Buildroot] [PATCH 07/16 v4] core/pkg-generic: add variable to store the package rawname-version Yann E. MORIN
2016-02-03 22:21 ` [Buildroot] [PATCH 08/16 v4] core/legal-info: install source archives in their own sub-dir Yann E. MORIN
2016-02-03 22:21 ` [Buildroot] [PATCH 09/16 v4] core/legal-info: add package version to license directory Yann E. MORIN
2016-02-03 22:22 ` Yann E. MORIN [this message]
2016-02-03 22:22 ` [Buildroot] [PATCH 11/16 v4] core/legal-info: also save patches Yann E. MORIN
2016-03-04 23:45   ` Luca Ceresoli
2016-03-06 10:25     ` Yann E. MORIN
2016-02-03 22:22 ` [Buildroot] [PATCH 12/16 v4] core/legal-info: renumber saved patches Yann E. MORIN
2016-02-03 22:22 ` [Buildroot] [PATCH 13/16 v4] core/legal-info: also save extra downloads Yann E. MORIN
2016-02-03 22:22 ` [Buildroot] [PATCH 14/16 v4] core/legal-info: generate a hash of all saved files Yann E. MORIN
2016-02-03 22:22 ` [Buildroot] [PATCH 15/16 v4] core/legal-info: allow ignoring packages from the legal-info Yann E. MORIN
2016-02-03 22:22 ` [Buildroot] [PATCH 16/16 v4] core/pkg-virtual: ignore from legal-info output Yann E. MORIN
2016-02-14 23:00   ` Luca Ceresoli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=dee59ce3d408b1479a3c087b89c338d37d17d34d.1454536753.git.yann.morin.1998@free.fr \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.