summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-01-08 14:43:32 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-01-08 14:43:32 +0000
commit7c628949589d6084ca091a39688dfa14e759e4db (patch)
treeb3c6a090d386741b7ae5ab1b03f8e57451abbc1f
parentd40c8607627bb683a3a49005749934e7d241ca6b (diff)
downloadpoky-7c628949589d6084ca091a39688dfa14e759e4db.tar.gz
module*.bbclass: set AR to KERNEL_AR during building of kernel modules (from Poky trunk r3422)
git-svn-id: https://svn.o-hand.com/repos/poky/branches/blinky@3423 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/classes/module-base.bbclass4
-rw-r--r--meta/classes/module.bbclass1
2 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass
index da5bd01dae..c98baceeab 100644
--- a/meta/classes/module-base.bbclass
+++ b/meta/classes/module-base.bbclass
@@ -10,6 +10,7 @@ export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')
10KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]}" 10KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]}"
11KERNEL_CCSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}" 11KERNEL_CCSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}"
12KERNEL_LDSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}" 12KERNEL_LDSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}"
13KERNEL_ARSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-arsuffix')}"
13 14
14# Set TARGET_??_KERNEL_ARCH in the machine .conf to set architecture 15# Set TARGET_??_KERNEL_ARCH in the machine .conf to set architecture
15# specific options necessary for building the kernel and modules. 16# specific options necessary for building the kernel and modules.
@@ -17,9 +18,12 @@ TARGET_CC_KERNEL_ARCH ?= ""
17HOST_CC_KERNEL_ARCH ?= "${TARGET_CC_KERNEL_ARCH}" 18HOST_CC_KERNEL_ARCH ?= "${TARGET_CC_KERNEL_ARCH}"
18TARGET_LD_KERNEL_ARCH ?= "" 19TARGET_LD_KERNEL_ARCH ?= ""
19HOST_LD_KERNEL_ARCH ?= "${TARGET_LD_KERNEL_ARCH}" 20HOST_LD_KERNEL_ARCH ?= "${TARGET_LD_KERNEL_ARCH}"
21TARGET_AR_KERNEL_ARCH ?= ""
22HOST_AR_KERNEL_ARCH ?= "${TARGET_AR_KERNEL_ARCH}"
20 23
21KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX} ${HOST_CC_KERNEL_ARCH}" 24KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX} ${HOST_CC_KERNEL_ARCH}"
22KERNEL_LD = "${LD}${KERNEL_LDSUFFIX} ${HOST_LD_KERNEL_ARCH}" 25KERNEL_LD = "${LD}${KERNEL_LDSUFFIX} ${HOST_LD_KERNEL_ARCH}"
26KERNEL_AR = "${AR}${KERNEL_ARSUFFIX} ${HOST_AR_KERNEL_ARCH}"
23 27
24# kernel modules are generally machine specific 28# kernel modules are generally machine specific
25PACKAGE_ARCH = "${MACHINE_ARCH}" 29PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
index f55b89c4da..d3783a4bba 100644
--- a/meta/classes/module.bbclass
+++ b/meta/classes/module.bbclass
@@ -26,6 +26,7 @@ module_do_compile() {
26 KERNEL_SRC=${STAGING_KERNEL_DIR} \ 26 KERNEL_SRC=${STAGING_KERNEL_DIR} \
27 KERNEL_VERSION=${KERNEL_VERSION} \ 27 KERNEL_VERSION=${KERNEL_VERSION} \
28 CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ 28 CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
29 AR="${KERNEL_AR}" \
29 ${MAKE_TARGETS} 30 ${MAKE_TARGETS}
30} 31}
31 32