diff options
| author | Steven Barth <steven@midlink.org> | 2008-08-26 19:10:14 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-08-26 19:10:14 +0000 |
| commit | 73815885d83973a39811bf0f430f9c9e7642c0ca (patch) | |
| tree | 68cedd56dbbf2fbf234411545058ad30cbae4e55 /contrib/uci/Makefile | |
| parent | 3a09a73d2bf54d63e0b281d029b074da832a4f88 (diff) | |
Updated UCI in contrib
Diffstat (limited to 'contrib/uci/Makefile')
| -rw-r--r-- | contrib/uci/Makefile | 45 |
1 files changed, 34 insertions, 11 deletions
diff --git a/contrib/uci/Makefile b/contrib/uci/Makefile index 4b4324439..bce79ebc3 100644 --- a/contrib/uci/Makefile +++ b/contrib/uci/Makefile @@ -1,16 +1,18 @@ include ../../build/config.mk include ../../build/gccconfig.mk -UCI_VERSION = 0.6.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 = e1738122f616e3dce498598d55f84fa8a7e2263b -#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.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_PATCHDIR = patches all: compile @@ -19,12 +21,33 @@ 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) + 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 $@ -compile: $(UCI_DIR)/.prepared +refresh: $(UCI_DIR)/.patched + (cd $(UCI_DIR); \ + for i in $$(quilt series); do \ + quilt refresh $$i; \ + done; \ + ) + +compile: $(UCI_DIR)/.patched $(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 |