From bd34549c23d2fea600b8c292efb16e29d700cf0f Mon Sep 17 00:00:00 2001
From: Xiangfu Liu <xiangfu@sharism.cc>
Date: Fri, 4 Mar 2011 10:32:19 +0800
Subject: [PATCH] avrdude: apply qi_lb60-patches when build for nanonote

---
 avrdude/Makefile                                         | 9 ++++++---
 avrdude/{patches => qi_lb60-patches}/001-nanonote.patch  | 0
 .../{patches => qi_lb60-patches}/002-nanonote-uart.patch | 0
 .../003-nanonote-atusb.patch                             | 0
 .../{patches => qi_lb60-patches}/004-atmega32u2.patch    | 0
 5 files changed, 6 insertions(+), 3 deletions(-)
 rename avrdude/{patches => qi_lb60-patches}/001-nanonote.patch (100%)
 rename avrdude/{patches => qi_lb60-patches}/002-nanonote-uart.patch (100%)
 rename avrdude/{patches => qi_lb60-patches}/003-nanonote-atusb.patch (100%)
 rename avrdude/{patches => qi_lb60-patches}/004-atmega32u2.patch (100%)

diff --git a/avrdude/Makefile b/avrdude/Makefile
index f503f49..8654360 100644
--- a/avrdude/Makefile
+++ b/avrdude/Makefile
@@ -12,6 +12,11 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_RELEASE:=1
 PKG_INSTALL:=1
 
+ifeq ($(CONFIG_TARGET_xburst_qi_lb60),y)
+#apply patches: qi_lb60-patches
+PATCH_DIR:=./qi_lb60-patches
+endif
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/avrdude
@@ -35,9 +40,7 @@ CONFIGURE_ARGS+= \
 	--disable-static \
 	--disable-parport
 
-
-ifdef CONFIG_TARGET_xburst_qi_lb60
-#apply patches: qi_lb60-patches
+ifeq ($(CONFIG_TARGET_xburst_qi_lb60),y)
 #the qi_lb60-patches have some new .c file
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); aclocal; automake)
diff --git a/avrdude/patches/001-nanonote.patch b/avrdude/qi_lb60-patches/001-nanonote.patch
similarity index 100%
rename from avrdude/patches/001-nanonote.patch
rename to avrdude/qi_lb60-patches/001-nanonote.patch
diff --git a/avrdude/patches/002-nanonote-uart.patch b/avrdude/qi_lb60-patches/002-nanonote-uart.patch
similarity index 100%
rename from avrdude/patches/002-nanonote-uart.patch
rename to avrdude/qi_lb60-patches/002-nanonote-uart.patch
diff --git a/avrdude/patches/003-nanonote-atusb.patch b/avrdude/qi_lb60-patches/003-nanonote-atusb.patch
similarity index 100%
rename from avrdude/patches/003-nanonote-atusb.patch
rename to avrdude/qi_lb60-patches/003-nanonote-atusb.patch
diff --git a/avrdude/patches/004-atmega32u2.patch b/avrdude/qi_lb60-patches/004-atmega32u2.patch
similarity index 100%
rename from avrdude/patches/004-atmega32u2.patch
rename to avrdude/qi_lb60-patches/004-atmega32u2.patch