From: Stefan Becker <chemobejk@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCHv2 proposal/next 2/3] build: replace host-mkpasswd with host-busybox
Date: Fri, 1 Jun 2018 16:30:52 +0300 [thread overview]
Message-ID: <20180601133053.27552-3-chemobejk@gmail.com> (raw)
In-Reply-To: <20180601133053.27552-1-chemobejk@gmail.com>
host-mkpasswd was a fork from whois to provide a host version of
mkpasswd for the build. This has caused a maintenance headache.
Replace it with host-busybox which can provide "mkpasswd" functionality
from own source code. That causes less hassle for different build
platforms.
Signed-off-by: Stefan Becker <chemobejk@gmail.com>
---
fs/common.mk | 2 +-
package/Config.in.host | 2 +-
package/skeleton-init-common/skeleton-init-common.mk | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/common.mk b/fs/common.mk
index 9baf367729..42d5dff569 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -63,7 +63,7 @@ ROOTFS_COMMON_TARGET_DIR = $(FS_DIR)/target
ROOTFS_COMMON_DEPENDENCIES = \
host-fakeroot host-makedevs \
- $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-mkpasswd)
+ $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-busybox)
$(ROOTFS_COMMON_TAR): ROOTFS=COMMON
$(ROOTFS_COMMON_TAR): FAKEROOT_SCRIPT=$(FS_DIR)/fakeroot.fs
diff --git a/package/Config.in.host b/package/Config.in.host
index 38543e7390..c524333671 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -2,6 +2,7 @@ menu "Host utilities"
source "package/aespipe/Config.in.host"
source "package/android-tools/Config.in.host"
+ source "package/busybox/Config.in.host"
source "package/cargo/Config.in.host"
source "package/cbootimage/Config.in.host"
source "package/checkpolicy/Config.in.host"
@@ -31,7 +32,6 @@ menu "Host utilities"
source "package/lpc3250loader/Config.in.host"
source "package/lttng-babeltrace/Config.in.host"
source "package/mfgtools/Config.in.host"
- source "package/mkpasswd/Config.in.host"
source "package/mtd/Config.in.host"
source "package/mtools/Config.in.host"
source "package/mxsldr/Config.in.host"
diff --git a/package/skeleton-init-common/skeleton-init-common.mk b/package/skeleton-init-common/skeleton-init-common.mk
index e8a0522052..99c87e3861 100644
--- a/package/skeleton-init-common/skeleton-init-common.mk
+++ b/package/skeleton-init-common/skeleton-init-common.mk
@@ -63,7 +63,7 @@ ifneq ($(filter $$1$$% $$5$$% $$6$$%,$(SKELETON_INIT_COMMON_ROOT_PASSWD)),)
SKELETON_INIT_COMMON_ROOT_PASSWORD = '$(SKELETON_INIT_COMMON_ROOT_PASSWD)'
else ifneq ($(SKELETON_INIT_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.
+# be sure that host-busybox will have already been built by that time.
SKELETON_INIT_COMMON_ROOT_PASSWORD = "`$(MKPASSWD) -m "$(SKELETON_INIT_COMMON_PASSWD_METHOD)" "$(SKELETON_INIT_COMMON_ROOT_PASSWD)"`"
endif
else # !BR2_TARGET_ENABLE_ROOT_LOGIN
--
2.17.0
next prev parent reply other threads:[~2018-06-01 13:30 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-02 9:05 [Buildroot] [PATCH] host-mkpasswd: fix crash on Fedora 28 build host Stefan Becker
2018-05-02 17:57 ` Yann E. MORIN
2018-05-02 18:23 ` Stefan Becker
2018-05-02 20:38 ` Arnout Vandecappelle
2018-05-02 21:04 ` Yann E. MORIN
2018-05-03 6:11 ` Stefan Becker
2018-05-02 21:06 ` Yann E. MORIN
2018-05-03 19:56 ` Thomas Petazzoni
2018-05-03 20:04 ` Yann E. MORIN
2018-05-06 16:19 ` Stefan Becker
2018-05-07 15:00 ` M ZV
2018-05-08 21:37 ` Arnout Vandecappelle
2018-05-09 20:22 ` Yann E. MORIN
2018-05-10 16:02 ` M ZV
2018-05-29 7:37 ` Peter Korsgaard
2018-05-30 15:31 ` Yann E. MORIN
2018-05-30 16:45 ` Arnout Vandecappelle
2018-06-01 12:58 ` [Buildroot] [PATCH proposal/next] replace host-mkpasswd Stefan Becker
2018-06-01 12:58 ` [Buildroot] [PATCH proposal/next 1/2] package/busybox: add host variant Stefan Becker
2018-06-01 13:03 ` Thomas Petazzoni
2018-06-01 12:59 ` [Buildroot] [PATCH proposal/next 2/2] package/mkpasswd: remove obsolete package Stefan Becker
2018-06-01 13:30 ` [Buildroot] [PATCHv2 propsal/next] replace host-mkpasswd Stefan Becker
2018-06-01 13:30 ` [Buildroot] [PATCHv2 proposal/next 1/3] package/busybox: add host variant Stefan Becker
2018-06-01 13:30 ` Stefan Becker [this message]
2018-06-04 22:21 ` [Buildroot] [PATCHv2 proposal/next 2/3] build: replace host-mkpasswd with host-busybox Arnout Vandecappelle
2018-06-05 11:22 ` Carlos Santos
2018-06-05 16:15 ` Yann E. MORIN
2018-06-05 16:35 ` Christopher McCrory
2018-06-05 16:50 ` Yann E. MORIN
2018-06-07 21:29 ` Arnout Vandecappelle
2018-06-08 11:40 ` Stefan Becker
2018-06-08 17:13 ` Yann E. MORIN
2018-06-05 16:08 ` Yann E. MORIN
2018-06-18 5:13 ` Peter Korsgaard
2018-06-18 6:53 ` Thomas Petazzoni
2018-06-01 13:30 ` [Buildroot] [PATCHv2 proposal/next 3/3] package/mkpasswd: remove obsolete package Stefan Becker
2018-05-29 6:43 ` [Buildroot] [PATCH] host-mkpasswd: fix crash on Fedora 28 build host Stefan Becker
2018-05-03 21:26 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180601133053.27552-3-chemobejk@gmail.com \
--to=chemobejk@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox