From 3e1367caa1b92c6a7c4cb093ffd471e0b9428402 Mon Sep 17 00:00:00 2001 From: Yoichi Umezawa Date: Fri, 30 Sep 2016 13:48:55 +0900 Subject: [PATCH] mcoverlayfs: move mcoverlayfs(linux-4.0.9 base) to executer/kernel/mcoverlayfs/linux-4.0.9 --- configure | 3 +- configure.ac | 1 + executer/kernel/mcoverlayfs/Makefile.in | 39 ++++++++++--------- .../mcoverlayfs/linux-4.0.9/Makefile.in | 21 ++++++++++ .../mcoverlayfs/{ => linux-4.0.9}/copy_up.c | 0 .../mcoverlayfs/{ => linux-4.0.9}/dir.c | 0 .../mcoverlayfs/{ => linux-4.0.9}/inode.c | 0 .../mcoverlayfs/{ => linux-4.0.9}/overlayfs.h | 0 .../mcoverlayfs/{ => linux-4.0.9}/readdir.c | 0 .../mcoverlayfs/{ => linux-4.0.9}/super.c | 0 10 files changed, 44 insertions(+), 20 deletions(-) create mode 100644 executer/kernel/mcoverlayfs/linux-4.0.9/Makefile.in rename executer/kernel/mcoverlayfs/{ => linux-4.0.9}/copy_up.c (100%) rename executer/kernel/mcoverlayfs/{ => linux-4.0.9}/dir.c (100%) rename executer/kernel/mcoverlayfs/{ => linux-4.0.9}/inode.c (100%) rename executer/kernel/mcoverlayfs/{ => linux-4.0.9}/overlayfs.h (100%) rename executer/kernel/mcoverlayfs/{ => linux-4.0.9}/readdir.c (100%) rename executer/kernel/mcoverlayfs/{ => linux-4.0.9}/super.c (100%) diff --git a/configure b/configure index 48805d5c..40b7feb4 100755 --- a/configure +++ b/configure @@ -3891,7 +3891,7 @@ fi ac_config_headers="$ac_config_headers executer/config.h" -ac_config_files="$ac_config_files Makefile executer/user/Makefile executer/kernel/mcctrl/Makefile executer/kernel/mcctrl/arch/x86_64/Makefile executer/kernel/mcoverlayfs/Makefile kernel/Makefile kernel/Makefile.build arch/x86/tools/mcreboot-attached-mic.sh arch/x86/tools/mcshutdown-attached-mic.sh arch/x86/tools/mcreboot-builtin-x86.sh arch/x86/tools/mcreboot-smp-x86.sh arch/x86/tools/mcstop+release-smp-x86.sh arch/x86/tools/mcshutdown-builtin-x86.sh arch/x86/tools/mcreboot.1:arch/x86/tools/mcreboot.1in arch/x86/tools/irqbalance_mck.service arch/x86/tools/irqbalance_mck.in" +ac_config_files="$ac_config_files Makefile executer/user/Makefile executer/kernel/mcctrl/Makefile executer/kernel/mcctrl/arch/x86_64/Makefile executer/kernel/mcoverlayfs/Makefile executer/kernel/mcoverlayfs/linux-4.0.9/Makefile kernel/Makefile kernel/Makefile.build arch/x86/tools/mcreboot-attached-mic.sh arch/x86/tools/mcshutdown-attached-mic.sh arch/x86/tools/mcreboot-builtin-x86.sh arch/x86/tools/mcreboot-smp-x86.sh arch/x86/tools/mcstop+release-smp-x86.sh arch/x86/tools/mcshutdown-builtin-x86.sh arch/x86/tools/mcreboot.1:arch/x86/tools/mcreboot.1in arch/x86/tools/irqbalance_mck.service arch/x86/tools/irqbalance_mck.in" if test "x$enable_dcfa" = xyes; then : @@ -4595,6 +4595,7 @@ do "executer/kernel/mcctrl/Makefile") CONFIG_FILES="$CONFIG_FILES executer/kernel/mcctrl/Makefile" ;; "executer/kernel/mcctrl/arch/x86_64/Makefile") CONFIG_FILES="$CONFIG_FILES executer/kernel/mcctrl/arch/x86_64/Makefile" ;; "executer/kernel/mcoverlayfs/Makefile") CONFIG_FILES="$CONFIG_FILES executer/kernel/mcoverlayfs/Makefile" ;; + "executer/kernel/mcoverlayfs/linux-4.0.9/Makefile") CONFIG_FILES="$CONFIG_FILES executer/kernel/mcoverlayfs/linux-4.0.9/Makefile" ;; "kernel/Makefile") CONFIG_FILES="$CONFIG_FILES kernel/Makefile" ;; "kernel/Makefile.build") CONFIG_FILES="$CONFIG_FILES kernel/Makefile.build" ;; "arch/x86/tools/mcreboot-attached-mic.sh") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/mcreboot-attached-mic.sh" ;; diff --git a/configure.ac b/configure.ac index a5e702f0..90fdb018 100644 --- a/configure.ac +++ b/configure.ac @@ -302,6 +302,7 @@ AC_CONFIG_FILES([ executer/kernel/mcctrl/Makefile executer/kernel/mcctrl/arch/x86_64/Makefile executer/kernel/mcoverlayfs/Makefile + executer/kernel/mcoverlayfs/linux-4.0.9/Makefile kernel/Makefile kernel/Makefile.build arch/x86/tools/mcreboot-attached-mic.sh diff --git a/executer/kernel/mcoverlayfs/Makefile.in b/executer/kernel/mcoverlayfs/Makefile.in index 68dba3bd..ff8f3371 100644 --- a/executer/kernel/mcoverlayfs/Makefile.in +++ b/executer/kernel/mcoverlayfs/Makefile.in @@ -1,7 +1,3 @@ -KDIR ?= @KDIR@ -ARCH ?= @ARCH@ -KMODDIR=@KMODDIR@ -src = @abs_srcdir@ ENABLE_MCOVERLAYFS=@ENABLE_MCOVERLAYFS@ RELEASE=$(shell uname -r) @@ -9,31 +5,36 @@ MAJOR=$(shell echo ${RELEASE} | sed -e 's/^\([0-9]*\).*/\1/') MINOR=$(shell echo ${RELEASE} | sed -e 's/^[0-9]*.\([0-9]*\).*/\1/') PATCH=$(shell echo ${RELEASE} | sed -e 's/^[0-9]*.[0-9]*.\([0-9]*\).*/\1/') LINUX_VERSION_CODE=$(shell expr \( ${MAJOR} \* 65536 \) + \( ${MINOR} \* 256 \) + ${PATCH}) -RHEL_RELEASE=$(shell echo ${RELEASE} | sed -e 's/^[0-9]*.[0-9]*.[0-9]*-\([0-9]*\).*/\1/') -RHEL_RELEASE=$(shell if [ "${RELEASE}" == "${RHEL_RELEASE}" ]; then echo ""; else echo ${RHEL_RELEASE}; fi) +RHEL_RELEASE_TMP=$(shell echo ${RELEASE} | sed -e 's/^[0-9]*.[0-9]*.[0-9]*-\([0-9]*\).*/\1/') +RHEL_RELEASE=$(shell if [ "${RELEASE}" == "${RHEL_RELEASE_TMP}" ]; then echo ""; else echo ${RHEL_RELEASE_TMP}; fi) +BUILD_MODULE_TMP=$(shell if [ "${RHEL_RELEASE}" == "" ]; then echo "org"; else echo "rhel"; fi) +BUILD_MODULE=none ifeq ($(ENABLE_MCOVERLAYFS),yes) -ENABLE_BUILD=$(shell if ( [ ${LINUX_VERSION_CODE} -ge 262144 ] && [ ${LINUX_VERSION_CODE} -lt 262400 ] ); then echo "yes"; else echo "no"; fi) -else -ENABLE_BUILD=no +ifeq ($(BUILD_MODULE_TMP),org) +ifeq ($(BUILD_MODULE),none) +BUILD_MODULE=$(shell if [ ${LINUX_VERSION_CODE} -ge 262144 -a ${LINUX_VERSION_CODE} -lt 262400 ]; then echo "linux-4.0.9"; else echo "none"; fi) +endif +endif +ifeq ($(BUILD_MODULE_TMP),rhel) +#ifeq ($(BUILD_MODULE),none) +#BUILD_MODULE=$(shell if [ ${LINUX_VERSION_CODE} -eq 199168 -a ${RHEL_RELEASE} -eq 327 ]; then echo "linux-3.10.0-327.36.1.el7"; else echo "none"; fi) +#endif +endif endif - -obj-m += mcoverlay.o - -mcoverlay-y := copy_up.o dir.o inode.o readdir.o super.o .PHONY: clean install modules modules: -ifeq ($(ENABLE_BUILD),yes) - $(MAKE) -C $(KDIR) M=$(PWD) SUBDIRS=$(PWD) ARCH=$(ARCH) modules +ifneq ($(BUILD_MODULE),none) + @(cd $(BUILD_MODULE); make modules) endif clean: - $(RM) .*.cmd *.mod.c *.o *.ko* Module.symvers modules.order -r .tmp* +# @(cd linux-3.10.0-327.36.1.el7; make clean) + @(cd linux-4.0.9; make clean) install: -ifeq ($(ENABLE_BUILD),yes) - mkdir -p -m 755 $(KMODDIR) - install -m 644 mcoverlay.ko $(KMODDIR) +ifneq ($(BUILD_MODULE),none) + @(cd $(BUILD_MODULE); make install) endif diff --git a/executer/kernel/mcoverlayfs/linux-4.0.9/Makefile.in b/executer/kernel/mcoverlayfs/linux-4.0.9/Makefile.in new file mode 100644 index 00000000..a0705727 --- /dev/null +++ b/executer/kernel/mcoverlayfs/linux-4.0.9/Makefile.in @@ -0,0 +1,21 @@ +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) + diff --git a/executer/kernel/mcoverlayfs/copy_up.c b/executer/kernel/mcoverlayfs/linux-4.0.9/copy_up.c similarity index 100% rename from executer/kernel/mcoverlayfs/copy_up.c rename to executer/kernel/mcoverlayfs/linux-4.0.9/copy_up.c diff --git a/executer/kernel/mcoverlayfs/dir.c b/executer/kernel/mcoverlayfs/linux-4.0.9/dir.c similarity index 100% rename from executer/kernel/mcoverlayfs/dir.c rename to executer/kernel/mcoverlayfs/linux-4.0.9/dir.c diff --git a/executer/kernel/mcoverlayfs/inode.c b/executer/kernel/mcoverlayfs/linux-4.0.9/inode.c similarity index 100% rename from executer/kernel/mcoverlayfs/inode.c rename to executer/kernel/mcoverlayfs/linux-4.0.9/inode.c diff --git a/executer/kernel/mcoverlayfs/overlayfs.h b/executer/kernel/mcoverlayfs/linux-4.0.9/overlayfs.h similarity index 100% rename from executer/kernel/mcoverlayfs/overlayfs.h rename to executer/kernel/mcoverlayfs/linux-4.0.9/overlayfs.h diff --git a/executer/kernel/mcoverlayfs/readdir.c b/executer/kernel/mcoverlayfs/linux-4.0.9/readdir.c similarity index 100% rename from executer/kernel/mcoverlayfs/readdir.c rename to executer/kernel/mcoverlayfs/linux-4.0.9/readdir.c diff --git a/executer/kernel/mcoverlayfs/super.c b/executer/kernel/mcoverlayfs/linux-4.0.9/super.c similarity index 100% rename from executer/kernel/mcoverlayfs/super.c rename to executer/kernel/mcoverlayfs/linux-4.0.9/super.c