Skip to contentSkip to conversation

Remove exported KERNEL_SOURCE

PATCH Applied Anders Darander 2 participants 5 messages Jul 5, 2011 – Jul 7, 2011

lore
Share & tools
lore
#0 lore raw

cover Remove exported KERNEL_SOURCE

Remove KERNEL-SOURCE as an exported variable. When building an external module the STAGING_KERNEL_DIR variable can justbas well be used in the module recipe.

The following changes since commit 2b3bf5350861f62435e2fdf1c56c8a02f4b1b4ac:

xauth: upgrade from 1.05 to 1.06 (2011-07-04 12:45:01 +0100)

are available in the git repository at:
git://github.com/darander/oe-core kernel-source
https://github.com/darander/oe-core/tree/kernel-source

Anders Darander (1):
module-base: remove KERNEL-SOURCE

 meta/classes/module-base.bbclass |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/1 module-base: remove KERNEL-SOURCE

kernel-source do not exist in STAGING_KERNEL_DIR any longer. Remove the exported KERNEL_SOURCE as the STAGING_KERNEL_DIR can be used in module recipes directly.

---
 meta/classes/module-base.bbclass |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
meta/classes/module-base.bbclass +0 -1
index a7cf233..1a39cc1 100644
@@ -6,7 +6,6 @@ export OS = "${TARGET_OS}"
 export CROSS_COMPILE = "${TARGET_PREFIX}"
 
 export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}"
-export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}"
 KERNEL_OBJECT_SUFFIX = ".ko"
 KERNEL_CCSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}"
 KERNEL_LDSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}"
Signature · 1 line
1.7.4.1
#2 lore raw

Re: [PATCH 1/1] module-base: remove KERNEL-SOURCE

Quoted 14 lines · Anders Darander

kernel-source do not exist in STAGING_KERNEL_DIR any longer. Remove the exported KERNEL_SOURCE as the STAGING_KERNEL_DIR can be used in module recipes directly.

---
 meta/classes/module-base.bbclass |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
meta/classes/module-base.bbclass +0 -0
index a7cf233..1a39cc1 100644

meta/classes/module-base.bbclass export OS = "${TARGET_OS}" · line 11

Quoted 7 lines
meta/classes/module-base.bbclass +0 -1
@@ -6,7 +6,6 @@ export OS = "${TARGET_OS}"
 export CROSS_COMPILE = "${TARGET_PREFIX}"
 
 export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}"
-export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}"
 KERNEL_OBJECT_SUFFIX = ".ko"
 KERNEL_CCSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}"
 KERNEL_LDSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}"

Merged to master, thanks.

Richard

#3 lore raw
In reply to Anders Darander
Quoted 4 lines · Anders Darander Anders Darander

Remove KERNEL-SOURCE as an exported variable. When building an external module the STAGING_KERNEL_DIR variable can justbas well be used in the module recipe.

There is an alternative solution, which is to instead of removing the line
export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-
source')}"
replace it with something like:
export KERNEL_SOURCE = "${STAGING_KERNEL_DIR}"

The only benefit from that solution is to prevent breaking of recipes when moving from oe.dev to oe-core. However, I prefer the original solution as we otherwise would have more redundant variables.

Regards,
Anders

#4 lore raw
Quoted 12 lines · Anders Darander
Quoted 4 lines · Anders Darander Anders Darander

Remove KERNEL-SOURCE as an exported variable. When building an external module the STAGING_KERNEL_DIR variable can justbas well be used in the module recipe.

There is an alternative solution, which is to instead of removing the line
export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-
source')}"
replace it with something like:
export KERNEL_SOURCE = "${STAGING_KERNEL_DIR}"

Quoted 3 lines

The only benefit from that solution is to prevent breaking of recipes when moving from oe.dev to oe-core. However, I prefer the original solution as we otherwise would have more redundant variables.

Since the directory in question doesn't exist, we can likely remove this as anyone using it should have complained by now...

We can add it back with the corrected version if anyone does turn out to need it.

Cheers,

Richard