From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 1/1] package/e2fsprogs: disable e2scrub conditionally
Date: Sat, 1 May 2021 00:03:25 +0200 [thread overview]
Message-ID: <20210430220325.GD2137340@scaer> (raw)
In-Reply-To: <20210430091627.3414609-1-tianyuanhao@aliyun.com>
Tian, All,
On 2021-04-30 17:16 +0800, Tian Yuanhao via buildroot spake thusly:
> e2scrub_all depends on coreutils' readlink. If you use busybox's
> readlink, you will see the following error:
>
> readlink: invalid option -- 'e'
>
> Disable e2scrub if its dependencies are not met.
>
> Signed-off-by: Tian Yuanhao <tianyuanhao@aliyun.com>
> Cc: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: James Hilliard <james.hilliard1@gmail.com>
I've done a few changes:
- add a kconfig option like for other tools
- move the conditions to that new option
- reword the commit log accordingly
With the above: applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> Changes v2 -> v3:
> - check dependencies (suggested by James)
>
> Changes v1 -> v2:
> - use make flags instead of configure options (suggested by Yann)
> ---
> package/e2fsprogs/e2fsprogs.mk | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
> index 4420d16aff..db4b849143 100644
> --- a/package/e2fsprogs/e2fsprogs.mk
> +++ b/package/e2fsprogs/e2fsprogs.mk
> @@ -74,6 +74,16 @@ E2FSPROGS_INSTALL_STAGING_OPTS = \
> DESTDIR=$(STAGING_DIR) \
> install-libs
>
> +# e2scrub support needs bash, coreutils, lvm2 and util-linux
> +ifneq ($(BR2_PACKAGE_BASH)$(BR2_PACKAGE_COREUTILS)$(BR2_PACKAGE_LVM2)$(BR2_PACKAGE_UTIL_LINUX),yyyy)
> +E2FSPROGS_MAKE_OPTS += E2SCRUB_DIR=
> +endif
> +
> +E2FSPROGS_INSTALL_TARGET_OPTS = \
> + $(E2FSPROGS_MAKE_OPTS) \
> + DESTDIR=$(TARGET_DIR) \
> + install
> +
> # Package does not build in parallel due to improper make rules
> define HOST_E2FSPROGS_INSTALL_CMDS
> $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) install install-libs
> --
> 2.25.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2021-04-30 22:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-17 9:03 [Buildroot] [PATCH 1/1] package/e2fsprogs: disable the e2scrub stuff Tian Yuanhao
2020-09-17 19:39 ` Thomas Petazzoni
2020-09-18 1:57 ` Tian Yuanhao
2020-09-20 21:12 ` Yann E. MORIN
2020-09-21 2:48 ` [Buildroot] [PATCH v2 1/1] package/e2fsprogs: disable e2scrub Tian Yuanhao
2020-10-10 17:04 ` James Hilliard
2021-04-30 9:16 ` [Buildroot] [PATCH v3 1/1] package/e2fsprogs: disable e2scrub conditionally Tian Yuanhao
2021-04-30 22:03 ` Yann E. MORIN [this message]
2021-05-01 6:11 ` Alexander Dahl
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=20210430220325.GD2137340@scaer \
--to=yann.morin.1998@free.fr \
--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