X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fuci%2FMakefile;h=d04c5a146a050c5aeed5cf0600efb980b01a8ab6;hp=8e354200c4b15aa8c80446621a457f631bfe12de;hb=16b63cb471eafb80eddb27165bdfa70cc5812821;hpb=9e4c03a9c35a2ff29030a645bccf5984dd2978d6

diff --git a/contrib/uci/Makefile b/contrib/uci/Makefile
index 8e354200c..d04c5a146 100644
--- a/contrib/uci/Makefile
+++ b/contrib/uci/Makefile
@@ -1,12 +1,12 @@
 include ../../build/config.mk
 include ../../build/gccconfig.mk
 
-UCI_VERSION  = 0.6.3
+UCI_VERSION  = 0.8.0
 #UCI_SITE    = http://mirror2.openwrt.org/sources
 #UCI_DIR     = uci-$(UCI_VERSION)
 #UCI_FILE    = $(UCI_DIR).tar.gz
 #UCI_URL     = $(UCI_SITE)/$(UCI_FILE)
-UCI_GITREV   = c79cc497e7b0caa0f9f6a2c978fa9a5f0f097463
+UCI_GITREV   = aa3ab8012bfbf793d2884c08ea924545a04e9544
 UCI_SITE     = http://nbd.name
 UCI_DIR      = uci.git
 UCI_FILE     = uci-$(UCI_VERSION)$(UCI_APPEND).tar.gz
@@ -20,12 +20,13 @@ include ../../build/module.mk
 $(UCI_FILE):
 	wget -O $@ "$(UCI_URL)" || rm -f $@
 
-$(UCI_PATCHDIR)/series:
-	(cd $(UCI_PATCHDIR); ls *.patch | sort > series)
-
 $(UCI_DIR)/.prepared: $(UCI_FILE)
 	rm -rf $(UCI_DIR)
 	tar xvfz $(UCI_FILE)
+	(cd $(UCI_PATCHDIR); ls *.patch | sort > series) || true
+	[ -f "$(UCI_PATCHDIR)/series" ] && while read patch; do \
+		patch -d $(UCI_DIR) -p1 < $(UCI_PATCHDIR)/$$patch; \
+	done < $(UCI_PATCHDIR)/series || true
 	touch $@
 
 compile: $(UCI_DIR)/.prepared
@@ -38,4 +39,5 @@ compile: $(UCI_DIR)/.prepared
 compile-all: compile
 
 clean:
+	rm -rf $(UCI_PATCHDIR)/series
 	rm -rf $(UCI_DIR) $(UCI_FILE)