summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authoregon_ffj <egon@freifunk-jena.de>2012-04-03 08:19:16 (GMT)
committeregon_ffj <egon@freifunk-jena.de>2012-04-03 08:19:16 (GMT)
commitcb325e4a9c3efab9155a8420e4c583c541c326c8 (patch)
tree1adaaebb0461891af213fcddec7ee523ddb5e1bf /config
parente3416a9c5bbe53907523c03cfb210b3226fe9898 (diff)
parented72d266b3bf9ad6332ce56dfb304a6507b0f2c9 (diff)
Merge branch 'plugnpray' of git://git.freifunk-jena.de/freifunk/ffj-buildroot-v2 into plugnpray
Diffstat (limited to 'config')
-rw-r--r--config/trunk3
-rw-r--r--config/trunk-ar71xx-tl-wr741.patch4
2 files changed, 7 insertions, 0 deletions
diff --git a/config/trunk b/config/trunk
index 4d2e578..74ba51e 100644
--- a/config/trunk
+++ b/config/trunk
@@ -11,6 +11,7 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_HAVE_RPC=y
CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_NFS=y
CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_BZ2=y
# CONFIG_BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS is not set
+CONFIG_BUSYBOX_CONFIG_FEATURE_SH_NOFORK=y
CONFIG_BUSYBOX_CONFIG_FEATURE_WC_LARGE=y
CONFIG_BUSYBOX_CONFIG_KILLALL5=y
CONFIG_BUSYBOX_CONFIG_MESG=y
@@ -27,11 +28,13 @@ CONFIG_IMAGEOPT=y
CONFIG_KMOD_BATMAN_ADV_BATCTL=y
# CONFIG_PACKAGE_MAC80211_MESH is not set
CONFIG_PACKAGE_bridge=y
+CONFIG_PACKAGE_ebtables=y
CONFIG_PACKAGE_flock=y
CONFIG_PACKAGE_hostapd-mini=y
CONFIG_PACKAGE_ip6tables=y
CONFIG_PACKAGE_kmod-batman-adv=y
CONFIG_PACKAGE_kmod-button-hotplug=y
+CONFIG_PACKAGE_kmod-ebtables=y
CONFIG_PACKAGE_kmod-input-core=y
CONFIG_PACKAGE_kmod-input-gpio-buttons=y
CONFIG_PACKAGE_kmod-input-polldev=y
diff --git a/config/trunk-ar71xx-tl-wr741.patch b/config/trunk-ar71xx-tl-wr741.patch
new file mode 100644
index 0000000..d9c4811
--- /dev/null
+++ b/config/trunk-ar71xx-tl-wr741.patch
@@ -0,0 +1,4 @@
+3c3
+< CONFIG_TARGET_ar71xx_generic_Default=y
+---
+> CONFIG_TARGET_ar71xx_generic_TLWR741=y
contact: Jan Huwald // Impressum