From patchwork Fri May 25 12:51:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 161336 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id A8586B6EEB for ; Fri, 25 May 2012 22:52:13 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 92C0131A48; Fri, 25 May 2012 12:52:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4qujgGe+Npe8; Fri, 25 May 2012 12:52:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E2DCE31A71; Fri, 25 May 2012 12:52:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4C8BA8F753 for ; Fri, 25 May 2012 12:52:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4390D8D6BC for ; Fri, 25 May 2012 12:52:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g3cwB7RcfCKU for ; Fri, 25 May 2012 12:52:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1A3D08D6D8 for ; Fri, 25 May 2012 12:52:04 +0000 (UTC) Received: by eeke50 with SMTP id e50so362822eek.16 for ; Fri, 25 May 2012 05:52:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=se2L5FLYLLRInOhGE+hZu6pnxfdzrJ/Cwe5ElIZaCZU=; b=TS8OyQ0Xq1sfigXzB9rzzwGz2/nd8JQPKGqDnbScqcUEtndgIHR3hX00gGcdHhoRQ6 RZvkKcl74kTQhz2TYnYB2KuXr3c7LLWbZTRJduDt1vk0pL8CXLvYCAfx5TaiZ7rDyC1X sjJSRsA4lqW2iDef5Z0/gfj8QtaLJNVFyspv42K+Ibxcn+ldCifbAQejL27LHhlShuxX +59dpcrQpHrcVuePyTMNbvJzb7zqN/H/NwXqero99HtemIWWIpzXKOCIWrVAvWt6Q+Ki bkASxq7qBLXSi5sL27kPtfX5PG11YiP1tFxl3m7QGLaQeogiOs1emltbt0Tcp8Sdqsgo scTQ== Received: by 10.14.127.203 with SMTP id d51mr612475eei.201.1337950322804; Fri, 25 May 2012 05:52:02 -0700 (PDT) Received: from percy.train.local ([213.170.149.177]) by mx.google.com with ESMTPS id q53sm6969536eef.8.2012.05.25.05.52.00 (version=SSLv3 cipher=OTHER); Fri, 25 May 2012 05:52:01 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Fri, 25 May 2012 13:51:59 +0100 Message-Id: <1337950319-19104-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH resend] owl-linux: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Simon Dawson Signed-off-by: Simon Dawson --- package/Config.in | 1 + package/owl-linux/Config.in | 10 ++++++++++ ...1.0.6-fix-CROSS_COMPILE-usage-in-Makefile.patch | 15 +++++++++++++++ .../owl-linux-1.0.6-fix-for-linux-3.3.x.patch | 19 +++++++++++++++++++ package/owl-linux/owl-linux.mk | 20 ++++++++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 package/owl-linux/Config.in create mode 100644 package/owl-linux/owl-linux-1.0.6-fix-CROSS_COMPILE-usage-in-Makefile.patch create mode 100644 package/owl-linux/owl-linux-1.0.6-fix-for-linux-3.3.x.patch create mode 100644 package/owl-linux/owl-linux.mk diff --git a/package/Config.in b/package/Config.in index fb1b08f..971b106 100644 --- a/package/Config.in +++ b/package/Config.in @@ -208,6 +208,7 @@ source "package/mtd/Config.in" source "package/ntfs-3g/Config.in" source "package/open2300/Config.in" source "package/openocd/Config.in" +source "package/owl-linux/Config.in" source "package/parted/Config.in" source "package/pciutils/Config.in" source "package/picocom/Config.in" diff --git a/package/owl-linux/Config.in b/package/owl-linux/Config.in new file mode 100644 index 0000000..6ee0f95 --- /dev/null +++ b/package/owl-linux/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_OWL_LINUX + bool "H&D Wireless SPB104 SD-card WiFi SIP" + depends on BR2_LINUX_KERNEL + help + Linux kernel driver for the H&D Wireless SPB104 SD-card WiFi SIP. + + http://linux.hd-wireless.se/bin/view/Linux/GettingStarted + +comment "owl-linux requires a Linux kernel" + depends on !BR2_LINUX_KERNEL diff --git a/package/owl-linux/owl-linux-1.0.6-fix-CROSS_COMPILE-usage-in-Makefile.patch b/package/owl-linux/owl-linux-1.0.6-fix-CROSS_COMPILE-usage-in-Makefile.patch new file mode 100644 index 0000000..a644406 --- /dev/null +++ b/package/owl-linux/owl-linux-1.0.6-fix-CROSS_COMPILE-usage-in-Makefile.patch @@ -0,0 +1,15 @@ +Fix the owl-linux Makefile so that it protects spaces in the CROSS_COMPILE +variable. For example, this variable will contain spaces if ccache is used. + +diff -Nur a/Makefile b/Makefile +--- a/Makefile 2011-09-15 12:20:37.000000000 +0100 ++++ b/Makefile 2012-05-10 08:53:55.727706424 +0100 +@@ -35,7 +35,7 @@ + PWD := $(shell pwd) + + default: +- $(MAKE) -C $(KERNELDIR) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) M=$(PWD) MODE=$(MODE) modules ++ $(MAKE) -C $(KERNELDIR) ARCH=$(ARCH) CROSS_COMPILE="$(CROSS_COMPILE)" M=$(PWD) MODE=$(MODE) modules + + clean: + -rm -f *.o *.mod.c *.ko modules.order Module.symvers diff --git a/package/owl-linux/owl-linux-1.0.6-fix-for-linux-3.3.x.patch b/package/owl-linux/owl-linux-1.0.6-fix-for-linux-3.3.x.patch new file mode 100644 index 0000000..2d4ea48 --- /dev/null +++ b/package/owl-linux/owl-linux-1.0.6-fix-for-linux-3.3.x.patch @@ -0,0 +1,19 @@ +Kernel commit b81693d9149c598302e8eb9c20cb20330d922c8e changed the +net_device_ops structure, removing the ndo_set_multicast_list callback. The +ndo_set_rx_mode has also been added to this structure. + +The upshot of these changes is that owl-linux fails to compile with 3.3.x +kernels. + +diff -Nur a/owl_net.c b/owl_net.c +--- a/owl_net.c 2011-09-15 12:20:37.000000000 +0100 ++++ b/owl_net.c 2012-05-01 11:39:14.617658349 +0100 +@@ -376,7 +376,7 @@ + #endif /* OWL_CONFIG_IFUPDOWN */ + .ndo_start_xmit = owl_net_tx, + .ndo_get_stats = owl_net_get_stats, +- .ndo_set_multicast_list = NULL, ++ .ndo_set_rx_mode = NULL, + .ndo_tx_timeout = owl_net_tx_timeout, + .ndo_set_mac_address = NULL, + }; diff --git a/package/owl-linux/owl-linux.mk b/package/owl-linux/owl-linux.mk new file mode 100644 index 0000000..6cf8e96 --- /dev/null +++ b/package/owl-linux/owl-linux.mk @@ -0,0 +1,20 @@ +############################################################# +# +# owl-linux +# +############################################################# +OWL_LINUX_VERSION = 1.0.6 +OWL_LINUX_SITE = http://linux.hd-wireless.se/pub/Linux/DownloadDrivers +OWL_LINUX_SOURCE = owl-linux-$(OWL_LINUX_VERSION).tar.gz + +OWL_LINUX_DEPENDENCIES = linux + +define OWL_LINUX_BUILD_CMDS + $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNELDIR=$(LINUX_DIR) +endef + +define OWL_LINUX_INSTALL_TARGET_CMDS + $(MAKE) -C $(LINUX_DIR) $(LINUX_MAKE_FLAGS) M=$(@D) modules_install +endef + +$(eval $(call GENTARGETS))