From 95e4c715fd120d2ab2dee093d5b730c80e75ff99 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Mon, 4 Apr 2016 16:38:02 +0100 Subject: mingw: post-merge build fixes --- configs/mingw32_defconfig | 9 +++++++-- configs/mingw64_defconfig | 9 +++++++-- include/mingw.h | 1 + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index 077c005c8..c06369b2e 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.25.0.git -# Mon Feb 22 10:28:56 2016 +# Mon Apr 4 16:27:18 2016 # CONFIG_HAVE_DOT_CONFIG=y # CONFIG_PLATFORM_POSIX is not set @@ -458,6 +458,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" # CONFIG_INIT is not set +# CONFIG_LINUXRC is not set # CONFIG_FEATURE_USE_INITTAB is not set # CONFIG_FEATURE_KILL_REMOVED is not set CONFIG_FEATURE_KILL_DELAY=0 @@ -465,7 +466,6 @@ CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_INIT_SYSLOG is not set # CONFIG_FEATURE_EXTRA_QUIET is not set # CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set CONFIG_INIT_TERMINAL_TYPE="" # CONFIG_FEATURE_INIT_MODIFY_CMDLINE is not set # CONFIG_MESG is not set @@ -493,6 +493,7 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_CHPASSWD is not set CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" # CONFIG_CRYPTPW is not set +# CONFIG_MKPASSWD is not set # CONFIG_DELUSER is not set # CONFIG_DELGROUP is not set # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set @@ -572,9 +573,12 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # CONFIG_FEATURE_MOUNT_FLAGS is not set # CONFIG_FEATURE_MOUNT_FSTAB is not set # CONFIG_FEATURE_MOUNT_OTHERTAB is not set +# CONFIG_NSENTER is not set +# CONFIG_FEATURE_NSENTER_LONG_OPTS is not set CONFIG_REV=y # CONFIG_SETARCH is not set # CONFIG_UEVENT is not set +# CONFIG_UNSHARE is not set # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set # CONFIG_BLKID is not set @@ -689,6 +693,7 @@ CONFIG_FEATURE_LESS_LINENUMS=y # CONFIG_SETSERIAL is not set # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_UBIRENAME is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set # CONFIG_UBIMKVOL is not set diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig index 9cbcbf496..04e6ac070 100644 --- a/configs/mingw64_defconfig +++ b/configs/mingw64_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.25.0.git -# Mon Feb 22 10:28:56 2016 +# Mon Apr 4 16:31:09 2016 # CONFIG_HAVE_DOT_CONFIG=y # CONFIG_PLATFORM_POSIX is not set @@ -458,6 +458,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" # CONFIG_INIT is not set +# CONFIG_LINUXRC is not set # CONFIG_FEATURE_USE_INITTAB is not set # CONFIG_FEATURE_KILL_REMOVED is not set CONFIG_FEATURE_KILL_DELAY=0 @@ -465,7 +466,6 @@ CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_INIT_SYSLOG is not set # CONFIG_FEATURE_EXTRA_QUIET is not set # CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set CONFIG_INIT_TERMINAL_TYPE="" # CONFIG_FEATURE_INIT_MODIFY_CMDLINE is not set # CONFIG_MESG is not set @@ -493,6 +493,7 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_CHPASSWD is not set CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" # CONFIG_CRYPTPW is not set +# CONFIG_MKPASSWD is not set # CONFIG_DELUSER is not set # CONFIG_DELGROUP is not set # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set @@ -572,9 +573,12 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # CONFIG_FEATURE_MOUNT_FLAGS is not set # CONFIG_FEATURE_MOUNT_FSTAB is not set # CONFIG_FEATURE_MOUNT_OTHERTAB is not set +# CONFIG_NSENTER is not set +# CONFIG_FEATURE_NSENTER_LONG_OPTS is not set CONFIG_REV=y # CONFIG_SETARCH is not set # CONFIG_UEVENT is not set +# CONFIG_UNSHARE is not set # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set # CONFIG_BLKID is not set @@ -689,6 +693,7 @@ CONFIG_FEATURE_LESS_LINENUMS=y # CONFIG_SETSERIAL is not set # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_UBIRENAME is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set # CONFIG_UBIMKVOL is not set diff --git a/include/mingw.h b/include/mingw.h index b32ee43b0..f30338ba8 100644 --- a/include/mingw.h +++ b/include/mingw.h @@ -383,6 +383,7 @@ clock_t times(struct tms *buf); IMPL(alarm,unsigned int,0,unsigned int seconds UNUSED_PARAM); IMPL(chown,int,0,const char *path UNUSED_PARAM, uid_t uid UNUSED_PARAM, gid_t gid UNUSED_PARAM); NOIMPL(chroot,const char *root UNUSED_PARAM); +NOIMPL(fchdir,int fd UNUSED_PARAM); int mingw_dup2 (int fd, int fdto); char *mingw_getcwd(char *pointer, int len); -- cgit v1.2.3-55-g6feb