From 2d961523f225ee989324ddd4629b85da76a7cc0e Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Fri, 1 Jul 2011 12:18:34 -0300 Subject: [PATCH 1/3] switch linux-zigbee tools source from (old) tarball to git repository - install/INSTALL-PC: updated build process of lowpan-tools to use the git repository - tools/dirtpan/Makefile (CFLAGS): added include path for lowpan tools from git --- install/INSTALL-PC | 7 +++---- tools/dirtpan/Makefile | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/install/INSTALL-PC b/install/INSTALL-PC index 6a48685..54db4dc 100644 --- a/install/INSTALL-PC +++ b/install/INSTALL-PC @@ -15,9 +15,8 @@ 3. Build the user space tools of the linux-zigbee project - wget http://ufpr.dl.sourceforge.net/project/linux-zigbee/linux-zigbee-sources/0.2.2/lowpan-tools-0.2.2.tar.gz - tar xfz lowpan-tools-0.2.2.tar.gz - cd lowpan-tools-0.2.2 - ./configure + git clone git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee/linux-zigbee + cd linux-zigbee + ./autogen.sh make make install diff --git a/tools/dirtpan/Makefile b/tools/dirtpan/Makefile index 246e9bf..20527f7 100644 --- a/tools/dirtpan/Makefile +++ b/tools/dirtpan/Makefile @@ -15,4 +15,5 @@ MAIN = dirtpan include ../Makefile.common -CFLAGS += -I. -I../../install/lowpan-tools-0.2.2/include/ +CFLAGS += -I. -I../../install/lowpan-tools-0.2.2/include/ \ + -I../../install/linux-zigbee/include/ From e3066d7a21a37a4cceb42d39f4456f7cf889b3fd Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Fri, 1 Jul 2011 12:52:04 -0300 Subject: [PATCH 2/3] tools/Makefile (BEN_DIRS): add dirtpan iff its lowpan tools dependency is met --- tools/Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 99918e5..0ebc31b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -12,7 +12,17 @@ BEN_DIRS=atrf-gpio atrf-id atrf-path atrf-proxy atrf-reset \ - atrf-rssi atrf-trim atrf-txrx atrf-xmit atrf-xtal #dirtpan + atrf-rssi atrf-trim atrf-txrx atrf-xmit atrf-xtal + +ifneq ($(wildcard ../install/lowpan-tools-0.2.2/include/ieee802154.h),) +DIRTPAN := dirtpan +endif +ifneq ($(wildcard ../install/linux-zigbee/include/ieee802154.h),) +DIRTPAN := dirtpan +endif + +BEN_DIRS += $(DIRTPAN) + DIRS=$(BEN_DIRS) usbwait TARGET_ONLY_DIRS=lib From c705bf0939c6be4faff36967ea4be587ecc79096 Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Fri, 1 Jul 2011 12:55:28 -0300 Subject: [PATCH 3/3] xxx --- TODO | 2 -- 1 file changed, 2 deletions(-) diff --git a/TODO b/TODO index 89bdc3a..c1dae89 100644 --- a/TODO +++ b/TODO @@ -38,8 +38,6 @@ Current stuff - atusb/fw/: remove obsolete atusb requests -- auto-detect whether the dependencies for bulding dirtpan are met - - write GETTING-STARTED similar to what we had for gta02-core - properly report EPERM if not running as root