build system switch to cmake

Remove old build system at the same time

Change-Id: Ifdffe1fcd4cfece05f036d8de6e7cb74aca65f62
This commit is contained in:
Dominique Martinet
2018-06-04 10:39:03 +09:00
parent 4bdd9cf512
commit 2a63c962fc
63 changed files with 945 additions and 8357 deletions

View File

@@ -0,0 +1,30 @@
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/arch/${ARCH})
if(ARCH STREQUAL "x86_64")
set(ARCH_C_FLAGS "-mno-red-zone -mcmodel=kernel")
endif()
kmod(mcctrl
C_FLAGS
-I${IHK_FULL_SOURCE_DIR}/linux/include
-I${IHK_FULL_SOURCE_DIR}/linux/include/ihk/arch/${ARCH}
-I${IHK_FULL_SOURCE_DIR}/ikc/include
-I${IHK_FULL_SOURCE_DIR}/ikc/include/ikc/arch/${ARCH}
-I${IHK_FULL_SOURCE_DIR}/include
-I${IHK_FULL_SOURCE_DIR}/include/arch/${ARCH}
-I${PROJECT_SOURCE_DIR}/executer/include
-I${CMAKE_CURRENT_SOURCE_DIR}/arch/${ARCH}/include
-I${PROJECT_BINARY_DIR}
-I${PROJECT_SOURCE_DIR}/kernel/include
-DMCEXEC_PATH=\\"${CMAKE_INSTALL_FULL_BINDIR}/mcexec\\"
${ARCH_C_FLAGS}
SOURCES
driver.c control.c ikc.c syscall.c procfs.c binfmt_mcexec.c
sysfs.c sysfs_files.c arch/${ARCH}/archdeps.c
EXTRA_SYMBOLS
${PROJECT_BINARY_DIR}/ihk/linux/core/Module.symvers
DEPENDS
ihk_ko
INSTALL_DEST
${KMODDIR}
)

View File

@@ -1,50 +0,0 @@
# Makefile.in COPYRIGHT FUJITSU LIMITED 2016
KDIR ?= @KDIR@
ARCH ?= @ARCH@
src = @abs_srcdir@
KMODDIR=@KMODDIR@
BINDIR=@BINDIR@
INCLUDEDIR=@INCLUDEDIR@
IHK_BASE=$(src)/../../../../ihk
obj-m += mcctrl.o
ccflags-y := -I$(IHK_BASE)/linux/include \
-I$(IHK_BASE)/linux/include/ihk/arch/$(ARCH) \
-I$(IHK_BASE)/ikc/include \
-I$(IHK_BASE)/ikc/include/ikc/arch/$(ARCH) \
-I$(IHK_BASE)/include \
-I$(IHK_BASE)/include/arch/$(ARCH) \
-I$(src)/../../include \
-I$(src)/arch/$(ARCH)/include \
-I@abs_builddir@ \
-I@abs_builddir@/../../../ \
-I$(src)/../../../kernel/include \
-DMCEXEC_PATH=\"$(BINDIR)/mcexec\"
# depending arch
include @abs_builddir@/arch/$(ARCH)/Makefile
mcctrl-y := driver.o control.o ikc.o syscall.o procfs.o binfmt_mcexec.o
mcctrl-y += sysfs.o sysfs_files.o arch/$(ARCH)/archdeps.o
KBUILD_EXTRA_SYMBOLS = @abs_builddir@/../../../../ihk/linux/core/Module.symvers
ifeq ($(ARCH), arm64)
EXTRA_CFLAGS += $(foreach i, $(shell seq 6 120), $(addprefix -DPOSTK_DEBUG_ARCH_DEP_, $(i)))
EXTRA_CFLAGS += $(foreach i, $(shell seq 6 110), $(addprefix -DPOSTK_DEBUG_TEMP_FIX_, $(i)))
endif
.PHONY: clean install modules
modules:
$(MAKE) -C $(KDIR) M=$(PWD) SUBDIRS=$(PWD) ARCH=$(ARCH) modules
clean:
$(RM) .*.cmd *.mod.c *.o *.ko* Module.symvers modules.order -r .tmp*
install:
mkdir -p -m 755 $(KMODDIR)
install -m 644 mcctrl.ko $(KMODDIR)
mkdir -p -m 755 $(INCLUDEDIR)/mckernel
install -m 644 $(src)/../../include/ihklib_rusage.h $(INCLUDEDIR)/mckernel/ihklib_rusage.h

View File

@@ -1,2 +0,0 @@
# Makefile.in COPYRIGHT FUJITSU LIMITED 2016
# dummy file

View File

@@ -3,7 +3,7 @@
#include <linux/mm_types.h>
#include <linux/kallsyms.h>
#include <asm/vdso.h>
#include "../../../config.h"
#include "config.h"
#include "../../mcctrl.h"
//#define SC_DEBUG

View File

@@ -1 +0,0 @@
ccflags-y += -mno-red-zone -mcmodel=kernel

View File

@@ -2,7 +2,7 @@
#include <linux/version.h>
#include <linux/kallsyms.h>
#include <linux/uaccess.h>
#include "../../../config.h"
#include "config.h"
#include "../../mcctrl.h"
//#define SC_DEBUG

View File

@@ -46,7 +46,7 @@
#include <asm/uaccess.h>
#include <asm/delay.h>
#include <asm/io.h>
#include "../../../config.h"
#include "config.h"
#include "mcctrl.h"
#include <linux/version.h>
#include <archdeps.h>

View File

