diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-08-05 11:35:30 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-08-05 11:35:30 +0000 |
| commit | 9e07751bbfff494a3e3ea1b622112cfcffe69a69 (patch) | |
| tree | be556d23c4fa9425642e4233ae6ae90e11210436 | |
| parent | 6ac49090d6253e542ecb58a3a051ca344a68ba9e (diff) | |
add module-base which sets variables. module now inherits module-base. inherit module-base when you build packages which need to know about kernel variables.
BKrev: 41121b82qghzmTY7limvubwIaCIvkQ
| -rw-r--r-- | classes/module-base.oeclass | 0 | ||||
| -rw-r--r-- | classes/module.oeclass | 12 | ||||
| -rw-r--r-- | lirc/lirc-modules_0.6.6.oe | 22 | ||||
| -rw-r--r-- | lirc/lirc_0.6.6.oe | 15 | ||||
| -rw-r--r-- | wireless-tools/wireless-tools_26.oe | 7 |
5 files changed, 12 insertions, 44 deletions
diff --git a/classes/module-base.oeclass b/classes/module-base.oeclass new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/classes/module-base.oeclass diff --git a/classes/module.oeclass b/classes/module.oeclass index 68291b2918..53ca7d1929 100644 --- 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 8e9b7ee43e..eb2756a4e1 100644 --- 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 d877b4642d..0764df0da4 100644 --- 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 21d7d8c730..b39a25c047 100644 --- 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 |