diff options
| author | Arnout Vandecappelle <arnout@mind.be> | 2017-08-02 00:52:17 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-08-02 19:25:32 +0200 |
| commit | 22cf98c6af45492b942ba2956873cb3c85f2de7d (patch) | |
| tree | 149b54ed567e2fe987abae58ccba41a1747e0edd | |
| parent | 120307520f69f801bf05df1d2fd3433c6d498551 (diff) | |
| download | buildroot-22cf98c6af45492b942ba2956873cb3c85f2de7d.tar.gz buildroot-22cf98c6af45492b942ba2956873cb3c85f2de7d.zip | |
skeleton-common: rename SKELETON_ROOT_PASSWORD to SKELETON_COMMON_ROOT_PASSWORD
Package variables should always be prefixed with the package name. For
SKELETON_COMMON_ROOT_PASSWORD, this means we set the variable a second
time based on the value it previously had. Fortunately, this is fine
for make, even for recursively expanded variables.
This also allows to simplify the condition of the empty password - it's
not needed to set it again to empty if it already was empty.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/skeleton-common/skeleton-common.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/package/skeleton-common/skeleton-common.mk b/package/skeleton-common/skeleton-common.mk index 07c434c07a..06e59c03df 100644 --- a/package/skeleton-common/skeleton-common.mk +++ b/package/skeleton-common/skeleton-common.mk @@ -62,20 +62,18 @@ SKELETON_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_COMMON_SET_ISSUE endif ifeq ($(BR2_TARGET_ENABLE_ROOT_LOGIN),y) -ifeq ($(SKELETON_COMMON_ROOT_PASSWD),) -SKELETON_ROOT_PASSWORD = -else ifneq ($(filter $$1$$% $$5$$% $$6$$%,$(SKELETON_COMMON_ROOT_PASSWD)),) -SKELETON_ROOT_PASSWORD = '$(SKELETON_COMMON_ROOT_PASSWD)' -else +ifneq ($(filter $$1$$% $$5$$% $$6$$%,$(SKELETON_COMMON_ROOT_PASSWD)),) +SKELETON_COMMON_ROOT_PASSWORD = '$(SKELETON_COMMON_ROOT_PASSWD)' +else ifneq ($(SKELETON_COMMON_ROOT_PASSWD),) # This variable will only be evaluated in the finalize stage, so we can # be sure that host-mkpasswd will have already been built by that time. -SKELETON_ROOT_PASSWORD = "`$(MKPASSWD) -m "$(SKELETON_COMMON_PASSWD_METHOD)" "$(SKELETON_COMMON_ROOT_PASSWD)"`" +SKELETON_COMMON_ROOT_PASSWORD = "`$(MKPASSWD) -m "$(SKELETON_COMMON_PASSWD_METHOD)" "$(SKELETON_COMMON_ROOT_PASSWD)"`" endif else # !BR2_TARGET_ENABLE_ROOT_LOGIN -SKELETON_ROOT_PASSWORD = "*" +SKELETON_COMMON_ROOT_PASSWORD = "*" endif define SKELETON_COMMON_SET_ROOT_PASSWD - $(SED) s,^root:[^:]*:,root:$(SKELETON_ROOT_PASSWORD):, $(TARGET_DIR)/etc/shadow + $(SED) s,^root:[^:]*:,root:$(SKELETON_COMMON_ROOT_PASSWORD):, $(TARGET_DIR)/etc/shadow endef SKELETON_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_COMMON_SET_ROOT_PASSWD |
