[packages/rpm/arlib] convert cpu-os-macros to ar archive instead of untracked .tar.gz

[Jakub Bogusz]

On Wed, Jan 07, 2015 at 04:59:44PM +0100, glen wrote:
> commit c37514ab0235ba8911996d7ea1056bba86f551e2
> Author: Elan Ruusamäe <glen at delfi.ee>
> Date:   Wed Jan 7 17:56:04 2015 +0200
> 
>     convert cpu-os-macros to ar archive instead of untracked .tar.gz
>     
>     archive macros in an ar archive instead since it's ascii rather than
>     binary, making it easier merge changes, deal with conflicts etc...
>     
>     idea from proyvind:
>     https://abf.io/openmandriva/rpm/commits/master/cpu-os-macros.a
[...]
> diff --git a/README.cpu-os-macros b/README.cpu-os-macros
> new file mode 100644
> index 0000000..5adcecc
> --- /dev/null
> +++ b/README.cpu-os-macros
> @@ -0,0 +1,12 @@
> +In order to more easily cope with merges and avoid issues with binary formats,
> +we're now using the ar format which will give us a pure ascii archive that'll
> +make it possible to track & merge individual changes like with other text files.
> +Unfortunately the format doesn't support paths..
> +
> +recommended way of making changes and updating archive:
> +rm -rf foo
> +cd foo
> +ar x ../cpu-os-macros.a
> +<perform your changes>
> +cd -
> +ar cDr cpu-os-macros.a foo/*macros

Isn't diff -Nur more readable (paths!) and easier to maintain?


-- 
Jakub Bogusz    http://qboosh.pl/