From c3ec5d20ca95c92e0de6391ce84998225225d1c2 Mon Sep 17 00:00:00 2001
From: Balazs Gerofi <bgerofi@riken.jp>
Date: Tue, 18 Apr 2017 05:53:11 +0900
Subject: [PATCH] configure: --with-uname_r: optionally specify target kernel
 version string

---
 configure                               | 21 +++++++++++++++++++++
 configure.ac                            | 13 +++++++++++++
 executer/kernel/mcoverlayfs/Makefile.in |  3 ++-
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 60326c38..7b3ee84e 100755
--- a/configure
+++ b/configure
@@ -636,6 +636,7 @@ ETCDIR
 SBINDIR
 BINDIR
 TARGET
+UNAME_R
 KDIR
 ARCH
 EGREP
@@ -696,6 +697,7 @@ with_system_map
 enable_dcfa
 enable_memdump
 enable_mcoverlayfs
+with_uname_r
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1328,6 +1330,8 @@ Optional Packages:
                           target, default is attached-mic
   --with-system_map=path  Path to 'System.map file', default is
                           /boot/System.map-uname_r
+  --with-uname_r=uname_r  Value of '`uname -r`' on the target platform,
+                          default is local value
 
 Some influential environment variables:
   CC          C compiler command
@@ -2112,6 +2116,21 @@ else
 fi
 
 
+
+# Check whether --with-uname_r was given.
+if test "${with_uname_r+set}" = set; then :
+  withval=$with_uname_r; WITH_UNAME_R=$withval
+else
+  WITH_UNAME_R=yes
+fi
+
+
+case "X$WITH_UNAME_R" in
+    Xyes | Xno | X)
+	WITH_UNAME_R='`uname -r`'
+	;;
+esac
+
 case "X$WITH_KERNELSRC" in
     Xyes | Xno | X)
 	WITH_KERNELSRC='/lib/modules/`uname -r`/build'
@@ -3049,6 +3068,7 @@ case $WITH_TARGET in
 esac
 
 KDIR="$WITH_KERNELSRC"
+UNAME_R="$WITH_UNAME_R"
 TARGET="$WITH_TARGET"
 
 MCCTRL_LINUX_SYMTAB=""
@@ -3914,6 +3934,7 @@ fi
 
 
 
+
 
 
 ac_config_headers="$ac_config_headers executer/config.h"
diff --git a/configure.ac b/configure.ac
index a1ecb304..d7efe839 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,17 @@ AC_ARG_ENABLE([mcoverlayfs],
 	      [ENABLE_MCOVERLAYFS=$enableval],
 	      [ENABLE_MCOVERLAYFS=yes])
 
+AC_ARG_WITH([uname_r],
+  AC_HELP_STRING(
+    [--with-uname_r=uname_r],[Value of '`uname -r`' on the target platform, default is local value]),
+  [WITH_UNAME_R=$withval],[WITH_UNAME_R=yes])
+
+case "X$WITH_UNAME_R" in
+    Xyes | Xno | X)
+	WITH_UNAME_R='`uname -r`'
+	;;
+esac
+
 case "X$WITH_KERNELSRC" in
     Xyes | Xno | X)
 	WITH_KERNELSRC='/lib/modules/`uname -r`/build'
@@ -163,6 +174,7 @@ case $WITH_TARGET in
 esac
 
 KDIR="$WITH_KERNELSRC"
+UNAME_R="$WITH_UNAME_R"
 TARGET="$WITH_TARGET"
 
 MCCTRL_LINUX_SYMTAB=""
@@ -280,6 +292,7 @@ AC_SUBST(CC)
 AC_SUBST(XCC)
 AC_SUBST(ARCH)
 AC_SUBST(KDIR)
+AC_SUBST(UNAME_R)
 AC_SUBST(TARGET)
 AC_SUBST(BINDIR)
 AC_SUBST(SBINDIR)
diff --git a/executer/kernel/mcoverlayfs/Makefile.in b/executer/kernel/mcoverlayfs/Makefile.in
index bc1579f4..7bea77d7 100644
--- a/executer/kernel/mcoverlayfs/Makefile.in
+++ b/executer/kernel/mcoverlayfs/Makefile.in
@@ -1,6 +1,6 @@
 ENABLE_MCOVERLAYFS=@ENABLE_MCOVERLAYFS@
+RELEASE=@UNAME_R@
 
-RELEASE=$(shell uname -r)
 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/')
@@ -9,6 +9,7 @@ RHEL_RELEASE_TMP=$(shell echo ${RELEASE} | sed -e 's/^[0-9]*.[0-9]*.[0-9]*-\([0-
 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
+#$(info "LINUX_VERSION_CODE: ${LINUX_VERSION_CODE}, RHEL_RELEASE: ${RHEL_RELEASE}")
 ifeq ($(ENABLE_MCOVERLAYFS),yes)
 ifeq ($(BUILD_MODULE_TMP),org)
 ifeq ($(BUILD_MODULE),none)