@@ -15,7 +15,7 @@
#include <linux/slab.h>
#include <linux/uaccess.h>
#include <linux/version.h>
#include "../../../config.h"
#include "config.h"
#include "mcctrl.h"
#include "sysfs_msg.h"

View File

@@ -0,0 +1,14 @@
# LESS/GREATER_EQUAL appears somewhere in 3.7... meh compat until we stop caring about 2.x
# ...apparently can't define macros ot use inside if, so unfold manually
if(NOT (LINUX_VERSION_CODE LESS 262144) AND NOT (LINUX_VERSION_CODE GREATER 262400))
add_subdirectory("linux-4.0.9")
elseif(NOT (LINUX_VERSION_CODE LESS 263680) AND NOT (LINUX_VERSION_CODE GREATER 263936))
add_subdirectory("linux-4.6.7")
elseif(LINUX_VERSION_CODE EQUAL 199168)
add_subdirectory("linux-3.10.0-327.36.1.el7")
else()
#add_subdirectory("linux-3.10.0-327.36.1.el7")
add_subdirectory("linux-4.18.14")
#message(FATAL_ERROR "mcoverlayfs enabled but kernel version not compatible")
endif()

View File

@@ -1,21 +0,0 @@
ENABLE_MCOVERLAYFS=@ENABLE_MCOVERLAYFS@
MCOVERLAYFS_MODULE=@MCOVERLAYFS_MODULE@
.PHONY: clean install modules
modules:
ifeq ($(ENABLE_MCOVERLAYFS),yes)
+@(cd $(MCOVERLAYFS_MODULE) && make modules)
endif
clean:
@(cd linux-3.10.0-327.36.1.el7 && make clean)
@(cd linux-4.0.9 && make clean)
@(cd linux-4.6.7 && make clean)
@(cd linux-4.18.14 && make clean)
install:
ifeq ($(ENABLE_MCOVERLAYFS),yes)
@(cd $(MCOVERLAYFS_MODULE) && make install)
endif

View File

@@ -0,0 +1,7 @@
kmod(mcoverlay
SOURCES
copy_up.c dir.c inode.c readdir.c super.c
INSTALL_DEST
${KMODDIR}
)

View File

@@ -1,21 +0,0 @@
KDIR ?= @KDIR@
ARCH ?= @ARCH@
KMODDIR = @KMODDIR@
src = @abs_srcdir@
obj-m += mcoverlay.o
mcoverlay-y := copy_up.o dir.o inode.o readdir.o super.o
.PHONY: clean install modules
modules:
$(MAKE) -C $(KDIR) M=$(PWD) SUBDIRS=$(PWD) ARCH=$(ARCH) modules
clean:
$(RM) .*.cmd *.mod.c *.o *.ko* Module.symvers modules.order -r .tmp*
install:
mkdir -p -m 755 $(KMODDIR)
install -m 644 mcoverlay.ko $(KMODDIR)

View File

@@ -1,21 +0,0 @@
KDIR ?= @KDIR@
ARCH ?= @ARCH@
KMODDIR = @KMODDIR@
src = @abs_srcdir@
obj-m += mcoverlay.o
mcoverlay-y := copy_up.o dir.o inode.o readdir.o super.o
.PHONY: clean install modules
modules:
$(MAKE) -C $(KDIR) M=$(PWD) SUBDIRS=$(PWD) ARCH=$(ARCH) modules
clean:
$(RM) .*.cmd *.mod.c *.o *.ko* Module.symvers modules.order -r .tmp*
install:
mkdir -p -m 755 $(KMODDIR)
install -m 644 mcoverlay.ko $(KMODDIR)

View File

@@ -0,0 +1,7 @@
kmod(mcoverlay
SOURCES
copy_up.c dir.c inode.c readdir.c super.c namei.c util.c export.c
INSTALL_DEST
${KMODDIR}
)

View File

@@ -1,24 +0,0 @@
KDIR ?= @KDIR@
ARCH ?= @ARCH@
# POSTK_DEBUG_ARCH_DEP_105 make install DESTDIR enable.
# KMODDIR = @KMODDIR@
DESTDIR ?= @DESTDIR@
KMODDIR = $(DESTDIR)/@KMODDIR@
src = @abs_srcdir@
obj-m += mcoverlay.o
mcoverlay-y := copy_up.o dir.o inode.o readdir.o super.o export.o namei.o util.o
.PHONY: clean install modules
modules:
$(MAKE) -C $(KDIR) M=$(PWD) SUBDIRS=$(PWD) ARCH=$(ARCH) modules
clean:
$(RM) .*.cmd *.mod.c *.o *.ko* Module.symvers modules.order -r .tmp*
install:
mkdir -p -m 755 $(KMODDIR)
install -m 644 mcoverlay.ko $(KMODDIR)

View File

@@ -1,21 +0,0 @@
KDIR ?= @KDIR@
ARCH ?= @ARCH@
KMODDIR = @KMODDIR@
src = @abs_srcdir@
obj-m += mcoverlay.o
mcoverlay-y := copy_up.o dir.o inode.o readdir.o super.o
.PHONY: clean install modules
modules:
$(MAKE) -C $(KDIR) M=$(PWD) SUBDIRS=$(PWD) ARCH=$(ARCH) modules
clean:
$(RM) .*.cmd *.mod.c *.o *.ko* Module.symvers modules.order -r .tmp*
install:
mkdir -p -m 755 $(KMODDIR)
install -m 644 mcoverlay.ko $(KMODDIR)