From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 22 Feb 2016 21:32:19 +0000 (-0500)
Subject: Add kernel header build to modules
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=339db64deb6166da36acf80b3a74e675c3ea03ad;p=lttng-ci.git

Add kernel header build to modules
---

diff --git a/jobs/lttng-modules.yaml b/jobs/lttng-modules.yaml
index 85711e9..5e03d50 100644
--- a/jobs/lttng-modules.yaml
+++ b/jobs/lttng-modules.yaml
@@ -245,13 +245,13 @@
           branches:
             - "${{mversion}}"
           skip-tag: true
-          basedir: lttng-modules
+          basedir: src/lttng-modules
 
     triggers:
 
     builders:
       - shell: |
-          git clone --depth=1 -b "$kversion" --reference $HOME/gitcache/linux-stable.git/ "$kgitrepo" linux
+          git clone --depth=1 -b "$kversion" --reference $HOME/gitcache/linux-stable.git/ "$kgitrepo" src/linux
       - shell:
           !include-raw-escape: scripts/lttng-modules/param-build.sh
 
diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index a905a38..1a3cce7 100644
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+## FUNCTIONS ##
+
 # Kernel version compare functions
 verlte() {
     [  "$1" = "`printf '%s\n%s' $1 $2 | sort -V | head -n1`" ]
@@ -32,29 +34,198 @@ vergt() {
     [ "$1" = "$2" ] && return 1 || vergte $1 $2
 }
 
+
+build_modules() {
+
+    kdir="$1"
+    bdir="$2"
+
+    # Get kernel version from source tree
+    cd "${kdir}"
+    kversion=$(make kernelversion)
+
+    # Enter lttng-modules source dir
+    cd "${LTTSRCDIR}"
+
+    # kernels 3.10 to 3.10.13 and 3.11 to 3.11.2 introduce a deadlock in the
+    # timekeeping subsystem. We want those build to fail.
+    if { vergte "$kversion" "3.10" && verlte "$kversion" "3.10.13"; } || \
+       { vergte "$kversion" "3.11" && verlte "$kversion" "3.11.2"; }; then
+
+        set +e
+
+        # Build modules
+        KERNELDIR="${kdir}" make -j${NPROC} V=1
+
+        # We expect this build to fail, if it doesn't, fail the job.
+        if [ "$?" -eq 0 ]; then
+            exit 1
+        fi
+
+        # We have to publish at least one file or the build will fail
+        echo "This kernel is broken, there is a deadlock in the timekeeping subsystem." > "${bdir}/BROKEN.txt"
+
+        set -e
+
+    else # Regular build
+
+        # Build modules against full kernel sources
+        KERNELDIR="${kdir}" make -j${NPROC} V=1
+
+        # Install modules to build dir
+        KERNELDIR="${kdir}" make INSTALL_MOD_PATH="${bdir}" modules_install
+
+        # Clean build dir
+        KERNELDIR="${kdir}" make clean
+    fi
+}
+
+
+## MAIN ##
+
 # Use all CPU cores
 NPROC=$(nproc)
 
-SRCDIR="${WORKSPACE}/lttng-modules"
-BUILDDIR="${WORKSPACE}/build"
-LNXSRCDIR="${WORKSPACE}/linux"
-LNXBUILDDIR="${WORKSPACE}/linux-build"
+LTTSRCDIR="${WORKSPACE}/src/lttng-modules"
+LNXSRCDIR="${WORKSPACE}/src/linux"
+
+LNXBUILDDIR="${WORKSPACE}/build/linux"
+LNXHDRDIR="${WORKSPACE}/build/linux-headers"
+
+LTTBUILKSRCDDIR="${WORKSPACE}/build/lttng-modules-ksrc"
+LTTBUILDKHDRDIR="${WORKSPACE}/build/lttng-modules-khdr"
+
+
+# Set arch specific values
+case "$arch" in
+    "x86-32")
+        karch="x86"
+        ;;
+
+    "x86-64")
+        karch="x86"
+        ;;
+
+    "armhf")
+        karch="arm"
+        ;;
+
+    "arm64")
+        karch="arm64"
+        ;;
+
+    "powerpc")
+        karch="powerpc"
+        ;;
+
+    "ppc64|ppc64el")
+        karch="powerpc"
+        ;;
+
+    *)
+        echo "Unsupported arch $arch"
+        exit 1
+        ;;
+esac
+
+
+# Create build directories
+mkdir -p "${LNXBUILDDIR}" "${LNXHDRDIR}"
+
+
+## PREPARE DISTRO STYLE KERNEL HEADERS / DEVEL
+
+# Enter linux source dir
+cd "${LNXSRCDIR}"
+
+# Prepare linux sources for headers install
+make defconfig
 
