* [Buildroot] [PATCH 1/1] package/e2fsprogs: fix fsck when using systemd
@ 2016-06-11 16:15 Martin Bark
2016-06-12 21:09 ` Yann E. MORIN
2016-06-15 21:25 ` Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: Martin Bark @ 2016-06-11 16:15 UTC (permalink / raw)
To: buildroot
Commit a93fc34 modified e2fsprogs to symlink /usr/sbin/fsck to /sbin/fsck
to keep systemd happy. However, later on commit c5bd8af6 has forced
/usr/sbin to be a symlink to /sbin when using systemd. This means fsck
gets destroyed as a symlink to itself when using systemd or when setting
BR2_ROOTFS_MERGED_USR.
Since commit c5bd8af6 obsoletes commit a93fc34 revert the changes from
commit a93fc34 to solve the issue.
Signed-off-by: Martin Bark <martin@barkynet.com>
---
package/e2fsprogs/e2fsprogs.mk | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 5ba9278..7aa0285 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -155,14 +155,5 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_TUNE2FS),y)
E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_TUNE2FS_SYMLINK
endif
-# systemd really wants to have fsck in /sbin
-define E2FSPROGS_TARGET_FSCK_SYMLINK
- ln -sf ../usr/sbin/fsck $(TARGET_DIR)/sbin/fsck
-endef
-
-ifeq ($(BR2_PACKAGE_E2FSPROGS_FSCK),y)
-E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FSCK_SYMLINK
-endif
-
$(eval $(autotools-package))
$(eval $(host-autotools-package))
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/e2fsprogs: fix fsck when using systemd
2016-06-11 16:15 [Buildroot] [PATCH 1/1] package/e2fsprogs: fix fsck when using systemd Martin Bark
@ 2016-06-12 21:09 ` Yann E. MORIN
2016-06-15 21:25 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2016-06-12 21:09 UTC (permalink / raw)
To: buildroot
Martin, All
On 2016-06-11 17:15 +0100, Martin Bark spake thusly:
> Commit a93fc34 modified e2fsprogs to symlink /usr/sbin/fsck to /sbin/fsck
> to keep systemd happy. However, later on commit c5bd8af6 has forced
> /usr/sbin to be a symlink to /sbin when using systemd. This means fsck
> gets destroyed as a symlink to itself when using systemd or when setting
> BR2_ROOTFS_MERGED_USR.
>
> Since commit c5bd8af6 obsoletes commit a93fc34 revert the changes from
> commit a93fc34 to solve the issue.
>
> Signed-off-by: Martin Bark <martin@barkynet.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/e2fsprogs/e2fsprogs.mk | 9 ---------
> 1 file changed, 9 deletions(-)
>
> diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
> index 5ba9278..7aa0285 100644
> --- a/package/e2fsprogs/e2fsprogs.mk
> +++ b/package/e2fsprogs/e2fsprogs.mk
> @@ -155,14 +155,5 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_TUNE2FS),y)
> E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_TUNE2FS_SYMLINK
> endif
>
> -# systemd really wants to have fsck in /sbin
> -define E2FSPROGS_TARGET_FSCK_SYMLINK
> - ln -sf ../usr/sbin/fsck $(TARGET_DIR)/sbin/fsck
> -endef
> -
> -ifeq ($(BR2_PACKAGE_E2FSPROGS_FSCK),y)
> -E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FSCK_SYMLINK
> -endif
> -
> $(eval $(autotools-package))
> $(eval $(host-autotools-package))
> --
> 2.7.4
>
> _______________________________________________
> 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 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/e2fsprogs: fix fsck when using systemd
2016-06-11 16:15 [Buildroot] [PATCH 1/1] package/e2fsprogs: fix fsck when using systemd Martin Bark
2016-06-12 21:09 ` Yann E. MORIN
@ 2016-06-15 21:25 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2016-06-15 21:25 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 11 Jun 2016 17:15:56 +0100, Martin Bark wrote:
> Commit a93fc34 modified e2fsprogs to symlink /usr/sbin/fsck to /sbin/fsck
> to keep systemd happy. However, later on commit c5bd8af6 has forced
> /usr/sbin to be a symlink to /sbin when using systemd. This means fsck
> gets destroyed as a symlink to itself when using systemd or when setting
> BR2_ROOTFS_MERGED_USR.
>
> Since commit c5bd8af6 obsoletes commit a93fc34 revert the changes from
> commit a93fc34 to solve the issue.
>
> Signed-off-by: Martin Bark <martin@barkynet.com>
> ---
> package/e2fsprogs/e2fsprogs.mk | 9 ---------
> 1 file changed, 9 deletions(-)
Applied to master, thanks. Thanks Yann for the review.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-15 21:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-11 16:15 [Buildroot] [PATCH 1/1] package/e2fsprogs: fix fsck when using systemd Martin Bark
2016-06-12 21:09 ` Yann E. MORIN
2016-06-15 21:25 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.