From: kos Date: Fri, 25 Jan 2013 10:07:51 +0000 (+0900) Subject: Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus;a=commitdiff_plain;h=0761571c7ca12b7297da129697aeee583a468174;hp=-c Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus Conflicts: meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend --- 0761571c7ca12b7297da129697aeee583a468174 diff --combined meta-openvuplus/recipes-core/busybox/busybox-1.19.4/defconfig index 849e3e2,99556d3..5f26243 --- a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/defconfig +++ b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/defconfig @@@ -1,7 -1,7 +1,7 @@@ # # Automatically generated make config: don't edit # Busybox version: 1.19.4 - # Mon Jan 7 17:03:29 2013 + # Thu Jan 24 16:42:02 2013 # CONFIG_HAVE_DOT_CONFIG=y @@@ -422,9 -422,9 +422,9 @@@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM= # CONFIG_BOOTCHARTD is not set # CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set # CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set - CONFIG_HALT=y - CONFIG_FEATURE_CALL_TELINIT=y - CONFIG_TELINIT_PATH="/sbin/telinit" + # CONFIG_HALT is not set + # CONFIG_FEATURE_CALL_TELINIT is not set + CONFIG_TELINIT_PATH="" # CONFIG_INIT is not set # CONFIG_FEATURE_USE_INITTAB is not set # CONFIG_FEATURE_KILL_REMOVED is not set @@@ -446,31 -446,31 +446,31 @@@ CONFIG_INIT_TERMINAL_TYPE=" CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_CRYPT is not set +CONFIG_USE_BB_CRYPT=y # CONFIG_USE_BB_CRYPT_SHA is not set - CONFIG_ADDUSER=y - CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y + # CONFIG_ADDUSER is not set + # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set # CONFIG_FEATURE_CHECK_NAMES is not set - CONFIG_FIRST_SYSTEM_ID=100 - CONFIG_LAST_SYSTEM_ID=999 - CONFIG_ADDGROUP=y - CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y - CONFIG_FEATURE_ADDUSER_TO_GROUP=y - CONFIG_DELUSER=y - CONFIG_DELGROUP=y - CONFIG_FEATURE_DEL_USER_FROM_GROUP=y + CONFIG_FIRST_SYSTEM_ID=0 + CONFIG_LAST_SYSTEM_ID=0 + # CONFIG_ADDGROUP is not set + # CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set + # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set + # CONFIG_DELUSER is not set + # CONFIG_DELGROUP is not set + # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set CONFIG_GETTY=y - CONFIG_LOGIN=y + # CONFIG_LOGIN is not set # CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set # CONFIG_FEATURE_NOLOGIN is not set # CONFIG_FEATURE_SECURETTY is not set - CONFIG_PASSWD=y + # CONFIG_PASSWD is not set # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set # CONFIG_CRYPTPW is not set # CONFIG_CHPASSWD is not set - CONFIG_SU=y - CONFIG_FEATURE_SU_SYSLOG=y + # CONFIG_SU is not set + # CONFIG_FEATURE_SU_SYSLOG is not set # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set CONFIG_SULOGIN=y # CONFIG_VLOCK is not set @@@ -479,7 -479,7 +479,7 @@@ # Linux Ext2 FS Progs # CONFIG_CHATTR=y - CONFIG_FSCK=y + # CONFIG_FSCK is not set CONFIG_LSATTR=y CONFIG_TUNE2FS=y @@@ -496,7 -496,7 +496,7 @@@ CONFIG_LSMOD= CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y CONFIG_MODPROBE=y CONFIG_FEATURE_MODPROBE_BLACKLIST=y - CONFIG_DEPMOD=y + # CONFIG_DEPMOD is not set # # Options common to multiple modutils @@@ -636,7 -636,7 +636,7 @@@ CONFIG_FEATURE_LESS_WINCH= CONFIG_FEATURE_LESS_ASK_TERMINAL=y # CONFIG_FEATURE_LESS_DASHCMD is not set # CONFIG_FEATURE_LESS_LINENUMS is not set - CONFIG_NANDWRITE=y + # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set CONFIG_SETSERIAL=y # CONFIG_UBIATTACH is not set @@@ -675,28 -675,28 +675,28 @@@ CONFIG_DC= CONFIG_DEVMEM=y CONFIG_EJECT=y CONFIG_FEATURE_EJECT_SCSI=y - # CONFIG_FBSPLASH is not set + CONFIG_FBSPLASH=y # CONFIG_FLASHCP is not set # CONFIG_FLASH_LOCK is not set # CONFIG_FLASH_UNLOCK is not set - CONFIG_FLASH_ERASEALL=y + # CONFIG_FLASH_ERASEALL is not set CONFIG_IONICE=y CONFIG_INOTIFYD=y # CONFIG_LAST is not set # CONFIG_FEATURE_LAST_SMALL is not set # CONFIG_FEATURE_LAST_FANCY is not set - CONFIG_HDPARM=y - CONFIG_FEATURE_HDPARM_GET_IDENTITY=y + # CONFIG_HDPARM is not set + # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set # CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set - CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y + # CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set # CONFIG_MAKEDEVS is not set # CONFIG_FEATURE_MAKEDEVS_LEAF is not set # CONFIG_FEATURE_MAKEDEVS_TABLE is not set # CONFIG_MAN is not set - # CONFIG_MICROCOM is not set + CONFIG_MICROCOM=y # CONFIG_MOUNTPOINT is not set # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set @@@ -768,7 -768,7 +768,7 @@@ CONFIG_FEATURE_IFCONFIG_STATUS= CONFIG_FEATURE_IFCONFIG_HW=y # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set # CONFIG_IFENSLAVE is not set - CONFIG_IFPLUGD=y + # CONFIG_IFPLUGD is not set CONFIG_IFUPDOWN=y CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" CONFIG_FEATURE_IFUPDOWN_IP=y @@@ -888,33 -888,33 +888,33 @@@ CONFIG_POWERTOP= # CONFIG_PSTREE is not set # CONFIG_PWDX is not set CONFIG_SMEMCAP=y - CONFIG_UPTIME=y + # CONFIG_UPTIME is not set # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set - CONFIG_FREE=y + # CONFIG_FREE is not set # CONFIG_FUSER is not set - CONFIG_KILL=y - CONFIG_KILLALL=y + # CONFIG_KILL is not set + # CONFIG_KILLALL is not set # CONFIG_KILLALL5 is not set # CONFIG_PGREP is not set CONFIG_PIDOF=y CONFIG_FEATURE_PIDOF_SINGLE=y CONFIG_FEATURE_PIDOF_OMIT=y # CONFIG_PKILL is not set - CONFIG_PS=y - CONFIG_FEATURE_PS_WIDE=y + # CONFIG_PS is not set + # CONFIG_FEATURE_PS_WIDE is not set # CONFIG_FEATURE_PS_TIME is not set # CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set # 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_BB_SYSCTL is not set + # CONFIG_TOP is not set + # CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set + # CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set + # CONFIG_FEATURE_TOP_SMP_CPU is not set # CONFIG_FEATURE_TOP_DECIMALS is not set # CONFIG_FEATURE_TOP_SMP_PROCESS is not set - CONFIG_FEATURE_TOPMEM=y - CONFIG_FEATURE_SHOW_THREADS=y + # CONFIG_FEATURE_TOPMEM is not set + # CONFIG_FEATURE_SHOW_THREADS is not set # CONFIG_WATCH is not set # diff --combined meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend index 042ab21,61d12dc..1278af1 --- a/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend +++ b/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend @@@ -1,4 -1,4 +1,4 @@@ - PR .= "-vuplus5" -PR .= "-vuplus6" ++PR .= "-vuplus7" SRC_URI += " \ file://0001-ifupdown-support-post-up-pre-down-hooks.patch \ @@@ -7,14 -7,16 +7,17 @@@ file://0004-ifupdown-support-metric-for-static-default-gw.patch \ file://0005-ifupdown-improve-compatibility-with-Debian.patch \ file://0006-get_linux_version_code-don-t-fail-on-3.0-foo.patch \ + file://0007-ifplugd-move-read_pid-to-libbb-pidfile.c-and-rename-.patch \ + file://0009-udhcpc-calculate-broadcast-address-if-not-given-by-s.patch \ file://0001-work-around-linux-ext2_fs.h-breakage.patch \ file://0002-Create-and-use-our-own-copy-of-linux-ext2_fs.h.patch \ file://0003-Drop-include-bb_linux_ext2_fs.h-use-existing-e2fspro.patch \ file://mount_single_uuid.patch \ + file://change-passwd-default-algorithm.patch \ file://inetd \ file://inetd.conf \ " + # 0008-ifupdown-dhcp_down-wait-until-udhcpc-has-been-killed.patch is removed. if patched, postdown is not working.(/etc/network/interfaces) DEPENDS += "mtd-utils"