diff --git a/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/0001-cross-compile.patch b/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/0001-cross-compile.patch deleted file mode 100644 index 126c67f86..000000000 --- a/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/0001-cross-compile.patch +++ /dev/null @@ -1,84 +0,0 @@ -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 -+++ b/ath6kl-wmiconfig/Makefile -@@ -5,12 +5,12 @@ - #------------------------------------------------ - -include .config - --LDFLAGS += $(shell pkg-config --cflags --libs glib-2.0) -+# LDFLAGS += $(shell pkg-config --cflags --libs glib-2.0) - --CC :=$(ATH_CROSS_COMPILE_TYPE)gcc -+# CC :=$(ATH_CROSS_COMPILE_TYPE)gcc - APP=wmiconfig - --NLLIBNAME = libnl-1 -+NLLIBNAME = libnl-3.0 - LIBTCMD_DIR := ../libtcmd - - LDFLAGS += -ltcmd $(shell pkg-config --libs $(NLLIBNAME)) -lrt -diff --git a/libtcmd/Makefile b/libtcmd/Makefile -index 22f17db..3e25c21 100644 ---- a/libtcmd/Makefile -+++ b/libtcmd/Makefile -@@ -1,7 +1,7 @@ --CC = gcc --CFLAGS = -Wall -g -+# CC = gcc -+# CFLAGS = -Wall -g - --NLLIBNAME = libnl-1 -+NLLIBNAME = libnl-3.0 - WLAN_API = WLAN_API_NL80211 - WLAN_API_SRCS = nl80211.c - -@@ -9,7 +9,7 @@ SRCS = os.c $(WLAN_API_SRCS) libtcmd.c - OBJS = $(SRCS:.c=.o) - - LDLIBS += $(shell pkg-config --libs $(NLLIBNAME)) -lrt --CFLAGS += $(shell pkg-config --cflags $(NLLIBNAME)) -D$(WLAN_API) -+CFLAGS += $(shell pkg-config --cflags $(NLLIBNAME)) -D$(WLAN_API) -DLIBNL_3 - - libtcmd.a: $(SRCS) $(OBJS) - $(AR) rcs $@ $(OBJS) -diff --git a/libtcmd/nl80211.c b/libtcmd/nl80211.c -index ec44a68..783d172 100644 ---- a/libtcmd/nl80211.c -+++ b/libtcmd/nl80211.c -@@ -8,7 +8,7 @@ - - int cb_ret; - --#ifdef LIBNL_2 -+#if defined(LIBNL_2) || defined(LIBNL_3) - static inline struct nl_sock *nl_handle_alloc(void) - { - return nl_socket_alloc(); diff --git a/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/ccardimx28/athtestcmd b/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/ccardimx28/athtestcmd deleted file mode 100755 index 785b34dec..000000000 Binary files a/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/ccardimx28/athtestcmd and /dev/null differ diff --git a/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/ccardimx28/wmiconfig b/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/ccardimx28/wmiconfig deleted file mode 100755 index eb1049c4c..000000000 Binary files a/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/ccardimx28/wmiconfig and /dev/null differ diff --git a/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/ccimx6/athtestcmd b/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/ccimx6/athtestcmd deleted file mode 100755 index e924592ee..000000000 Binary files a/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/ccimx6/athtestcmd and /dev/null differ diff --git a/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/ccimx6/wmiconfig b/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/ccimx6/wmiconfig deleted file mode 100755 index 5a3e9fa75..000000000 Binary files a/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools-3.4p4/ccimx6/wmiconfig and /dev/null differ diff --git a/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools_3.4p4.bb b/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools_3.4p4.bb deleted file mode 100644 index 1fd9149e5..000000000 --- a/meta-digi-arm/recipes-bsp/ath-prop-tools/ath-prop-tools_3.4p4.bb +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (C) 2013 Digi International. - -SUMMARY = "Atheros' proprietary tools" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" - -DEPENDS = "libnl" - -inherit pkgconfig - -ATH_PROP_PN = "atheros-proprietary-v3.4p4-b3.4.0.158" - -SRC_URI_src = " \ - http://build-linux.digi.com/yocto/downloads/${ATH_PROP_PN}.tar.gz;name=tarball \ - file://0001-cross-compile.patch \ -" -SRC_URI_bin = " \ - file://athtestcmd \ - file://wmiconfig \ -" -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" - -S = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${WORKDIR}/${ATH_PROP_PN}', '${WORKDIR}', d)}" - -INSANE_SKIP_${PN} = "already-stripped" -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 -} - -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 athtestcmd wmiconfig ${D}${sbindir} - fi -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(ccardimx28|ccimx6)" 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 673b16e4f..52304b65d 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb @@ -16,5 +16,5 @@ RDEPENDS_${PN} = "\ wpa-supplicant-passphrase \ " -RDEPENDS_${PN}_append_mxs = " iw ath-prop-tools" -RDEPENDS_${PN}_append_mx6 = " iw ath-prop-tools" +RDEPENDS_${PN}_append_mxs = " iw" +RDEPENDS_${PN}_append_mx6 = " iw"