diff --git a/meta-digi-arm/conf/machine/ccardimx28js.conf b/meta-digi-arm/conf/machine/ccardimx28js.conf index 36d262562..bcba80745 100644 --- a/meta-digi-arm/conf/machine/ccardimx28js.conf +++ b/meta-digi-arm/conf/machine/ccardimx28js.conf @@ -12,9 +12,6 @@ KERNEL_DEVICETREE = "imx28-${MACHINE}.dtb" # create a symlink to the correct device. SERIAL_CONSOLES = "115200;ttyS0" -# Use our wmiconfig instead of the one in meta-oe -PREFERRED_VERSION_wmiconfig ?= "3.4p4" - ################################################# ## Flash parameters for JFFS2 and UBIFS images ## ################################################# diff --git a/meta-digi-arm/recipes-bsp/wmiconfig/wmiconfig-3.4p4/0001-cross_compile.patch b/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/0001-cross-compile.patch similarity index 64% rename from meta-digi-arm/recipes-bsp/wmiconfig/wmiconfig-3.4p4/0001-cross_compile.patch rename to meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/0001-cross-compile.patch index b3eccb7b0..126c67f86 100644 --- a/meta-digi-arm/recipes-bsp/wmiconfig/wmiconfig-3.4p4/0001-cross_compile.patch +++ b/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/0001-cross-compile.patch @@ -1,3 +1,30 @@ +From: Javier Viguera +Date: Thu, 23 Jan 2014 14:01:05 +0100 +Subject: [PATCH] cross compile + +Signed-off-by: Javier Viguera +--- + ath6kl-tcmd/Makefile | 6 +++--- + ath6kl-wmiconfig/Makefile | 6 +++--- + libtcmd/Makefile | 8 ++++---- + libtcmd/nl80211.c | 2 +- + 4 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/ath6kl-tcmd/Makefile b/ath6kl-tcmd/Makefile +index 733ac0f..44d06cf 100644 +--- a/ath6kl-tcmd/Makefile ++++ b/ath6kl-tcmd/Makefile +@@ -1,7 +1,7 @@ +-CC = gcc +-CFLAGS = -Wall -g ++# CC = gcc ++# CFLAGS = -Wall -g + +-NLLIBNAME = libnl-1 ++NLLIBNAME = libnl-3.0 + LIBTCMD_DIR := ../libtcmd + + LDLIBS += $(shell pkg-config --libs $(NLLIBNAME)) -lrt -ltcmd -lm diff --git a/ath6kl-wmiconfig/Makefile b/ath6kl-wmiconfig/Makefile index b9787a4..b074b6f 100644 --- a/ath6kl-wmiconfig/Makefile @@ -19,13 +46,14 @@ index b9787a4..b074b6f 100644 LDFLAGS += -ltcmd $(shell pkg-config --libs $(NLLIBNAME)) -lrt diff --git a/libtcmd/Makefile b/libtcmd/Makefile -index 22f17db..1048758 100644 +index 22f17db..3e25c21 100644 --- a/libtcmd/Makefile +++ b/libtcmd/Makefile @@ -1,7 +1,7 @@ -CC = gcc +-CFLAGS = -Wall -g +# CC = gcc - CFLAGS = -Wall -g ++# CFLAGS = -Wall -g -NLLIBNAME = libnl-1 +NLLIBNAME = libnl-3.0 diff --git a/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/athtestcmd b/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/athtestcmd new file mode 100755 index 000000000..aaff4f39d Binary files /dev/null and b/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/athtestcmd differ diff --git a/meta-digi-arm/recipes-bsp/wmiconfig/wmiconfig-3.4p4/wmiconfig b/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/wmiconfig similarity index 100% rename from meta-digi-arm/recipes-bsp/wmiconfig/wmiconfig-3.4p4/wmiconfig rename to meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/wmiconfig diff --git a/meta-digi-arm/recipes-bsp/wmiconfig/wmiconfig_3.4p4.bb b/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools_3.4p4.bb similarity index 50% rename from meta-digi-arm/recipes-bsp/wmiconfig/wmiconfig_3.4p4.bb rename to meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools_3.4p4.bb index 1c0787f88..4eb206caa 100644 --- a/meta-digi-arm/recipes-bsp/wmiconfig/wmiconfig_3.4p4.bb +++ b/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools_3.4p4.bb @@ -1,6 +1,6 @@ # Copyright (C) 2013 Digi International. -SUMMARY = "Atheros' wmiconfig proprietary tool" +SUMMARY = "Atheros' proprietary tools" LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" @@ -10,18 +10,24 @@ inherit pkgconfig ATH_PROP_PN = "atheros-proprietary-v3.4p4-b3.4.0.158" -SRC_MD5 = "5693e26e904ee7b829bc09a202b5fdcb" -SRC_SHA256 = "9d29113a9832ee4960d75c42e0ba229c71ebfe1f1f6f7738b213329c6214e708" -BIN_MD5 = "f502062cdecae89cd68562e476a896c9" -BIN_SHA256 = "687b7139904b1de7424abfdf7968d30fe2cef3c9bae95638e05d9532aa2bca2b" - SRC_URI_src = " \ - http://build-linux.digi.com/yocto/downloads/${ATH_PROP_PN}.tar.gz;md5sum=${SRC_MD5};sha256sum=${SRC_SHA256} \ - file://0001-cross_compile.patch \ + http://build-linux.digi.com/yocto/downloads/${ATH_PROP_PN}.tar.gz;name=tarball \ + file://0001-cross-compile.patch \ +" +SRC_URI_bin = " \ + file://athtestcmd;name=athtestcmd \ + file://wmiconfig;name=wmiconfig \ " -SRC_URI_bin = "file://wmiconfig;md5sum=${BIN_MD5};sha256sum=${BIN_SHA256}" SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_src}', '${SRC_URI_bin}', d)}" +SRC_URI[tarball.md5sum] = "5693e26e904ee7b829bc09a202b5fdcb" +SRC_URI[tarball.sha256sum] = "9d29113a9832ee4960d75c42e0ba229c71ebfe1f1f6f7738b213329c6214e708" + +SRC_URI[athtestcmd.md5sum] = "1ef34615e67692ba68aeeab6bf665d7c" +SRC_URI[athtestcmd.sha256sum] = "195c32fc54ec336a7daed165929427addb53605f7cf1709478b89704efb84269" +SRC_URI[wmiconfig.md5sum] = "f502062cdecae89cd68562e476a896c9" +SRC_URI[wmiconfig.sha256sum] = "687b7139904b1de7424abfdf7968d30fe2cef3c9bae95638e05d9532aa2bca2b" + S = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${WORKDIR}/${ATH_PROP_PN}', '${WORKDIR}', d)}" EXTRA_OEMAKE = "" @@ -29,6 +35,7 @@ EXTRA_OEMAKE = "" do_compile() { if [ "${DIGI_INTERNAL_GIT}" = "1" ]; then oe_runmake -C libtcmd + oe_runmake -C ath6kl-tcmd oe_runmake -C ath6kl-wmiconfig fi } @@ -36,25 +43,12 @@ do_compile() { do_install() { install -d ${D}${sbindir} if [ "${DIGI_INTERNAL_GIT}" = "1" ]; then + install -m 0755 ath6kl-tcmd/athtestcmd ${D}${sbindir} install -m 0755 ath6kl-wmiconfig/wmiconfig ${D}${sbindir} else - install -m 0755 wmiconfig ${D}${sbindir} + install -m 0755 athtestcmd wmiconfig ${D}${sbindir} fi } -# Deploy binary if building from sources -do_deploy() { - if [ "${DIGI_INTERNAL_GIT}" = "1" ]; then - install -d ${DEPLOY_DIR_IMAGE} - if [ -f "${D}${sbindir}/wmiconfig" ]; then - cp "${D}${sbindir}/wmiconfig" ${DEPLOY_DIR_IMAGE}/ - else - bberror "Wmiconfig binary not found: "${D}${sbindir}/wmiconfig"" - exit 1 - fi - fi -} -addtask deploy before do_build after do_install - PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "mxs" diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb index 38c903698..3820dd83b 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb @@ -23,4 +23,4 @@ RDEPENDS_${PN} = "\ ${WIRELESS_MODULE} \ " -RDEPENDS_${PN}_append_mxs = " iw wmiconfig" +RDEPENDS_${PN}_append_mxs = " iw ath-prop-tools"