From b224ff2dd458ed72cb264ddf14165e63f987d16c Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 12 Mar 2015 14:43:18 +0100 Subject: [PATCH] meta-digi-dey: update busybox to 1.23 Used in Yocto 1.8 https://jira.digi.com/browse/DEL-1558 Signed-off-by: Javier Viguera --- .../0001-del-baudrates.patch | 6 +-- .../0002-del-flash_eraseall.patch | 0 ...nitely-try-to-resolve-peer-addresses.patch | 8 ++-- .../{busybox => busybox-1.23.1}/acpid.map | 0 .../{busybox => busybox-1.23.1}/busybox-acpid | 0 .../{busybox => busybox-1.23.1}/busybox-ntpd | 0 .../busybox-static-nodes | 0 .../{busybox => busybox-1.23.1}/defconfig | 40 +++++++++++++----- .../{busybox => busybox-1.23.1}/digi.gif | Bin .../{busybox => busybox-1.23.1}/index.html | 0 .../{busybox => busybox-1.23.1}/pswitch-press | 0 .../pswitch-release | 0 .../{busybox => busybox-1.23.1}/suspend | 0 ....22.1.bbappend => busybox_1.23.1.bbappend} | 2 +- 14 files changed, 38 insertions(+), 18 deletions(-) rename meta-digi-dey/recipes-core/busybox/{busybox => busybox-1.23.1}/0001-del-baudrates.patch (93%) rename meta-digi-dey/recipes-core/busybox/{busybox => busybox-1.23.1}/0002-del-flash_eraseall.patch (100%) rename meta-digi-dey/recipes-core/busybox/{busybox => busybox-1.23.1}/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch (91%) rename meta-digi-dey/recipes-core/busybox/{busybox => busybox-1.23.1}/acpid.map (100%) rename meta-digi-dey/recipes-core/busybox/{busybox => busybox-1.23.1}/busybox-acpid (100%) rename meta-digi-dey/recipes-core/busybox/{busybox => busybox-1.23.1}/busybox-ntpd (100%) rename meta-digi-dey/recipes-core/busybox/{busybox => busybox-1.23.1}/busybox-static-nodes (100%) rename meta-digi-dey/recipes-core/busybox/{busybox => busybox-1.23.1}/defconfig (97%) rename meta-digi-dey/recipes-core/busybox/{busybox => busybox-1.23.1}/digi.gif (100%) rename meta-digi-dey/recipes-core/busybox/{busybox => busybox-1.23.1}/index.html (100%) rename meta-digi-dey/recipes-core/busybox/{busybox => busybox-1.23.1}/pswitch-press (100%) rename meta-digi-dey/recipes-core/busybox/{busybox => busybox-1.23.1}/pswitch-release (100%) rename meta-digi-dey/recipes-core/busybox/{busybox => busybox-1.23.1}/suspend (100%) rename meta-digi-dey/recipes-core/busybox/{busybox_1.22.1.bbappend => busybox_1.23.1.bbappend} (98%) diff --git a/meta-digi-dey/recipes-core/busybox/busybox/0001-del-baudrates.patch b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/0001-del-baudrates.patch similarity index 93% rename from meta-digi-dey/recipes-core/busybox/busybox/0001-del-baudrates.patch rename to meta-digi-dey/recipes-core/busybox/busybox-1.23.1/0001-del-baudrates.patch index b21648bd3..d0cad89b4 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox/0001-del-baudrates.patch +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/0001-del-baudrates.patch @@ -10,10 +10,10 @@ Signed-off-by: Javier Viguera 1 file changed, 54 insertions(+), 13 deletions(-) diff --git a/libbb/speed_table.c b/libbb/speed_table.c -index 45159f1..9806a60 100644 +index 174d531..0e57de4 100644 --- a/libbb/speed_table.c +++ b/libbb/speed_table.c -@@ -29,30 +29,68 @@ static const struct speed_map speeds[] = { +@@ -34,30 +34,68 @@ static const struct speed_map speeds[] = { {B2400, 2400}, {B4800, 4800}, {B9600, 9600}, @@ -93,7 +93,7 @@ index 45159f1..9806a60 100644 #endif }; -@@ -64,8 +102,11 @@ unsigned FAST_FUNC tty_baud_to_value(speed_t speed) +@@ -69,8 +107,11 @@ unsigned FAST_FUNC tty_baud_to_value(speed_t speed) do { if (speed == speeds[i].speed) { diff --git a/meta-digi-dey/recipes-core/busybox/busybox/0002-del-flash_eraseall.patch b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/0002-del-flash_eraseall.patch similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox/0002-del-flash_eraseall.patch rename to meta-digi-dey/recipes-core/busybox/busybox-1.23.1/0002-del-flash_eraseall.patch diff --git a/meta-digi-dey/recipes-core/busybox/busybox/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch similarity index 91% rename from meta-digi-dey/recipes-core/busybox/busybox/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch rename to meta-digi-dey/recipes-core/busybox/busybox-1.23.1/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch index f7a708c72..d93c04753 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch @@ -14,10 +14,10 @@ Conflicts: 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/networking/ntpd.c b/networking/ntpd.c -index c4b0187..f93bf04 100644 +index 2d4f076..7e8f3f1 100644 --- a/networking/ntpd.c +++ b/networking/ntpd.c -@@ -238,6 +238,7 @@ typedef struct { +@@ -251,6 +251,7 @@ typedef struct { typedef struct { len_and_sockaddr *p_lsa; char *p_dotted; @@ -25,7 +25,7 @@ index c4b0187..f93bf04 100644 int p_fd; int datapoint_idx; uint32_t lastpkt_refid; -@@ -738,8 +739,9 @@ add_peers(char *s) +@@ -756,8 +757,9 @@ add_peers(const char *s) peer_t *p; p = xzalloc(sizeof(*p)); @@ -37,7 +37,7 @@ index c4b0187..f93bf04 100644 p->p_fd = -1; p->p_xmt_msg.m_status = MODE_CLIENT | (NTP_VERSION << 3); p->next_action_time = G.cur_time; /* = set_next(p, 0); */ -@@ -788,6 +790,25 @@ send_query_to_peer(peer_t *p) +@@ -806,6 +808,25 @@ send_query_to_peer(peer_t *p) * * Uncomment this and use strace to see it in action: */ diff --git a/meta-digi-dey/recipes-core/busybox/busybox/acpid.map b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/acpid.map similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox/acpid.map rename to meta-digi-dey/recipes-core/busybox/busybox-1.23.1/acpid.map diff --git a/meta-digi-dey/recipes-core/busybox/busybox/busybox-acpid b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/busybox-acpid similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox/busybox-acpid rename to meta-digi-dey/recipes-core/busybox/busybox-1.23.1/busybox-acpid diff --git a/meta-digi-dey/recipes-core/busybox/busybox/busybox-ntpd b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/busybox-ntpd similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox/busybox-ntpd rename to meta-digi-dey/recipes-core/busybox/busybox-1.23.1/busybox-ntpd diff --git a/meta-digi-dey/recipes-core/busybox/busybox/busybox-static-nodes b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/busybox-static-nodes similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox/busybox-static-nodes rename to meta-digi-dey/recipes-core/busybox/busybox-1.23.1/busybox-static-nodes diff --git a/meta-digi-dey/recipes-core/busybox/busybox/defconfig b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/defconfig similarity index 97% rename from meta-digi-dey/recipes-core/busybox/busybox/defconfig rename to meta-digi-dey/recipes-core/busybox/busybox-1.23.1/defconfig index b3a62e6cd..f15ac161a 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox/defconfig +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.22.1 -# Tue Jun 24 15:44:18 2014 +# Busybox version: 1.23.1 +# Tue Mar 3 18:55:25 2015 # CONFIG_HAVE_DOT_CONFIG=y @@ -36,6 +36,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_PAM is not set +CONFIG_FEATURE_USE_SENDFILE=y CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set @@ -73,6 +75,7 @@ CONFIG_EXTRA_LDLIBS="" # # CONFIG_DEBUG is not set # CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set @@ -183,6 +186,7 @@ CONFIG_FEATURE_DATE_COMPAT=y CONFIG_HOSTID=y CONFIG_ID=y CONFIG_GROUPS=y +CONFIG_SHUF=y CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y CONFIG_TOUCH=y @@ -191,6 +195,7 @@ CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y +CONFIG_UNLINK=y CONFIG_BASE64=y CONFIG_WHO=y CONFIG_USERS=y @@ -298,6 +303,11 @@ CONFIG_FEATURE_WC_LARGE=y CONFIG_WHOAMI=y CONFIG_YES=y +# +# Common options +# +CONFIG_FEATURE_VERBOSE=y + # # Common options for cp and mv # @@ -384,6 +394,9 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_UNDO=y +CONFIG_FEATURE_VI_UNDO_QUEUE=y +CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 CONFIG_FEATURE_ALLOW_EXEC=y # @@ -400,6 +413,7 @@ CONFIG_FEATURE_FIND_MAXDEPTH=y CONFIG_FEATURE_FIND_NEWER=y CONFIG_FEATURE_FIND_INUM=y CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_EXEC_PLUS=y CONFIG_FEATURE_FIND_USER=y CONFIG_FEATURE_FIND_GROUP=y CONFIG_FEATURE_FIND_NOT=y @@ -421,6 +435,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y +CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y # # Init Utilities @@ -457,6 +472,7 @@ CONFIG_USE_BB_CRYPT=y CONFIG_ADDUSER=y CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y CONFIG_FEATURE_CHECK_NAMES=y +CONFIG_LAST_ID=60000 CONFIG_FIRST_SYSTEM_ID=100 CONFIG_LAST_SYSTEM_ID=999 CONFIG_ADDGROUP=y @@ -468,7 +484,6 @@ CONFIG_FEATURE_DEL_USER_FROM_GROUP=y CONFIG_GETTY=y CONFIG_LOGIN=y # CONFIG_LOGIN_SESSION_AS_CHILD is not set -# CONFIG_PAM is not set CONFIG_LOGIN_SCRIPTS=y CONFIG_FEATURE_NOLOGIN=y CONFIG_FEATURE_SECURETTY=y @@ -526,6 +541,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # Linux System Utilities # CONFIG_BLOCKDEV=y +CONFIG_FATATTR=y CONFIG_FSTRIM=y CONFIG_MDEV=y CONFIG_FEATURE_MDEV_CONF=y @@ -597,6 +613,7 @@ CONFIG_RTCWAKE=y # CONFIG_SCRIPTREPLAY is not set # CONFIG_SETARCH is not set CONFIG_SWAPONOFF=y +CONFIG_FEATURE_SWAPON_DISCARD=y CONFIG_FEATURE_SWAPON_PRI=y CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y @@ -639,6 +656,10 @@ CONFIG_FEATURE_VOLUMEID_XFS=y # Miscellaneous Utilities # # CONFIG_CONSPY is not set +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 CONFIG_FEATURE_LESS_BRACKETS=y @@ -653,6 +674,8 @@ CONFIG_NANDWRITE=y CONFIG_NANDDUMP=y CONFIG_RFKILL=y CONFIG_SETSERIAL=y +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set CONFIG_UBIATTACH=y CONFIG_UBIDETACH=y CONFIG_UBIMKVOL=y @@ -675,10 +698,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set # CONFIG_FEATURE_CHAT_CLR_ABORT is not set # CONFIG_CHRT is not set -CONFIG_CROND=y -CONFIG_FEATURE_CROND_D=y -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="/var/spool/cron" CONFIG_CRONTAB=y CONFIG_DC=y CONFIG_FEATURE_DC_LIBM=y @@ -720,8 +739,6 @@ CONFIG_READAHEAD=y CONFIG_RX=y CONFIG_SETSID=y CONFIG_STRINGS=y -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set CONFIG_TIME=y CONFIG_TIMEOUT=y CONFIG_TTYSIZE=y @@ -757,13 +774,13 @@ CONFIG_FEATURE_BRCTL_SHOW=y # CONFIG_FTPD is not set # CONFIG_FEATURE_FTP_WRITE is not set # CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set +# CONFIG_FEATURE_FTP_AUTHENTICATION is not set CONFIG_FTPGET=y CONFIG_FTPPUT=y CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y CONFIG_HOSTNAME=y CONFIG_HTTPD=y CONFIG_FEATURE_HTTPD_RANGES=y -CONFIG_FEATURE_HTTPD_USE_SENDFILE=y CONFIG_FEATURE_HTTPD_SETUID=y CONFIG_FEATURE_HTTPD_BASIC_AUTH=y CONFIG_FEATURE_HTTPD_AUTH_MD5=y @@ -820,6 +837,7 @@ CONFIG_FEATURE_NETSTAT_PRG=y CONFIG_NSLOOKUP=y CONFIG_NTPD=y # CONFIG_FEATURE_NTPD_SERVER is not set +CONFIG_FEATURE_NTPD_CONF=y CONFIG_PSCAN=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set @@ -857,6 +875,7 @@ CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y +CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_RFC3397 is not set @@ -975,6 +994,7 @@ CONFIG_ASH_GETOPTS=y CONFIG_ASH_BUILTIN_ECHO=y CONFIG_ASH_BUILTIN_PRINTF=y CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_HELP=y # CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set CONFIG_ASH_OPTIMIZE_FOR_SIZE=y diff --git a/meta-digi-dey/recipes-core/busybox/busybox/digi.gif b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/digi.gif similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox/digi.gif rename to meta-digi-dey/recipes-core/busybox/busybox-1.23.1/digi.gif diff --git a/meta-digi-dey/recipes-core/busybox/busybox/index.html b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/index.html similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox/index.html rename to meta-digi-dey/recipes-core/busybox/busybox-1.23.1/index.html diff --git a/meta-digi-dey/recipes-core/busybox/busybox/pswitch-press b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/pswitch-press similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox/pswitch-press rename to meta-digi-dey/recipes-core/busybox/busybox-1.23.1/pswitch-press diff --git a/meta-digi-dey/recipes-core/busybox/busybox/pswitch-release b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/pswitch-release similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox/pswitch-release rename to meta-digi-dey/recipes-core/busybox/busybox-1.23.1/pswitch-release diff --git a/meta-digi-dey/recipes-core/busybox/busybox/suspend b/meta-digi-dey/recipes-core/busybox/busybox-1.23.1/suspend similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox/suspend rename to meta-digi-dey/recipes-core/busybox/busybox-1.23.1/suspend diff --git a/meta-digi-dey/recipes-core/busybox/busybox_1.22.1.bbappend b/meta-digi-dey/recipes-core/busybox/busybox_1.23.1.bbappend similarity index 98% rename from meta-digi-dey/recipes-core/busybox/busybox_1.22.1.bbappend rename to meta-digi-dey/recipes-core/busybox/busybox_1.23.1.bbappend index ffa748c8e..c0d2d2f9e 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox_1.22.1.bbappend +++ b/meta-digi-dey/recipes-core/busybox/busybox_1.23.1.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2013 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" DEPENDS += "libdigi"