meta-digi: update busybox to version 1.21
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
parent
670fd05e89
commit
7033be548c
|
|
@ -1,39 +0,0 @@
|
|||
From: Javier Viguera <javier.viguera@digi.com>
|
||||
Date: Wed, 20 Apr 2011 11:13:10 +0200
|
||||
Subject: [PATCH] del-mdev_regulatory
|
||||
|
||||
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
|
||||
---
|
||||
util-linux/mdev.c | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
|
||||
index c4829a5..c7b038d 100644
|
||||
--- a/util-linux/mdev.c
|
||||
+++ b/util-linux/mdev.c
|
||||
@@ -94,6 +94,7 @@
|
||||
//usage: "to match $SEQNUM variable. This prevents plug/unplug races.\n"
|
||||
//usage: "To activate this feature, create empty /dev/mdev.seq at boot."
|
||||
|
||||
+#include <syslog.h>
|
||||
#include "libbb.h"
|
||||
#include "xregex.h"
|
||||
|
||||
@@ -826,6 +827,17 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
|
||||
load_firmware(fw, temp);
|
||||
}
|
||||
}
|
||||
+ /* DigiEL: Handle regulatory domain change events */
|
||||
+ else if (strcmp(action, "change") == 0) {
|
||||
+ char *modalias;
|
||||
+ modalias = getenv("MODALIAS");
|
||||
+ if (strcmp(modalias, "platform:regulatory") == 0) {
|
||||
+ char *crda = xasprintf("%s", "/sbin/crda");
|
||||
+ system(crda);
|
||||
+ free(crda);
|
||||
+ syslog(LOG_INFO, "[mdev] change regulatory domain [%s]", getenv("COUNTRY"));
|
||||
+ }
|
||||
+ }
|
||||
|
||||
if (seq) {
|
||||
xopen_xwrite_close("mdev.seq", utoa(xatou(seq) + 1));
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
From: Javier Viguera <javier.viguera@digi.com>
|
||||
Date: Wed, 20 Apr 2011 11:13:10 +0200
|
||||
Subject: [PATCH] del-mdev_regulatory
|
||||
|
||||
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
|
||||
---
|
||||
util-linux/mdev.c | 18 +++++++++++++++---
|
||||
1 file changed, 15 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
|
||||
index 3d4e135..3293b59 100644
|
||||
--- a/util-linux/mdev.c
|
||||
+++ b/util-linux/mdev.c
|
||||
@@ -96,6 +96,7 @@
|
||||
//usage: "\n"
|
||||
//usage: "If /dev/mdev.log file exists, debug log will be appended to it."
|
||||
|
||||
+#include <syslog.h>
|
||||
#include "libbb.h"
|
||||
#include "xregex.h"
|
||||
|
||||
@@ -249,8 +250,8 @@
|
||||
#endif
|
||||
|
||||
|
||||
-static const char keywords[] ALIGN1 = "add\0remove\0"; // "change\0"
|
||||
-enum { OP_add, OP_remove };
|
||||
+static const char keywords[] ALIGN1 = "add\0remove\0change\0";
|
||||
+enum { OP_add, OP_remove, OP_change };
|
||||
|
||||
struct envmatch {
|
||||
struct envmatch *next;
|
||||
@@ -1131,13 +1132,24 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
|
||||
if (!fw)
|
||||
make_device(env_devname, temp, op);
|
||||
}
|
||||
- else {
|
||||
+ else if (op == OP_add) {
|
||||
make_device(env_devname, temp, op);
|
||||
if (ENABLE_FEATURE_MDEV_LOAD_FIRMWARE) {
|
||||
if (op == OP_add && fw)
|
||||
load_firmware(fw, temp);
|
||||
}
|
||||
}
|
||||
+ /* DigiEL: Handle regulatory domain change events */
|
||||
+ else if (op == OP_change) {
|
||||
+ char *env_modalias;
|
||||
+ env_modalias = getenv("MODALIAS");
|
||||
+ if (strcmp(env_modalias, "platform:regulatory") == 0) {
|
||||
+ char *crda = xasprintf("%s", "/sbin/crda");
|
||||
+ system(crda);
|
||||
+ free(crda);
|
||||
+ syslog(LOG_INFO, "[mdev] change regulatory domain [%s]", getenv("COUNTRY"));
|
||||
+ }
|
||||
+ }
|
||||
|
||||
dbg1("%s exiting", curtime());
|
||||
if (seq_fd >= 0) {
|
||||
|
|
@ -18,10 +18,10 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
|
|||
2 files changed, 17 insertions(+)
|
||||
|
||||
diff --git a/Makefile.flags b/Makefile.flags
|
||||
index c43c8dc..6735e97 100644
|
||||
index 307afa7..feeeb7d 100644
|
||||
--- a/Makefile.flags
|
||||
+++ b/Makefile.flags
|
||||
@@ -138,6 +138,10 @@ ifeq ($(CONFIG_DMALLOC),y)
|
||||
@@ -152,6 +152,10 @@ ifeq ($(CONFIG_DMALLOC),y)
|
||||
LDLIBS += dmalloc
|
||||
endif
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ Conflicts:
|
|||
1 file changed, 23 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/networking/ntpd.c b/networking/ntpd.c
|
||||
index 34b649f..49fb58b 100644
|
||||
index 79b7c37..01cd44b 100644
|
||||
--- a/networking/ntpd.c
|
||||
+++ b/networking/ntpd.c
|
||||
@@ -221,6 +221,7 @@ typedef struct {
|
||||
|
|
@ -22,9 +22,9 @@ index 34b649f..49fb58b 100644
|
|||
len_and_sockaddr *p_lsa;
|
||||
char *p_dotted;
|
||||
+ char *p_hostname;
|
||||
/* when to send new query (if p_fd == -1)
|
||||
* or when receive times out (if p_fd >= 0): */
|
||||
int p_fd;
|
||||
int datapoint_idx;
|
||||
uint32_t lastpkt_refid;
|
||||
@@ -708,8 +709,9 @@ add_peers(char *s)
|
||||
peer_t *p;
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Busybox version: 1.20.2
|
||||
# Fri Nov 8 18:05:56 2013
|
||||
# Busybox version: 1.21.1
|
||||
# Thu Dec 5 12:44:05 2013
|
||||
#
|
||||
CONFIG_HAVE_DOT_CONFIG=y
|
||||
|
||||
|
|
@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y
|
|||
CONFIG_FEATURE_UTMP=y
|
||||
# CONFIG_FEATURE_WTMP is not set
|
||||
CONFIG_FEATURE_PIDFILE=y
|
||||
CONFIG_PID_FILE_PATH="/var/run"
|
||||
CONFIG_FEATURE_SUID=y
|
||||
CONFIG_FEATURE_SUID_CONFIG=y
|
||||
CONFIG_FEATURE_SUID_CONFIG_QUIET=y
|
||||
|
|
@ -96,6 +97,7 @@ CONFIG_PREFIX="./_install"
|
|||
CONFIG_FEATURE_RTMINMAX=y
|
||||
CONFIG_PASSWORD_MINLEN=6
|
||||
CONFIG_MD5_SMALL=1
|
||||
CONFIG_SHA3_SMALL=1
|
||||
CONFIG_FEATURE_FAST_TOP=y
|
||||
# CONFIG_FEATURE_ETC_NETWORKS is not set
|
||||
CONFIG_FEATURE_USE_TERMIOS=y
|
||||
|
|
@ -263,6 +265,7 @@ CONFIG_SEQ=y
|
|||
CONFIG_SHA1SUM=y
|
||||
# CONFIG_SHA256SUM is not set
|
||||
# CONFIG_SHA512SUM is not set
|
||||
CONFIG_SHA3SUM=y
|
||||
CONFIG_SLEEP=y
|
||||
CONFIG_FEATURE_FANCY_SLEEP=y
|
||||
CONFIG_FEATURE_FLOAT_SLEEP=y
|
||||
|
|
@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
|
|||
CONFIG_FEATURE_HUMAN_READABLE=y
|
||||
|
||||
#
|
||||
# Common options for md5sum, sha1sum, sha256sum, sha512sum
|
||||
# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
|
||||
#
|
||||
CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
|
||||
|
||||
|
|
@ -371,7 +374,6 @@ 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_OPTIMIZE_CURSOR=y
|
||||
CONFIG_AWK=y
|
||||
CONFIG_FEATURE_AWK_LIBM=y
|
||||
CONFIG_CMP=y
|
||||
|
|
@ -608,9 +610,11 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
|
|||
# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_FAT is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_EXFAT is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_HFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_JFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_XFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_NILFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_NTFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_UDF is not set
|
||||
|
|
@ -618,6 +622,7 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
|
|||
# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_SYSV is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
|
||||
# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
|
||||
|
|
@ -890,6 +895,13 @@ CONFIG_PMAP=y
|
|||
CONFIG_PSTREE=y
|
||||
CONFIG_PWDX=y
|
||||
# CONFIG_SMEMCAP is not set
|
||||
CONFIG_TOP=y
|
||||
CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
|
||||
CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
|
||||
CONFIG_FEATURE_TOP_SMP_CPU=y
|
||||
# CONFIG_FEATURE_TOP_DECIMALS is not set
|
||||
# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
|
||||
CONFIG_FEATURE_TOPMEM=y
|
||||
CONFIG_UPTIME=y
|
||||
CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
|
||||
CONFIG_FREE=y
|
||||
|
|
@ -910,13 +922,6 @@ CONFIG_FEATURE_PS_LONG=y
|
|||
# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
|
||||
CONFIG_RENICE=y
|
||||
CONFIG_BB_SYSCTL=y
|
||||
CONFIG_TOP=y
|
||||
CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
|
||||
CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
|
||||
CONFIG_FEATURE_TOP_SMP_CPU=y
|
||||
# CONFIG_FEATURE_TOP_DECIMALS is not set
|
||||
# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
|
||||
CONFIG_FEATURE_TOPMEM=y
|
||||
# CONFIG_FEATURE_SHOW_THREADS is not set
|
||||
CONFIG_WATCH=y
|
||||
|
||||
|
|
@ -1011,6 +1016,11 @@ CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
|
|||
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
|
||||
# CONFIG_LOGREAD is not set
|
||||
# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
|
||||
CONFIG_FEATURE_KMSG_SYSLOG=y
|
||||
CONFIG_KLOGD=y
|
||||
|
||||
#
|
||||
# klogd should not be used together with syslog to kernel printk buffer
|
||||
#
|
||||
CONFIG_FEATURE_KLOGD_KLOGCTL=y
|
||||
CONFIG_LOGGER=y
|
||||
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Loading…
Reference in New Issue