Patchwork [6/9] manual: minor fix in patch-policy.txt

login
register
mail settings
Submitter Samuel Martin
Date Feb. 13, 2013, 10:59 p.m.
Message ID <28331a810710249524be2ea3a286fff996ead804.1360795941.git.s.martin49@gmail.com>
Download mbox | patch
Permalink /patch/220295/
State Accepted
Headers show

Comments

Samuel Martin - Feb. 13, 2013, 10:59 p.m.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 docs/manual/patch-policy.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Arnout Vandecappelle - Feb. 14, 2013, 7:06 a.m.
On 13/02/13 23:59, Samuel Martin wrote:
>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>


> ---
>   docs/manual/patch-policy.txt | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt
> index 78ac5b6..468a954 100644
> --- a/docs/manual/patch-policy.txt
> +++ b/docs/manual/patch-policy.txt
> @@ -34,7 +34,7 @@ Most patches are provided within Buildroot, in the package
>   directory; these typically aim to fix cross-compilation, libc support,
>   or other such issues.
>
> -These patch files should be named +<packagename>-*.patch+.
> +These patch files should be named +<packagename>-<description>.patch+.
>
>   A +series+ file, as used by +quilt+, may also be added in the
>   package directory. In that case, the +series+ file defines the patch
> @@ -57,8 +57,8 @@ How patches are applied
>     applied according to the +series+ file;
>   +
>   * Otherwise, patch files matching `<packagename>-*.patch` or
> -  `<packagename>-*.patch.<arch>` (where +<arch>+ is the architecture
> -  name) are applied following the +ls+ command order.
> +  `<packagename>-<description>.patch.<arch>` (where +<arch>+ is the
> +  architecture name) are applied following the +ls+ command order.
>
>   . Run the +<packagename>_POST_PATCH_HOOKS+ commands if defined.
>
>
Thomas Petazzoni - Feb. 14, 2013, 5:37 p.m.
Dear Samuel Martin,

On Wed, 13 Feb 2013 23:59:07 +0100, Samuel Martin wrote:
> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
>  docs/manual/patch-policy.txt | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt
> index 78ac5b6..468a954 100644
> --- a/docs/manual/patch-policy.txt
> +++ b/docs/manual/patch-policy.txt
> @@ -34,7 +34,7 @@ Most patches are provided within Buildroot, in the package
>  directory; these typically aim to fix cross-compilation, libc support,
>  or other such issues.
>  
> -These patch files should be named +<packagename>-*.patch+.
> +These patch files should be named +<packagename>-<description>.patch+.
>  
>  A +series+ file, as used by +quilt+, may also be added in the
>  package directory. In that case, the +series+ file defines the patch
> @@ -57,8 +57,8 @@ How patches are applied
>    applied according to the +series+ file;
>  +
>  * Otherwise, patch files matching `<packagename>-*.patch` or
> -  `<packagename>-*.patch.<arch>` (where +<arch>+ is the architecture
> -  name) are applied following the +ls+ command order.
> +  `<packagename>-<description>.patch.<arch>` (where +<arch>+ is the
> +  architecture name) are applied following the +ls+ command order.

The <packagename>-<description>.patch.<arch> naming is deprecated, and
I think should no longer be mentioned in the documentation.

Best regards,

Thomas
Peter Korsgaard - Feb. 17, 2013, 9:54 p.m.
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Committed with the .patch.<arch> part dropped as mentioned by Thomas.

Patch

diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt
index 78ac5b6..468a954 100644
--- a/docs/manual/patch-policy.txt
+++ b/docs/manual/patch-policy.txt
@@ -34,7 +34,7 @@  Most patches are provided within Buildroot, in the package
 directory; these typically aim to fix cross-compilation, libc support,
 or other such issues.
 
-These patch files should be named +<packagename>-*.patch+.
+These patch files should be named +<packagename>-<description>.patch+.
 
 A +series+ file, as used by +quilt+, may also be added in the
 package directory. In that case, the +series+ file defines the patch
@@ -57,8 +57,8 @@  How patches are applied
   applied according to the +series+ file;
 +
 * Otherwise, patch files matching `<packagename>-*.patch` or
-  `<packagename>-*.patch.<arch>` (where +<arch>+ is the architecture
-  name) are applied following the +ls+ command order.
+  `<packagename>-<description>.patch.<arch>` (where +<arch>+ is the
+  architecture name) are applied following the +ls+ command order.
 
 . Run the +<packagename>_POST_PATCH_HOOKS+ commands if defined.