diff options
| author | Katze Miau <miaukatzemiau@priveasy.de> | 2011-10-19 09:50:03 (GMT) |
|---|---|---|
| committer | Katze Miau <miaukatzemiau@priveasy.de> | 2011-10-19 09:50:03 (GMT) |
| commit | c343d60e28da597fcd2d7082d27a90d22d45acee (patch) | |
| tree | 25cc3810e36d0b3949c43cd13fea86013573269d | |
| parent | 29af698cef35ab9a488b23d00874ef462ae8f4d8 (diff) | |
| parent | e3dfea3dc99c7d497eac53de780172c0fc6c450d (diff) | |
Merge gitorious.org:+freifunk-jena/freifunk-jena-batman-config/freifunk-jena-batman-config-v2
Conflicts:
Makefile
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | config/backfire.config | 26 |
2 files changed, 14 insertions, 14 deletions
@@ -32,4 +32,4 @@ image/%: openwrt/$$(REPO)/.repo_access config/$$(REPO).config \ rsync -a files/$(PLATFORM)-$(MODEL)/ openwrt/$(REPO)/files/ cd openwrt/$(REPO) && $(MAKE) mkdir -p $@ - rsync -a openwrt/$(REPO)/bin/$(PLATFORM)/ $@/
\ No newline at end of file + rsync -a openwrt/$(REPO)/bin/$(PLATFORM)/ $@/ diff --git a/config/backfire.config b/config/backfire.config index 45a602e..ab8bdfa 100644 --- a/config/backfire.config +++ b/config/backfire.config @@ -279,7 +279,7 @@ CONFIG_USE_SSTRIP=y CONFIG_STRIP_KERNEL_EXPORTS=y # CONFIG_DEVEL is not set # CONFIG_BROKEN is not set -CONFIG_DOWNLOAD_FOLDER="" +CONFIG_DOWNLOAD_FOLDER="../../dl" CONFIG_LOCALMIRROR="" CONFIG_AUTOREBUILD=y CONFIG_BUILD_SUFFIX="" @@ -3147,18 +3147,18 @@ CONFIG_PACKAGE_nano=y # # Erlang # -CONFIG_PACKAGE_erlang=m -CONFIG_PACKAGE_erlang-asn1=m -CONFIG_PACKAGE_erlang-compiler=m -CONFIG_PACKAGE_erlang-crypto=m -CONFIG_PACKAGE_erlang-hipe=m -CONFIG_PACKAGE_erlang-inets=m -CONFIG_PACKAGE_erlang-mnesia=m -CONFIG_PACKAGE_erlang-runtime-tools=m -CONFIG_PACKAGE_erlang-snmp=m -CONFIG_PACKAGE_erlang-ssh=m -CONFIG_PACKAGE_erlang-ssl=m -CONFIG_PACKAGE_erlang-syntax-tools=m +#CONFIG_PACKAGE_erlang=m +#CONFIG_PACKAGE_erlang-asn1=m +#CONFIG_PACKAGE_erlang-compiler=m +#CONFIG_PACKAGE_erlang-crypto=m +#CONFIG_PACKAGE_erlang-hipe=m +#CONFIG_PACKAGE_erlang-inets=m +#CONFIG_PACKAGE_erlang-mnesia=m +#CONFIG_PACKAGE_erlang-runtime-tools=m +#CONFIG_PACKAGE_erlang-snmp=m +#CONFIG_PACKAGE_erlang-ssh=m +#CONFIG_PACKAGE_erlang-ssl=m +#CONFIG_PACKAGE_erlang-syntax-tools=m # # Java |