diff options
| author | Phil Blundell <philb@gnu.org> | 2012-09-25 12:55:04 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-18 12:13:34 +0100 |
| commit | 0aad4662769530ef3ea045b6ba1afec7cc3f3055 (patch) | |
| tree | 37bb1e3fdc955408eb411cf24272e95e7b87eb90 /meta/classes | |
| parent | c942d527ccce73339cefcabcc299f999a952a17b (diff) | |
| download | poky-0aad4662769530ef3ea045b6ba1afec7cc3f3055.tar.gz | |
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 <pb@pbcl.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/module-base.bbclass | 11 | ||||
| -rw-r--r-- | 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 9379bf87fa..210c47ccd9 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}" | |||
| 26 | 26 | ||
| 27 | # kernel modules are generally machine specific | 27 | # kernel modules are generally machine specific |
| 28 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 28 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
| 29 | |||
| 30 | # | ||
| 31 | # Ensure the hostprogs are available for module compilation. Modules that | ||
| 32 | # inherit this recipe and override do_compile() should be sure to call | ||
| 33 | # do_make_scripts() or ensure the scripts are built independently. | ||
| 34 | # | ||
| 35 | do_make_scripts() { | ||
| 36 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | ||
| 37 | oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ | ||
| 38 | -C ${STAGING_KERNEL_DIR} scripts | ||
| 39 | } | ||
diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass index 4098644c71..e8d32eb3f4 100644 --- a/meta/classes/module.bbclass +++ b/meta/classes/module.bbclass | |||
| @@ -3,17 +3,6 @@ DEPENDS += "virtual/kernel" | |||
| 3 | 3 | ||
| 4 | inherit module-base | 4 | inherit module-base |
| 5 | 5 | ||
| 6 | # | ||
| 7 | # Ensure the hostprogs are available for module compilation. Modules that | ||
| 8 | # inherit this recipe and override do_compile() should be sure to call | ||
| 9 | # do_make_scripts() or ensure the scripts are built independently. | ||
| 10 | # | ||
| 11 | do_make_scripts() { | ||
| 12 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | ||
| 13 | oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ | ||
| 14 | -C ${STAGING_KERNEL_DIR} scripts | ||
| 15 | } | ||
| 16 | |||
| 17 | addtask make_scripts before do_compile | 6 | addtask make_scripts before do_compile |
| 18 | do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock" | 7 | do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock" |
| 19 | do_make_scripts[deptask] = "do_populate_sysroot" | 8 | do_make_scripts[deptask] = "do_populate_sysroot" |
