summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <philb@brightsign.biz>2011-06-10 16:32:17 +0100
committerPhil Blundell <philb@brightsign.biz>2011-06-10 16:32:17 +0100
commitb40a1f32524e2c2fe6809f15527928d135286c41 (patch)
treec43513c93f26bafb90a2ac1122e20424b5c15c99
parentdfb2684cef60988ad1136e5c3953bc8efe7cc334 (diff)
downloadmeta-micro-b40a1f32524e2c2fe6809f15527928d135286c41.tar.gz
meta-micro-b40a1f32524e2c2fe6809f15527928d135286c41.tar.bz2
meta-micro-b40a1f32524e2c2fe6809f15527928d135286c41.zip
busybox: disable legacy bits, enable zcip
-rw-r--r--recipes/busybox/busybox-1.18.4/defconfig12
-rw-r--r--recipes/busybox/busybox_1.18.4.bbappend4
2 files changed, 8 insertions, 8 deletions
diff --git a/recipes/busybox/busybox-1.18.4/defconfig b/recipes/busybox/busybox-1.18.4/defconfig
index 5a6870c..aec9a96 100644
--- a/recipes/busybox/busybox-1.18.4/defconfig
+++ b/recipes/busybox/busybox-1.18.4/defconfig
@@ -641,12 +641,12 @@ CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
CONFIG_FEATURE_HTTPD_PROXY=y
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_IFCONFIG is not set
+# CONFIG_FEATURE_IFCONFIG_STATUS is not set
# CONFIG_FEATURE_IFCONFIG_SLIP is not set
# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
-CONFIG_FEATURE_IFCONFIG_HW=y
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+# CONFIG_FEATURE_IFCONFIG_HW is not set
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
# CONFIG_IFENSLAVE is not set
CONFIG_IFUPDOWN=y
CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
@@ -693,7 +693,7 @@ CONFIG_PING=y
CONFIG_PING6=y
CONFIG_FEATURE_FANCY_PING=y
# CONFIG_PSCAN is not set
-CONFIG_ROUTE=y
+# CONFIG_ROUTE is not set
# CONFIG_SLATTACH is not set
CONFIG_TELNET=y
# CONFIG_FEATURE_TELNET_TTYPE is not set
@@ -727,7 +727,7 @@ CONFIG_WGET=y
CONFIG_FEATURE_WGET_STATUSBAR=y
CONFIG_FEATURE_WGET_AUTHENTICATION=y
CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-# CONFIG_ZCIP is not set
+CONFIG_ZCIP=y
# CONFIG_TCPSVD is not set
# CONFIG_UDPSVD is not set
diff --git a/recipes/busybox/busybox_1.18.4.bbappend b/recipes/busybox/busybox_1.18.4.bbappend
index 435ba43..cf980ab 100644
--- a/recipes/busybox/busybox_1.18.4.bbappend
+++ b/recipes/busybox/busybox_1.18.4.bbappend
@@ -1,4 +1,4 @@
-PR .= ".2"
+PR .= ".3"
THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}"], d)}:"
+FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}", "${THISDIR}/files"], d)}:"