Permalink
Browse files

Merge branch 'master' of github.com:dtaht/cerofiles-3.3 into cerowrt-…

…3.3.8.9

Conflicts:
	.config

Fix cerowrt branches
  • Loading branch information...
Dave Taht
Dave Taht committed Jul 2, 2012
2 parents 46dee12 + 479c3bd commit b9f7ad3f2e7d9faa5fd6c3c411d658f830d694fe
Showing with 7,822 additions and 310 deletions.
  1. +1,277 −310 .config
  2. +106 −0 build_cero.sh
  3. +16 −0 cero_config
  4. +2,829 −0 config-wndr3700v2
  5. +23 −0 dirs.list
  6. +5 −0 feeds.conf
  7. +30 −0 files/etc/avahi/avahi-daemon.conf
  8. +52 −0 files/etc/babeld.conf
  9. +2 −0 files/etc/commit
  10. +32 −0 files/etc/config/ahcpd
  11. +71 −0 files/etc/config/babeld
  12. +92 −0 files/etc/config/dhcp
  13. +73 −0 files/etc/config/dhcp6c
  14. +110 −0 files/etc/config/firewall
  15. +105 −0 files/etc/config/network
  16. +48 −0 files/etc/config/polipo
  17. +87 −0 files/etc/config/qos
  18. +141 −0 files/etc/config/radvd
  19. +67 −0 files/etc/defconfig/wndr3700/dhcp
  20. +144 −0 files/etc/defconfig/wndr3700/firewall
  21. +107 −0 files/etc/defconfig/wndr3700/network
  22. +117 −0 files/etc/defconfig/wndr3700/radvd
  23. +67 −0 files/etc/defconfig/wndr3700v2/dhcp
  24. +144 −0 files/etc/defconfig/wndr3700v2/firewall
  25. +107 −0 files/etc/defconfig/wndr3700v2/network
  26. +117 −0 files/etc/defconfig/wndr3700v2/radvd
  27. +62 −0 files/etc/dibbler/client.conf.sample
  28. +5 −0 files/etc/dnsmasq_net6.sh
  29. +60 −0 files/etc/dnssec-tools/dnsval.conf
  30. +105 −0 files/etc/firewall.user
  31. +13 −0 files/etc/group
  32. +134 −0 files/etc/init.d/ahcpd
  33. +23 −0 files/etc/init.d/avahi-daemon
  34. +116 −0 files/etc/init.d/boot
  35. +5 −0 files/etc/iproute2/ematch_map
  36. +29 −0 files/etc/iproute2/rt_dsfield
  37. +31 −0 files/etc/iproute2/rt_protos
  38. +13 −0 files/etc/iproute2/rt_realms
  39. +11 −0 files/etc/iproute2/rt_scopes
  40. +11 −0 files/etc/iproute2/rt_tables
  41. +254 −0 files/etc/lighttpd/lighttpd.conf
  42. +1 −0 files/etc/modules.d/34-ifb
  43. +39 −0 files/etc/ntp.conf
  44. +5 −0 files/etc/opkg.conf
  45. +8 −0 files/etc/passwd
  46. +9 −0 files/etc/shadow
  47. +39 −0 files/etc/sysctl.conf
  48. +14 −0 files/etc/uci-defaults/make-certs.sh
  49. +10 −0 files/etc/xinetd.conf
  50. +17 −0 files/etc/xinetd.d/localssh
  51. +13 −0 files/etc/xinetd.d/rsync
  52. +618 −0 files/lib/wifi/mac80211.sh
  53. +22 −0 files/sbin/fixeth
  54. +8 −0 override.list
  55. +178 −0 packages.list
