X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fuci%2FMakefile;h=b0ea8c0b6094e48b323c57b4dcab3b0c283a7dbb;hp=04aa38b3ac9561bf06c41d666eff5c53515fa369;hb=7e32981740ef29e492bf986e26bcfce6dcd662c8;hpb=9bb9cc378bd91e5983936326260316cd6c4332a9 diff --git a/contrib/uci/Makefile b/contrib/uci/Makefile index 04aa38b3a..b0ea8c0b6 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.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_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,10 @@ 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_PATCHDIR)/series $(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