[CRIU] [PATCH 0/9] Fix criu/pie build

Andrei Vagin avagin at virtuozzo.com
Mon Mar 27 10:37:40 PDT 2017


Applied, thanks!

On Fri, Mar 24, 2017 at 03:07:37PM -0700, Kir Kolyshkin wrote:
> This is an attempt to straighten the build of criu/pie.
> Mostly, the target was to run ld only once, plus some
> minor fixes along the way.
> 
> Kir Kolyshkin (9):
>   criu/pie/Makefile: nuke SRC_DIR
>   criu/Makefile: rm criu/pie from -iquote
>   .gitignore: remove a leftover
>   criu/pie/Makefile.library: clean up
>   criu/pie/Makefile: simplify and fix
>   compel/plugins/Makefile: clean up
>   nmk: do not sort lib-y objects
>   compel: make plugins .a archives
>   compel: no -r for ARM ldflags
> 
>  .gitignore                                         |  1 -
>  Makefile.compel                                    | 10 +--
>  compel/Makefile                                    |  1 +
>  compel/arch/aarch64/scripts/compel-pack.lds.S      |  4 ++
>  .../arm/plugins/std/syscalls/Makefile.syscalls     |  2 +-
>  compel/arch/arm/scripts/compel-pack.lds.S          |  4 ++
>  .../ppc64/plugins/std/syscalls/Makefile.syscalls   |  2 +-
>  compel/arch/ppc64/scripts/compel-pack.lds.S        |  4 ++
>  .../x86/plugins/std/syscalls/Makefile.syscalls     |  2 +-
>  compel/arch/x86/scripts/compel-pack-compat.lds.S   |  4 ++
>  compel/arch/x86/scripts/compel-pack.lds.S          |  4 ++
>  compel/plugins/Makefile                            | 38 ++++++------
>  compel/src/main.c                                  | 12 +++-
>  criu/Makefile                                      |  1 -
>  criu/Makefile.crtools                              |  1 +
>  criu/arch/aarch64/Makefile                         |  1 +
>  criu/arch/arm/Makefile                             |  1 +
>  criu/arch/ppc64/Makefile                           |  1 +
>  criu/arch/x86/Makefile                             |  2 +-
>  criu/cr-restore.c                                  |  2 +-
>  criu/parasite-syscall.c                            |  2 +-
>  criu/pie/Makefile                                  | 71 +++++++++-------------
>  criu/pie/Makefile.library                          |  6 +-
>  lib/c/Makefile                                     |  2 +-
>  scripts/nmk/scripts/build.mk                       |  4 +-
>  scripts/nmk/scripts/utils.mk                       |  2 +-
>  26 files changed, 98 insertions(+), 86 deletions(-)
> 
> -- 
> 2.9.3
> 


More information about the CRIU mailing list