-# Create build directory
-mkdir -p "${BUILDDIR}" "${LNXBUILDDIR}"
+# Enable CONFIG_KALLSYMS_ALL
+sed -i "s/# CONFIG_KALLSYMS_ALL is not set/CONFIG_KALLSYMS_ALL=y/g" .config
+
+make modules_prepare
+
+# first copy everything
+cp --parents `find  -type f -name "Makefile*" -o -name "Kconfig*"` "${LNXHDRDIR}"
+
+if [ -s Module.symvers ]; then
+    cp Module.symvers "${LNXHDRDIR}"
+fi
+
+if [ -s System.map ]; then
+    cp System.map "${LNXHDRDIR}"
+fi
+
+if [ -s Module.markers ]; then
+    cp Module.markers "${LNXHDRDIR}"
+fi
+
+# then drop all but the needed Makefiles/Kconfig files
+rm -rf "${LNXHDRDIR}/Documentation"
+rm -rf "${LNXHDRDIR}/scripts"
+rm -rf "${LNXHDRDIR}/include"
+
+cp .config "${LNXHDRDIR}"
+cp -a scripts "${LNXHDRDIR}"
+
+if [ -d arch/${karch}/scripts ]; then
+    cp -a arch/${karch}/scripts "${LNXHDRDIR}/arch/${karch}/" || :
+fi
+
+if [ -f arch/${karch}/*lds ]; then
+    cp -a arch/${karch}/*lds "${LNXHDRDIR}/arch/${karch}/" || :
+fi
+
+rm -f "${LNXHDRDIR}/scripts/*.o"
+rm -f "${LNXHDRDIR}/scripts/*/*.o"
+
+if [ "${karch}" = "powerpc" ]; then
+    cp -a --parents arch/powerpc/lib/crtsavres.[So] "${LNXHDRDIR}/"
+fi
+
+if [ -d arch/${karch}/include ]; then
+    cp -a --parents arch/${karch}/include "${LNXHDRDIR}/"
+fi
+
+cp -a include "${LNXHDRDIR}/include"
+
+# Make sure the Makefile and version.h have a matching timestamp so that
+# external modules can be built
+if [ -s "${LNXHDRDIR}/include/generated/uapi/linux/version.h" ]; then
+    touch -r "${LNXHDRDIR}/Makefile" "${LNXHDRDIR}/include/generated/uapi/linux/version.h"
+elif [ -s "${LNXHDRDIR}/include/linux/version.h" ]; then
+    touch -r "${LNXHDRDIR}/Makefile" "${LNXHDRDIR}/include/linux/version.h"
+else
+    echo "Missing version.h"
+    exit 1
+fi
+touch -r "${LNXHDRDIR}/.config" "${LNXHDRDIR}/include/generated/autoconf.h"
+
+# Copy .config to include/config/auto.conf so "make prepare" is unnecessary.
+cp "${LNXHDRDIR}/.config" "${LNXHDRDIR}/include/config/auto.conf"
+
+
+
+
+## PREPARE FULL LINUX SOURCE TREE
 
 # Enter linux source dir
 cd "${LNXSRCDIR}"
 
+# Make sure linux source dir is clean
+make mrproper
+
 # Prepare linux sources for modules OOT build
 make O="${LNXBUILDDIR}" defconfig
 
 # Enable CONFIG_KALLSYMS_ALL
 sed -i "s/# CONFIG_KALLSYMS_ALL is not set/CONFIG_KALLSYMS_ALL=y/g" "${LNXBUILDDIR}"/.config
 
-# Build to out of tree dir
+# Prepare out of tree dir for modules build
 make O="${LNXBUILDDIR}" modules_prepare
 
+# Version specific tasks
 case "$kversion" in
   Ubuntu*)
     #fakeroot debian/rules clean
@@ -67,40 +238,10 @@ case "$kversion" in
     ;;
 esac
 
-# Get kernel version from source tree
-cd "${LNXBUILDDIR}"
-KVERSION=$(make kernelversion)
-
-# Enter source dir
-cd "${SRCDIR}"
-
-# kernels 3.10 to 3.10.13 and 3.11 to 3.11.2 introduce a deadlock in the
-# timekeeping subsystem. We want those build to fail.
-if { vergte "$KVERSION" "3.10" && verlte "$KVERSION" "3.10.13"; } || \
-   { vergte "$KVERSION" "3.11" && verlte "$KVERSION" "3.11.2"; }; then
+# Build modules against full kernel sources
+build_modules "${LNXBUILDDIR}" "${LTTBUILKSRCDDIR}"
 
-    set +e
-
-    # Build modules
-    KERNELDIR="${LNXBUILDDIR}" make -j${NPROC} V=1
-
-    # We expect this build to fail, if it doesn't, fail the job.
-    if [ "$?" -eq 0 ]; then
-        exit 1
-    fi
-
-    # We have to publish at least one file or the build will fail
-    echo "This kernel is broken, there is a deadlock in the timekeeping subsystem." > "${BUILDDIR}/BROKEN.txt"
-
-    set -e
-
-else # Regular build
-
-    # Build modules
-    KERNELDIR="${LNXBUILDDIR}" make -j${NPROC} V=1
-
-    # Install modules to build dir
-    KERNELDIR="${LNXBUILDDIR}" make INSTALL_MOD_PATH="${BUILDDIR}" modules_install
-fi
+# Build modules against kernel headers
+build_modules "${LNXHDRDIR}" "${LTTBUILDKHDRDIR}"
 
 # EOF