X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fuci%2FMakefile;h=19625aa723241363e47193247100ecf0a6e8393a;hp=1363b786f5b578c5f15a71ec00930c9129ec0bfe;hb=e795b1b2048a3e0b4b5ad9f72724a2b508ed54c5;hpb=d463d0b8357764ca9018549fa624c428f56fcd87

diff --git a/contrib/uci/Makefile b/contrib/uci/Makefile
index 1363b786f..19625aa72 100644
--- a/contrib/uci/Makefile
+++ b/contrib/uci/Makefile
@@ -1,17 +1,16 @@
 include ../../build/config.mk
 include ../../build/gccconfig.mk
 
-UCI_VERSION  = 0.6.0
-UCI_APPEND   = +luci1
-#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   = 12c5b22102873e303e540f886489831461d54ea9
-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.7.5
+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_PATCHDIR = patches
 
 all: compile
@@ -27,33 +26,14 @@ $(UCI_PATCHDIR)/series:
 $(UCI_DIR)/.prepared: $(UCI_FILE)
 	rm -rf $(UCI_DIR)
 	tar xvfz $(UCI_FILE)
-	ln -s ../$(UCI_PATCHDIR) $(UCI_DIR)/patches
 	touch $@
 
-$(UCI_DIR)/.patched: $(UCI_DIR)/.prepared $(UCI_PATCHDIR)/series
-	(cd $(UCI_DIR); \
-		if [ -x "$$(which quilt 2>/dev/null)" ]; then \
-			quilt push -a; \
-		else \
-			cat patches/*.patch | patch -p1; \
-		fi; \
-	)
-	touch $@
-
-refresh: $(UCI_DIR)/.patched
-	(cd $(UCI_DIR); \
-		for i in $$(quilt series); do \
-			quilt refresh $$i; \
-		done; \
-	)
-
-compile: $(UCI_DIR)/.patched
+compile: $(UCI_DIR)/.prepared
 	$(MAKE) -C $(UCI_DIR) CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" OS="$(OS)"
 	mkdir -p dist/usr/lib dist/usr/bin
 	$(MAKE) -C $(UCI_DIR) install DESTDIR=../dist prefix=/usr
 	$(MAKE) -C $(UCI_DIR)/lua CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" OS="$(OS)"
 	$(MAKE) -C $(UCI_DIR)/lua install DESTDIR=../../dist luadir=$(LUA_LIBRARYDIR)
-	mv dist$(LUA_LIBRARYDIR)/uci.so dist$(LUA_LIBRARYDIR)/uci2.so
 
 compile-all: compile