From 4007fd2f6f730b003cced9eea4d52eb0e583c670 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Tue, 25 Sep 2012 12:55:04 +0100 Subject: [PATCH] module.bbclass: Move do_make_scripts() to module-base It's sometimes useful to have this function available to recipes which don't wish to use module.bbclass for whatever reason. (From OE-Core rev: 7632b44e7f487180811d47fbe9c29aa8e58868a2) Signed-off-by: Phil Blundell Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/module-base.bbclass | 11 +++++++++++ meta/classes/module.bbclass | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass index 9379bf8..210c47c 100644 --- a/meta/classes/module-base.bbclass +++ b/meta/classes/module-base.bbclass @@ -26,3 +26,14 @@ KERNEL_AR = "${HOST_PREFIX}ar${KERNEL_ARSUFFIX} ${HOST_AR_KERNEL_ARCH}" # kernel modules are generally machine specific PACKAGE_ARCH = "${MACHINE_ARCH}" + +# +# Ensure the hostprogs are available for module compilation. Modules that +# inherit this recipe and override do_compile() should be sure to call +# do_make_scripts() or ensure the scripts are built independently. +# +do_make_scripts() { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ + -C ${STAGING_KERNEL_DIR} scripts +} diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass index 4098644..e8d32eb 100644 --- a/meta/classes/module.bbclass +++ b/meta/classes/module.bbclass @@ -3,17 +3,6 @@ DEPENDS += "virtual/kernel" inherit module-base -# -# Ensure the hostprogs are available for module compilation. Modules that -# inherit this recipe and override do_compile() should be sure to call -# do_make_scripts() or ensure the scripts are built independently. -# -do_make_scripts() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ - -C ${STAGING_KERNEL_DIR} scripts -} - addtask make_scripts before do_compile do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock" do_make_scripts[deptask] = "do_populate_sysroot" -- 2.7.4