summaryrefslogtreecommitdiffstats
path: root/support/scripts/mkusers
diff options
context:
space:
mode:
authorArnout Vandecappelle <arnout@mind.be>2014-02-04 16:18:52 +0100
committerPeter Korsgaard <peter@korsgaard.com>2014-02-09 17:00:13 +0100
commit4113b3c3bdb9c7943e011827982000403f66dc61 (patch)
treef4d52eb74841c6f925ca0a200f7cd0fc9fce454c /support/scripts/mkusers
parenta7c1b84a5967e88be8032ef085c2d84aafc0008a (diff)
downloadbuildroot-4113b3c3bdb9c7943e011827982000403f66dc61.tar.gz
buildroot-4113b3c3bdb9c7943e011827982000403f66dc61.zip
infra: replace BUILDROOT_CONFIG with BR2_CONFIG
To make the naming consistent (all user-visible options should be prefixed with BR2_). An entry is added to Makefile.legacy to warn users who have set BUILDROOT_CONFIG but not BR2_CONFIG. Still export BUILDROOT_CONFIG but pointing to some phony value, to make sure that scripts that still use it fail in a predictable way. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Jérémy Rosen <jeremy.rosen@openwide.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'support/scripts/mkusers')
-rwxr-xr-xsupport/scripts/mkusers4
1 files changed, 2 insertions, 2 deletions
diff --git a/support/scripts/mkusers b/support/scripts/mkusers
index 3b287b8a9a..a67356ab6d 100755
--- a/support/scripts/mkusers
+++ b/support/scripts/mkusers
@@ -39,7 +39,7 @@ GROUP="${TARGET_DIR}/etc/group"
# with /etc/group, so any use of gshadow must be conditional.
GSHADOW="${TARGET_DIR}/etc/gshadow"
-# We can't simply source ${BUILDROOT_CONFIG} as it may contains constructs
+# We can't simply source ${BR2_CONFIG} as it may contains constructs
# such as:
# BR2_DEFCONFIG="$(CONFIG_DIR)/defconfig"
# which when sourced from a shell script will eventually try to execute
@@ -48,7 +48,7 @@ GSHADOW="${TARGET_DIR}/etc/gshadow"
# So, we have to scan that file instead. Sigh... :-(
PASSWD_METHOD="$( sed -r -e '/^BR2_TARGET_GENERIC_PASSWD_METHOD="(.*)"$/!d;' \
-e 's//\1/;' \
- "${BUILDROOT_CONFIG}" \
+ "${BR2_CONFIG}" \
)"
#----------------------------------------------------------------------------
OpenPOWER on IntegriCloud