summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/module-base.bbclass12
-rw-r--r--meta/classes/module.bbclass4
-rw-r--r--meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb28
3 files changed, 31 insertions, 13 deletions
diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass
index f851b85163..27bd69ff33 100644
--- a/meta/classes/module-base.bbclass
+++ b/meta/classes/module-base.bbclass
@@ -1,7 +1,8 @@
1inherit kernel-arch 1inherit kernel-arch
2 2
3# This is instead of DEPENDS = "virtual/kernel" 3# We do the dependency this way because the output is not preserved
4do_configure[depends] += "virtual/kernel:do_compile_kernelmodules" 4# in sstate, so we must force do_compile to run (once).
5do_configure[depends] += "make-mod-scripts:do_compile"
5 6
6export OS = "${TARGET_OS}" 7export OS = "${TARGET_OS}"
7export CROSS_COMPILE = "${TARGET_PREFIX}" 8export CROSS_COMPILE = "${TARGET_PREFIX}"
@@ -18,10 +19,3 @@ KERNEL_OBJECT_SUFFIX = ".ko"
18# kernel modules are generally machine specific 19# kernel modules are generally machine specific
19PACKAGE_ARCH = "${MACHINE_ARCH}" 20PACKAGE_ARCH = "${MACHINE_ARCH}"
20 21
21# Function to ensure the kernel scripts are created. Expected to
22# be called before do_compile. See module.bbclass for an example.
23do_make_scripts() {
24 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
25 make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \
26 -C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} scripts
27}
diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
index 78d1b21dbd..e344960244 100644
--- a/meta/classes/module.bbclass
+++ b/meta/classes/module.bbclass
@@ -1,9 +1,5 @@
1inherit module-base kernel-module-split pkgconfig 1inherit module-base kernel-module-split pkgconfig
2 2
3addtask make_scripts after do_prepare_recipe_sysroot before do_configure
4do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
5do_make_scripts[depends] += "virtual/kernel:do_shared_workdir"
6
7EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}" 3EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}"
8 4
9MODULES_INSTALL_TARGET ?= "modules_install" 5MODULES_INSTALL_TARGET ?= "modules_install"
diff --git a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
new file mode 100644
index 0000000000..6e47d09f79
--- /dev/null
+++ b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
@@ -0,0 +1,28 @@
1SUMMARY = "Build tools needed by external modules"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
4
5inherit kernel-arch
6inherit pkgconfig
7
8PACKAGE_ARCH = "${MACHINE_ARCH}"
9
10S = "${WORKDIR}"
11
12do_configure[depends] += "virtual/kernel:do_shared_workdir"
13do_compile[depends] += "virtual/kernel:do_compile_kernelmodules"
14
15# Build some host tools under work-shared. CC, LD, and AR are probably
16# not used, but this is the historical way of invoking "make scripts".
17#
18do_configure() {
19 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
20 make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \
21 -C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} scripts
22}
23
24
25# There is no reason to build this on its own.
26#
27EXCLUDE_FROM_WORLD = "1"
28