From: kos <kos@dev3>
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

Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus

Conflicts:
	meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend
---

0761571c7ca12b7297da129697aeee583a468174
diff --cc 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
@@@ -446,21 -446,21 +446,21 @@@ 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
diff --cc 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 \