From d8413addc00eeaa3985fd7acc20c1f4497a14b51 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 25 Jan 2009 06:04:57 -0500 Subject: [PATCH] Don't build the ksplice core twice. Signed-off-by: Anders Kaseorg --- kmodsrc/Makefile.in | 4 ++++ ksplice-create.in | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/kmodsrc/Makefile.in b/kmodsrc/Makefile.in index bfaaf85..2b5d9e5 100644 --- a/kmodsrc/Makefile.in +++ b/kmodsrc/Makefile.in @@ -35,7 +35,9 @@ ksplice-primary-objs = primary-$(target).o collect-primary-$(mod).o ksplice-helper-objs = helper-$(target).o collect-helper-$(mod).o ifneq ($(KSPLICE_STANDALONE),) +ifeq ($(KSPLICE_SKIP_CORE),) obj-m += $(KSPLICE_CORE).o +endif UDIS86 = x86/libudis86 kudis86 += \ $(UDIS86)/itab.o \ @@ -85,7 +87,9 @@ $(obj)/ksplice.lds: $(src)/ksplice.lds.S FORCE $(call if_changed_dep,cpp_lds_S) CFLAGS_offsets.o += $(KSPLICE_CFLAGS) +ifeq ($(KSPLICE_SKIP_CORE),) extra-y += offsets.o +endif ifneq ($(KSPLICE_STANDALONE),) CFLAGS_ksplice.o += $(KSPLICE_CFLAGS) diff --git a/ksplice-create.in b/ksplice-create.in index 8462015..532196e 100644 --- a/ksplice-create.in +++ b/ksplice-create.in @@ -214,7 +214,10 @@ if (!defined($standalone)) { } push(@make_kmodsrc, "KSPLICE_STANDALONE=1") if ($standalone); +my @make_kmodsrc_install = (@make_kmodsrc, qw(modules_install --old-file=_modinst_post --old-file=_emodinst_post), "MAKE=make --old-file=_modinst_post --old-file=_emodinst_post", "INSTALL_MOD_STRIP=1", "MODLIB=$tmpdir/ksplice-modules"); + runval(@make_kmodsrc); +runval(@make_kmodsrc_install); @patch_opt = ("-s", @patch_opt) if ($Verbose::level < 0); @@ -281,8 +284,8 @@ if ($build_modules) { revert_orig() if(defined($diffext)); -runval(@make_kmodsrc, "modules", "KSPLICE_MODULES=@modules"); -runval(@make_kmodsrc, qw(modules_install --old-file=_modinst_post --old-file=_emodinst_post), "MAKE=make --old-file=_modinst_post --old-file=_emodinst_post", "INSTALL_MOD_STRIP=1", "MODLIB=$tmpdir/ksplice-modules", "KSPLICE_MODULES=@modules"); +runval(@make_kmodsrc, "KSPLICE_MODULES=@modules", "KSPLICE_SKIP_CORE=1"); +runval(@make_kmodsrc_install, "KSPLICE_MODULES=@modules", "KSPLICE_SKIP_CORE=1"); chdir($tmpdir); mkdir($ksplice); -- 2.11.4.GIT