add module-base which sets variables. module now inherits module-base. inherit module...

BKrev: 41121b82qghzmTY7limvubwIaCIvkQ

diff --git a/classes/module-base.oeclass b/classes/module-base.oeclass
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/classes/module.oeclass b/classes/module.oeclass
index 68291b2..53ca7d1 100644 (file)
--- a/classes/module.oeclass
+++ b/classes/module.oeclass
@@ -1,17 +1,7 @@
 RDEPENDS_append = " kernel (${KERNEL_VERSION})"
 DEPENDS_append = " virtual/kernel"
 
-export ARCH = "${TARGET_ARCH}"
-export OS = "${TARGET_OS}"
-export CROSS_COMPILE = "${TARGET_PREFIX}"
-
-
-export KERNEL_VERSION = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')}
-export KERNEL_SOURCE = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-source')}
-KERNEL_CCSUFFIX = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-ccsuffix')}
-KERNEL_LDSUFFIX = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-ldsuffix')}
-KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX}"
-KERNEL_LD = "${LD}${KERNEL_LDSUFFIX}"
+inherit module-base
 
 module_do_compile() {
        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS

diff --git a/lirc/lirc-modules_0.6.6.oe b/lirc/lirc-modules_0.6.6.oe
index 8e9b7ee..eb2756a 100644 (file)
--- a/lirc/lirc-modules_0.6.6.oe
+++ b/lirc/lirc-modules_0.6.6.oe
@@ -9,27 +9,15 @@ DEPENDS = "virtual/kernel"
 SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz"
 S = "${WORKDIR}/lirc-${PV}"
 
-inherit autotools
+inherit autotools module-base
 
-export ARCH=${TARGET_ARCH}
-export OS=${TARGET_OS}
-export CROSS_COMPILE=${CROSS}
-
-KERNEL_VERSION = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')}
-KERNEL_SOURCE = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-source')}
-KERNEL_CCSUFFIX = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-ccsuffix')}
-KERNEL_LDSUFFIX = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-ldsuffix')}
-KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX}"
-KERNEL_LD = "${LD}${KERNEL_LDSUFFIX}"
+EXTRA_OECONF_collie = "--with-kerneldir=${KERNEL_SOURCE} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_h3600 = "--with-kerneldir=${KERNEL_SOURCE} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_beagle = "--with-kerneldir=${KERNEL_SOURCE} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_simpad = "--with-kerneldir=${KERNEL_SOURCE} --with-driver=sa1100 --without-x"
 
 export TOPDIR = "${KERNEL_SOURCE}"
 
-#FIXME: Caution: EXTRA_OECONF is arm-specific!
-
-EXTRA_OECONF = "--with-kerneldir=${KERNEL_SOURCE}                      \
-                --with-driver=sa1100                                   \ 
-                --without-x"
-
 do_compile() {
        cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 }

diff --git a/lirc/lirc_0.6.6.oe b/lirc/lirc_0.6.6.oe
index d877b46..0764df0 100644 (file)
--- a/lirc/lirc_0.6.6.oe
+++ b/lirc/lirc_0.6.6.oe
@@ -9,17 +9,12 @@ DEPENDS = "virtual/kernel"
 SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz"
 S = "${WORKDIR}/lirc-${PV}"
 
-inherit autotools
+inherit autotools module-base
 
-KERNEL_VERSION = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')}
-KERNEL_SOURCE = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-source')}
-KERNEL_PATH = "${STAGING_LIBDIR}/../kernel"
-
-#FIXME: Caution: EXTRA_OECONF is arm-specific!
-
-EXTRA_OECONF = "--with-kerneldir=${KERNEL_SOURCE}                      \
-                --with-driver=sa1100                                   \ 
-                --without-x"
+EXTRA_OECONF_collie = "--with-kerneldir=${KERNEL_SOURCE} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_h3600 = "--with-kerneldir=${KERNEL_SOURCE} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_beagle = "--with-kerneldir=${KERNEL_SOURCE} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_simpad = "--with-kerneldir=${KERNEL_SOURCE} --with-driver=sa1100 --without-x"
 
 EXTRA_OEMAKE = 'SUBDIRS="daemons tools"'
 

diff --git a/wireless-tools/wireless-tools_26.oe b/wireless-tools/wireless-tools_26.oe
index 21d7d8c..b39a25c 100644 (file)
--- a/wireless-tools/wireless-tools_26.oe
+++ b/wireless-tools/wireless-tools_26.oe
@@ -11,12 +11,7 @@ SRC_URI = "http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.${PV}.tar
           file://wireless-tools.if-pre-up"
 S = "${WORKDIR}/wireless_tools.${PV}"
 
-export KERNEL_SOURCE = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-source')}
-export KERNEL_VERSION = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')}
-KERNEL_CCSUFFIX = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-ccsuffix')}
-KERNEL_LDSUFFIX = ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-ldsuffix')}
-KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX}"
-KERNEL_LD = "${LD}${KERNEL_LDSUFFIX}"
+inherit module-base
 
 do_configure() {
        rm -rf wireless.h