From f830c2d8d0e345722dc24f3a6101b8c4660bce34 Mon Sep 17 00:00:00 2001 From: Dmitry Safonov Date: Fri, 21 Apr 2017 14:15:05 +0300 Subject: [PATCH] ia32: Clearify if 32bit C/R is compile-disabled Point that ia32 C/R was disabled due to missed packages. Signed-off-by: Dmitry Safonov Signed-off-by: Andrei Vagin --- Makefile.config | 3 +++ criu/cr-check.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/Makefile.config b/Makefile.config index 50516109a..0dd9d0433 100644 --- a/Makefile.config +++ b/Makefile.config @@ -24,6 +24,9 @@ ifeq ($(SRCARCH),x86) ifeq ($(call try-cc,$(FEATURE_TEST_X86_COMPAT),-m32),true) export CONFIG_COMPAT := y FEATURE_DEFINES += -DCONFIG_COMPAT +else + $(info Note: Building without ia32 C/R, missed packages:) + $(info $(info) libc6-dev-i386, gcc-multilib) endif endif diff --git a/criu/cr-check.c b/criu/cr-check.c index 2c97c880b..58dc7b4f9 100644 --- a/criu/cr-check.c +++ b/criu/cr-check.c @@ -1057,9 +1057,13 @@ static int check_loginuid(void) static int check_compat_cr(void) { +#ifdef CONFIG_COMPAT if (kdat_compat_sigreturn_test()) return 0; pr_warn("compat_cr is not supported. Requires kernel >= v4.9\n"); +#else + pr_warn("CRIU built without CONFIG_COMPAT - can't C/R ia32\n"); +#endif return -1; }