View
1,587 .config

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -0,0 +1,106 @@
+#!/bin/bash
+# Setup a build environment for cerowrt
+
+if [ ! -e ~/.cero ]
+then
+echo 'Please setup a ~/.cero build configuration file'
+echo 'Example configuration is the cero_config file'
+exit
+fi
+
+. ~/.cero
+
+clones() {
+while [ $# -gt 0 ]
+do
+git clone $1
+shift
+done
+}
+
+
+init() {
+
+mkdir -p $CERO_DIR
+cd $CERO_DIR
+
+echo 'Establishing base repositories'
+
+# clones
+
+clones $CERO_ROREPOS
+clones $CERO_RWREPOS
+
+# Bootstrapping cerofiles again if not already in this dir
+
+[ ! -e cerofiles-3.3 ] && {
+ git clone git://github.com/dtaht/cerofiles-3.3.git;
+}
+
+# Save disk, spin up cerowrt dir referencing openwrt
+
+git clone --reference openwrt $CERO_MAIN
+
+# Now build up
+
+git clone $CERO_MAIN $CERO_TARGET
+
+echo 'Building sub-repositories'
+
+cd $CERO_TARGET/
+#mkdir files
+yes | ./scripts/env new dbg
+cd env
+git remote add ceromain $CERO_DIR/cerofiles-3.3
+git pull ceromain master
+cd $CERO_DIR/$CERO_TARGET/env/files
+[ ! -e ../dirs.list ] && {
+ echo "Agh! you don't have a dirs.list. Your checkout failed."
+ exit -1
+ }
+mkdir -p `cat ../dirs.list`
+cd ../..
+cat env/feeds.conf | sed s#/home/cero1/src#$CERO_DIR# > feeds.conf
+echo 'updating feeds'
+./scripts/feeds update
+./scripts/feeds install -p cero `cat env/override.list`
+./scripts/feeds install `cat env/packages.list`
+cp env/config-$CERO_TARGET .config
+cp .config config.orig
+mkdir -p ~/public_html/cerowrt
+[ -h ~/public_html/cerowrt/cerowrt-$CERO_TARGET ] && {
+ ln -s $CERO_DIR/$CERO_TARGET/bin/ar71xx ~/public_html/cerowrt/cerowrt-$CERO_TARGET ; }
+make defconfig
+TC1=/tmp/dconfig.$$
+cat .config | egrep '=y|=m' | sort -u > ${TC1}.new
+cat config.orig | egrep '=y|=m' | sort -u > ${TC1}.old
+cmp ${TC1}.new ${TC1}.old
+[ $? -ne 0 ] && { echo 'Aagh! configs are different. Aborting...';
+ diff ${TC1}.new ${TC1}.old;
+ echo 'It is ok if there are a few differences...';
+ echo 'Notably, missing libraries is generally ok';
+ echo "The build dir is $CERO_DIR/$CERO_TARGET";
+ echo "and type 'make'";
+
+ exit -1;
+ }
+
+echo "The build dir is $CERO_DIR/$CERO_TARGET"
+echo "There-in: type 'make'"
+echo "You may have a few missing OS dependencies to resolve"
+
+rm -f ${TC1}.new ${TC1}.old
+
+}
+
+clean() {
+cd $CERO_DIR
+rm -rf cerowrt-luci packages openwrt ceropackages bismark-packages cerofiles-3.3 public_html/cerowrt cerowrt-3.3 openflow-openwrt-bismark
+cd ~
+}
+
+case $1 in
+ clean) clean;;
+ init) init;;
+ *) echo "\"$0 init\" to initialize repositories "
+esac
View
@@ -0,0 +1,16 @@
+# Edit and Copy this file to your ~/.cero file
+
+CERO_DIR=$HOME/src
+
+# Actually these are all read-only at present.
+# If you wish read/write privs to the the ceropackages repo, ask.
+# Ceropackages is a fast way to spin up new packages before
+# submitting to openwrt's main repos.
+
+CERO_ROREPOS="git://github.com/dtaht/cerowrt-luci-3.3.git git://github.com/dtaht/cerowrt-packages-3.3.git git://nbd.name/packages.git git://nbd.name/openwrt.git git://github.com/yiannisy/openflow-openwrt-bismark.git"
+CERO_RWREPOS="git://github.com/projectbismark/bismark-packages.git git://github.com/dtaht/ceropackages-3.3.git "
+CERO_MAIN=git://github.com/dtaht/Cerowrt-3.3.git
+CERO_TARGET=wndr3700v2
+
+export CERO_DIR CERO_ROREPOS CERO_RWREPOS CERO_MAIN CERO_TARGET
+
Oops, something went wrong.

0 comments on commit b9f7ad3

Please sign in to comment.