Patchwork module.bbclass: Move do_make_scripts() to module-base

login
register
mail settings
Submitter Phil Blundell
Date Sept. 25, 2012, 11:55 a.m.
Message ID <1348574105.31293.69.camel@phil-desktop>
Download mbox | patch
Permalink /patch/37183/
State Accepted
Commit 7632b44e7f487180811d47fbe9c29aa8e58868a2
Headers show

Comments

Phil Blundell - Sept. 25, 2012, 11:55 a.m.
It's sometimes useful to have this function available to recipes which
don't wish to use module.bbclass for whatever reason.

Signed-off-by: Phil Blundell <pb@pbcl.net>
---
 meta/classes/module-base.bbclass |   11 +++++++++++
 meta/classes/module.bbclass      |   11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)
Saul Wold - Oct. 18, 2012, 8 p.m.
On 09/25/2012 04:55 AM, Phil Blundell wrote:
> It's sometimes useful to have this function available to recipes which
> don't wish to use module.bbclass for whatever reason.
>
> Signed-off-by: Phil Blundell <pb@pbcl.net>
> ---
>   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 91628e4..c721202 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"
>

Merged into OE-Core

Thanks
	Sau!

Patch

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 91628e4..c721202 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"