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

diff --git a/contrib/uci/Makefile b/contrib/uci/Makefile
index 09f0cdf24..d04c5a146 100644
--- a/contrib/uci/Makefile
+++ b/contrib/uci/Makefile
@@ -1,16 +1,16 @@
 include ../../build/config.mk
 include ../../build/gccconfig.mk
 
-UCI_VERSION  = 0.7.2
-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_SITE     = http://nbd.name
-#UCI_DIR      = uci.git
-#UCI_FILE     = uci-$(UCI_VERSION)$(UCI_APPEND).tar.gz
-#UCI_URL      = $(UCI_SITE)/gitweb.cgi?p=uci.git;a=snapshot;h=$(UCI_GITREV)
+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   = aa3ab8012bfbf793d2884c08ea924545a04e9544
+UCI_SITE     = http://nbd.name
+UCI_DIR      = uci.git
+UCI_FILE     = uci-$(UCI_VERSION)$(UCI_APPEND).tar.gz
+UCI_URL      = $(UCI_SITE)/gitweb.cgi?p=uci.git;a=snapshot;h=$(UCI_GITREV)
 UCI_PATCHDIR = patches
 
 all: compile
@@ -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)