From 4f857db335de6935077d4866c51dd9d6851fed1d Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Tue, 22 Feb 2005 12:53:55 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/21 17:35:27-06:00 ti.com!kergoth Kill the ipkg paths patch, since its busted. 2005/02/21 17:33:13-06:00 ti.com!kergoth Fix sbindir in native.bbclass and cross.bbclass. Thanks to Jordan Crouse for reporting. 2005/02/21 17:13:19-06:00 ti.com!kergoth Add the paths patch to ipkg which fixes it to no longer hardcode the '/usr/lib/ipkg' path, which I forgot to check in from the previous commit. 2005/02/21 17:09:46-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/02/21 17:09:03-06:00 ti.com!kergoth Run a sed script against our packages to fix some hardcoded target path references. As always when I do things like this, if packages you maintain were touched by this, please do a sanity check to ensure the sed script didn't run wild. 2005/02/21 15:49:47-06:00 ti.com!kergoth Use a HOTPLUG variable to manage which hotplug you prefer, to ensure that hotplug is still included in task-bootstrap even if you dont set DISTRO. BKrev: 421b2b63X5eoMcSrC7pVcptXK-iFKg --- .../atmelwlandriver/atmelwlandriver_3.3.5.6.bb | 39 ++++++++++++++++++++++ .../atmelwlandriver/atmelwlandriver_3.4.1.0.bb | 39 ++++++++++++++++++++++ 2 files changed, 78 insertions(+) (limited to 'packages/atmelwlandriver') diff --git a/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb b/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb index e69de29bb2..fd156a31c7 100644 --- a/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb +++ b/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb @@ -0,0 +1,39 @@ +SRC_URI = "${SOURCEFORGE_MIRROR}/atmelwlandriver/atmelwlandriver-${PV}.tar.bz2 \ + file://dotconfig \ + file://pcmf502rd.conf \ + file://makefile.patch;patch=1" +S = "${WORKDIR}/atmelwlandriver" +LICENSE = "GPL" + +inherit module +SECTION = "base" + +do_configure() { + install ${WORKDIR}/dotconfig .config +} + +CFLAGS = "-DLINUX_OS -D__KERNEL__ -DMODULE -I${S}/src/includes -I${S}/src/includes/pcmcia -I${STAGING_KERNEL_DIR}/include" + +do_compile() { + export INC="${S}/src/includes" + export OBJDIR="${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/" + export KERNEL_PATH="${STAGING_KERNEL_DIR}" + export KERNEL_SRC="${STAGING_KERNEL_DIR}" + export CC="${KERNEL_CC}" + export LD="${KERNEL_LD}" + export KERNEL_VERSION="${KERNEL_VERSION}" + export TOPDIR="${S}" + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + install -d ${OBJDIR} + #oe_runmake -C src/Pcmcia_Pci final CFLAGS:='${CFLAGS} -DATMEL_WLAN -DRFMD -DINT_ROAM' MODULE:='pcmf502r' LIB:=-RFMD- + oe_runmake -C src/Pcmcia_Pci final CFLAGS:='${CFLAGS} -DATMEL_WLAN -DRFMD -DINT_ROAM -DREV_D' MODULE:='pcmf502rd' LIB:=-REVD- + #oe_runmake -C src/Pcmcia_Pci final CFLAGS:='${CFLAGS} -DATMEL_WLAN -DRFMD -DINT_ROAM -DREV_E' MODULE:='pcmf502re' LIB:=-REVE- +} + +do_install() { + install -d ${D}/${sysconfdir}/pcmcia + install -m 0644 ${WORKDIR}/pcmf502rd.conf ${D}/${sysconfdir}/pcmcia/ + + # remove any maps that were installed + rm -f ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/*.map +} diff --git a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb b/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb index e69de29bb2..fd156a31c7 100644 --- a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb +++ b/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb @@ -0,0 +1,39 @@ +SRC_URI = "${SOURCEFORGE_MIRROR}/atmelwlandriver/atmelwlandriver-${PV}.tar.bz2 \ + file://dotconfig \ + file://pcmf502rd.conf \ + file://makefile.patch;patch=1" +S = "${WORKDIR}/atmelwlandriver" +LICENSE = "GPL" + +inherit module +SECTION = "base" + +do_configure() { + install ${WORKDIR}/dotconfig .config +} + +CFLAGS = "-DLINUX_OS -D__KERNEL__ -DMODULE -I${S}/src/includes -I${S}/src/includes/pcmcia -I${STAGING_KERNEL_DIR}/include" + +do_compile() { + export INC="${S}/src/includes" + export OBJDIR="${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/" + export KERNEL_PATH="${STAGING_KERNEL_DIR}" + export KERNEL_SRC="${STAGING_KERNEL_DIR}" + export CC="${KERNEL_CC}" + export LD="${KERNEL_LD}" + export KERNEL_VERSION="${KERNEL_VERSION}" + export TOPDIR="${S}" + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + install -d ${OBJDIR} + #oe_runmake -C src/Pcmcia_Pci final CFLAGS:='${CFLAGS} -DATMEL_WLAN -DRFMD -DINT_ROAM' MODULE:='pcmf502r' LIB:=-RFMD- + oe_runmake -C src/Pcmcia_Pci final CFLAGS:='${CFLAGS} -DATMEL_WLAN -DRFMD -DINT_ROAM -DREV_D' MODULE:='pcmf502rd' LIB:=-REVD- + #oe_runmake -C src/Pcmcia_Pci final CFLAGS:='${CFLAGS} -DATMEL_WLAN -DRFMD -DINT_ROAM -DREV_E' MODULE:='pcmf502re' LIB:=-REVE- +} + +do_install() { + install -d ${D}/${sysconfdir}/pcmcia + install -m 0644 ${WORKDIR}/pcmf502rd.conf ${D}/${sysconfdir}/pcmcia/ + + # remove any maps that were installed + rm -f ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/*.map +} -- cgit v1.2.3