projects
/
lttng-ci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #56 from frdeso/bt_scanbuild
[lttng-ci.git]
/
scripts
/
lttng-modules
/
build.sh
diff --git
a/scripts/lttng-modules/build.sh
b/scripts/lttng-modules/build.sh
index 1a1aaafa69b3950aa657a29290552e3a304ad733..a301c918a85c1c82828f4ff9bf0c55ae847225c1 100755
(executable)
--- a/
scripts/lttng-modules/build.sh
+++ b/
scripts/lttng-modules/build.sh
@@
-37,9
+37,9
@@
vergt() {
# Use all CPU cores
NPROC=$(nproc)
# Use all CPU cores
NPROC=$(nproc)
-SRCDIR="${WORKSPACE}/lttng-modules"
+SRCDIR="${WORKSPACE}/
src/
lttng-modules"
BUILDDIR="${WORKSPACE}/build"
BUILDDIR="${WORKSPACE}/build"
-LNXSRCDIR="${WORKSPACE}/linux"
+LNXSRCDIR="${WORKSPACE}/
src/
linux"
LNXBINDIR="${WORKSPACE}/deps/linux/build"
# Create build directory
LNXBINDIR="${WORKSPACE}/deps/linux/build"
# Create build directory
@@
-65,7
+65,7
@@
if { vergte "$KVERSION" "3.10" && verlte "$KVERSION" "3.10.13"; } || \
set +e
# Build modules
set +e
# Build modules
- make -j${NPROC} -C "${LNXBINDIR}" M="$(pwd)" V=1
+ KERNELDIR="${LNXBINDIR}" make -j${NPROC} V=1 CONFIG_LTTNG=m
# We expect this build to fail, if it doesn't, fail the job.
if [ "$?" -eq 0 ]; then
# We expect this build to fail, if it doesn't, fail the job.
if [ "$?" -eq 0 ]; then
@@
-80,10
+80,10
@@
if { vergte "$KVERSION" "3.10" && verlte "$KVERSION" "3.10.13"; } || \
else # Regular build
# Build modules
else # Regular build
# Build modules
-
make -j${NPROC} -C "${LNXBINDIR}" M="$(pwd)"
V=1 CONFIG_LTTNG=m
+
KERNELDIR="${LNXBINDIR}" make -j${NPROC}
V=1 CONFIG_LTTNG=m
# Install modules to build dir
# Install modules to build dir
-
make INSTALL_MOD_PATH="${BUILDDIR}" -C "${LNXBINDIR}" M="$(pwd)
" modules_install
+
KERNELDIR="${LNXBINDIR}" make INSTALL_MOD_PATH="${BUILDDIR}
" modules_install
fi
# EOF
fi
# EOF
This page took
0.023914 seconds
and
4
git commands to generate.