gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: --with-uname_r: optionally specify target kernel version string

Browse Source
This commit is contained in:
Balazs Gerofi
2017-04-18 05:53:11 +09:00
parent 92a40f92dd
commit c3ec5d20ca
3 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
configure vendored
View File

@@ -636,6 +636,7 @@ ETCDIR
SBINDIR SBINDIR
BINDIR BINDIR
TARGET TARGET
UNAME_R
KDIR KDIR
ARCH ARCH
EGREP EGREP
@@ -696,6 +697,7 @@ with_system_map
enable_dcfa enable_dcfa
enable_memdump enable_memdump
enable_mcoverlayfs enable_mcoverlayfs
with_uname_r
' '
ac_precious_vars='build_alias ac_precious_vars='build_alias
host_alias host_alias
@@ -1328,6 +1330,8 @@ Optional Packages:
target, default is attached-mic target, default is attached-mic
--with-system_map=path Path to 'System.map file', default is --with-system_map=path Path to 'System.map file', default is
/boot/System.map-uname_r /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: Some influential environment variables:
CC C compiler command CC C compiler command
@@ -2112,6 +2116,21 @@ else
fi 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 case "X$WITH_KERNELSRC" in
Xyes | Xno | X) Xyes | Xno | X)
WITH_KERNELSRC='/lib/modules/`uname -r`/build' WITH_KERNELSRC='/lib/modules/`uname -r`/build'
@@ -3049,6 +3068,7 @@ case $WITH_TARGET in
esac esac
KDIR="$WITH_KERNELSRC" KDIR="$WITH_KERNELSRC"
UNAME_R="$WITH_UNAME_R"
TARGET="$WITH_TARGET" TARGET="$WITH_TARGET"
MCCTRL_LINUX_SYMTAB="" MCCTRL_LINUX_SYMTAB=""
@@ -3914,6 +3934,7 @@ fi
ac_config_headers="$ac_config_headers executer/config.h" ac_config_headers="$ac_config_headers executer/config.h"

13
configure.ac
View File

@@ -48,6 +48,17 @@ AC_ARG_ENABLE([mcoverlayfs],
[ENABLE_MCOVERLAYFS=$enableval], [ENABLE_MCOVERLAYFS=$enableval],
[ENABLE_MCOVERLAYFS=yes]) [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 case "X$WITH_KERNELSRC" in
Xyes | Xno | X) Xyes | Xno | X)
WITH_KERNELSRC='/lib/modules/`uname -r`/build' WITH_KERNELSRC='/lib/modules/`uname -r`/build'
@@ -163,6 +174,7 @@ case $WITH_TARGET in
esac esac
KDIR="$WITH_KERNELSRC" KDIR="$WITH_KERNELSRC"
UNAME_R="$WITH_UNAME_R"
TARGET="$WITH_TARGET" TARGET="$WITH_TARGET"
MCCTRL_LINUX_SYMTAB="" MCCTRL_LINUX_SYMTAB=""
@@ -280,6 +292,7 @@ AC_SUBST(CC)
AC_SUBST(XCC) AC_SUBST(XCC)
AC_SUBST(ARCH) AC_SUBST(ARCH)
AC_SUBST(KDIR) AC_SUBST(KDIR)
AC_SUBST(UNAME_R)
AC_SUBST(TARGET) AC_SUBST(TARGET)
AC_SUBST(BINDIR) AC_SUBST(BINDIR)
AC_SUBST(SBINDIR) AC_SUBST(SBINDIR)

3
executer/kernel/mcoverlayfs/Makefile.in
View File

@@ -1,6 +1,6 @@
ENABLE_MCOVERLAYFS=@ENABLE_MCOVERLAYFS@ ENABLE_MCOVERLAYFS=@ENABLE_MCOVERLAYFS@
RELEASE=@UNAME_R@
RELEASE=$(shell uname -r)
MAJOR=$(shell echo ${RELEASE} | sed -e 's/^\([0-9]*\).*/\1/') MAJOR=$(shell echo ${RELEASE} | sed -e 's/^\([0-9]*\).*/\1/')
MINOR=$(shell echo ${RELEASE} | sed -e 's/^[0-9]*.\([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/') 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) 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_TMP=$(shell if [ "${RHEL_RELEASE}" == "" ]; then echo "org"; else echo "rhel"; fi)
BUILD_MODULE=none BUILD_MODULE=none
#$(info "LINUX_VERSION_CODE: ${LINUX_VERSION_CODE}, RHEL_RELEASE: ${RHEL_RELEASE}")
ifeq ($(ENABLE_MCOVERLAYFS),yes) ifeq ($(ENABLE_MCOVERLAYFS),yes)
ifeq ($(BUILD_MODULE_TMP),org) ifeq ($(BUILD_MODULE_TMP),org)
ifeq ($(BUILD_MODULE),none) ifeq ($(BUILD_MODULE),none)