X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=contrib%2Fuci%2FMakefile;h=d04c5a146a050c5aeed5cf0600efb980b01a8ab6;hb=d6d0926aee1205b9ade0cb5b7462603a98b938af;hp=2fd224db022e6d9c14b944b73e3824db6aef593e;hpb=63c48c8ddee458322fc89892114f116e671744ad;p=project%2Fluci.git

diff --git a/contrib/uci/Makefile b/contrib/uci/Makefile
index 2fd224db0..d04c5a146 100644
--- a/contrib/uci/Makefile
+++ b/contrib/uci/Makefile
@@ -1,17 +1,17 @@
 include ../../build/config.mk
 include ../../build/gccconfig.mk
 
-#UCI_VERSION = 0.4.8
-#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 = 28d2cc2adde3f9ec077a77cf363045a17f116032
-UCI_VERSION = 0.4.8+git20080818-1
-UCI_SITE = http://nbd.name
-UCI_DIR = uci.git
-UCI_FILE = $(UCI_GITREV).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
 
@@ -23,6 +23,10 @@ $(UCI_FILE):
 $(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
@@ -32,8 +36,8 @@ compile: $(UCI_DIR)/.prepared
 	$(MAKE) -C $(UCI_DIR)/lua CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" OS="$(OS)"
 	$(MAKE) -C $(UCI_DIR)/lua install DESTDIR=../../dist luadir=$(LUA_LIBRARYDIR)
 
-
 compile-all: compile
 
 clean:
+	rm -rf $(UCI_PATCHDIR)/series
 	rm -rf $(UCI_DIR) $(UCI_FILE)