projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib/uci: bump to latest git version
[project/luci.git]
/
contrib
/
uci
/
Makefile
diff --git
a/contrib/uci/Makefile
b/contrib/uci/Makefile
index
8e35420
..
b0ea8c0
100644
(file)
--- a/
contrib/uci/Makefile
+++ b/
contrib/uci/Makefile
@@
-1,12
+1,12
@@
include ../../build/config.mk
include ../../build/gccconfig.mk
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_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
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_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)
$(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
touch $@
compile: $(UCI_DIR)/.prepared