2013-06-06 01:53:30 +02:00
|
|
|
################################################################################
|
2005-02-11 21:42:52 +01:00
|
|
|
#
|
|
|
|
# e2fsprogs
|
|
|
|
#
|
2013-06-06 01:53:30 +02:00
|
|
|
################################################################################
|
2009-10-29 21:35:33 +01:00
|
|
|
|
2017-02-11 23:04:24 +01:00
|
|
|
E2FSPROGS_VERSION = 1.43.4
|
2015-03-03 09:41:11 +01:00
|
|
|
E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
|
2014-09-17 16:20:09 +02:00
|
|
|
E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
|
2017-04-22 13:59:47 +02:00
|
|
|
E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet)
|
|
|
|
E2FSPROGS_LICENSE_FILES = NOTICE lib/ss/mit-sipb-copyright.h lib/et/internal.h
|
2013-11-28 18:53:57 +01:00
|
|
|
E2FSPROGS_INSTALL_STAGING = YES
|
2017-04-22 13:59:48 +02:00
|
|
|
|
|
|
|
# Use libblkid and libuuid from util-linux for host and target packages.
|
|
|
|
# This prevents overriding them with e2fsprogs' ones, which may cause
|
|
|
|
# problems for other packages.
|
2016-05-18 21:08:23 +02:00
|
|
|
E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
|
2017-04-22 13:59:48 +02:00
|
|
|
HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux
|
2016-06-09 16:13:13 +02:00
|
|
|
|
e2fsprogs: refactor to fix conflicts with busybox and util-linux
So far we attempted to solve the conflicts between busybox and e2fsprogs
by removing busybox programs from /bin and /sbin, leaving the e2fsprogs
ones at /usr/bin and /usr/sbin. This fails with BR2_ROOTFS_MERGED_USR=y,
leading to situations like the one described in bug 9436.
We could provide a better solution by means of a fine-grained selection
of programs, like util-linux does, but this would require big changes in
e2fsprogs. So instead of resorting to dirty tricks we switch to a more
pragmatic approach:
- Drop all configs to select/deselect utilities without corresponding
enable/disable options to the configure script. In other words, we
always install the basic set of utilities.
- fsck has a configure option, so use it. Note that --enable-fsck is
only about the wrapper, not about e2fsck.
- Install e2fsprogs utilities at /bin and /sbin, overriding the ones
eventually installed by busybox.
- Let the e2fsprogs build system create the symlinks mkfs.ext2 -> mke2fs
etc. fsck.ext4dev and mkfs.ext4dev were dropped in version 1.43.4.
Notice that these changes do exactly the opposite of what is requested
in bug 9436. On the other hand the policy for e2fsprogs becomes coherent
with the one for util-linux: busybox never wins.
Fixes:
https://bugs.busybox.net/show_bug.cgi?id=9436 (no fix, in fact)
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
[Arnout:
- don't add 'default y' to resize2fs;
- don't install the host package in /bin instead of /usr/bin - we
install everything under /usr (until /usr will be removed, soon)]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-23 00:49:13 +02:00
|
|
|
# If both e2fsprogs and busybox are selected, make certain e2fsprogs
|
|
|
|
# wins the fight over who gets to have their utils actually installed
|
|
|
|
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
|
|
|
E2FSPROGS_DEPENDENCIES += busybox
|
|
|
|
endif
|
|
|
|
|
2015-07-29 20:47:38 +02:00
|
|
|
# e4defrag doesn't build on older systems like RHEL5.x, and we don't
|
|
|
|
# need it on the host anyway.
|
2016-05-18 21:08:23 +02:00
|
|
|
# Disable fuse2fs as well to avoid carrying over deps, and it's unused
|
2017-04-22 13:59:48 +02:00
|
|
|
HOST_E2FSPROGS_CONF_OPTS = \
|
|
|
|
--disable-defrag \
|
2017-04-23 00:49:15 +02:00
|
|
|
--disable-e2initrd-helper \
|
2017-04-22 13:59:48 +02:00
|
|
|
--disable-fuse2fs \
|
|
|
|
--disable-libblkid \
|
e2fsprogs: refactor to fix conflicts with busybox and util-linux
So far we attempted to solve the conflicts between busybox and e2fsprogs
by removing busybox programs from /bin and /sbin, leaving the e2fsprogs
ones at /usr/bin and /usr/sbin. This fails with BR2_ROOTFS_MERGED_USR=y,
leading to situations like the one described in bug 9436.
We could provide a better solution by means of a fine-grained selection
of programs, like util-linux does, but this would require big changes in
e2fsprogs. So instead of resorting to dirty tricks we switch to a more
pragmatic approach:
- Drop all configs to select/deselect utilities without corresponding
enable/disable options to the configure script. In other words, we
always install the basic set of utilities.
- fsck has a configure option, so use it. Note that --enable-fsck is
only about the wrapper, not about e2fsck.
- Install e2fsprogs utilities at /bin and /sbin, overriding the ones
eventually installed by busybox.
- Let the e2fsprogs build system create the symlinks mkfs.ext2 -> mke2fs
etc. fsck.ext4dev and mkfs.ext4dev were dropped in version 1.43.4.
Notice that these changes do exactly the opposite of what is requested
in bug 9436. On the other hand the policy for e2fsprogs becomes coherent
with the one for util-linux: busybox never wins.
Fixes:
https://bugs.busybox.net/show_bug.cgi?id=9436 (no fix, in fact)
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
[Arnout:
- don't add 'default y' to resize2fs;
- don't install the host package in /bin instead of /usr/bin - we
install everything under /usr (until /usr will be removed, soon)]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-23 00:49:13 +02:00
|
|
|
--disable-libuuid \
|
2017-04-23 00:49:15 +02:00
|
|
|
--enable-symlink-install \
|
|
|
|
--disable-testio-debug
|
2015-07-29 20:47:38 +02:00
|
|
|
|
e2fsprogs: refactor to fix conflicts with busybox and util-linux
So far we attempted to solve the conflicts between busybox and e2fsprogs
by removing busybox programs from /bin and /sbin, leaving the e2fsprogs
ones at /usr/bin and /usr/sbin. This fails with BR2_ROOTFS_MERGED_USR=y,
leading to situations like the one described in bug 9436.
We could provide a better solution by means of a fine-grained selection
of programs, like util-linux does, but this would require big changes in
e2fsprogs. So instead of resorting to dirty tricks we switch to a more
pragmatic approach:
- Drop all configs to select/deselect utilities without corresponding
enable/disable options to the configure script. In other words, we
always install the basic set of utilities.
- fsck has a configure option, so use it. Note that --enable-fsck is
only about the wrapper, not about e2fsck.
- Install e2fsprogs utilities at /bin and /sbin, overriding the ones
eventually installed by busybox.
- Let the e2fsprogs build system create the symlinks mkfs.ext2 -> mke2fs
etc. fsck.ext4dev and mkfs.ext4dev were dropped in version 1.43.4.
Notice that these changes do exactly the opposite of what is requested
in bug 9436. On the other hand the policy for e2fsprogs becomes coherent
with the one for util-linux: busybox never wins.
Fixes:
https://bugs.busybox.net/show_bug.cgi?id=9436 (no fix, in fact)
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
[Arnout:
- don't add 'default y' to resize2fs;
- don't install the host package in /bin instead of /usr/bin - we
install everything under /usr (until /usr will be removed, soon)]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-23 00:49:13 +02:00
|
|
|
# Set the binary directories to "/bin" and "/sbin" to override programs
|
|
|
|
# installed by busybox.
|
2014-09-27 21:32:44 +02:00
|
|
|
E2FSPROGS_CONF_OPTS = \
|
e2fsprogs: refactor to fix conflicts with busybox and util-linux
So far we attempted to solve the conflicts between busybox and e2fsprogs
by removing busybox programs from /bin and /sbin, leaving the e2fsprogs
ones at /usr/bin and /usr/sbin. This fails with BR2_ROOTFS_MERGED_USR=y,
leading to situations like the one described in bug 9436.
We could provide a better solution by means of a fine-grained selection
of programs, like util-linux does, but this would require big changes in
e2fsprogs. So instead of resorting to dirty tricks we switch to a more
pragmatic approach:
- Drop all configs to select/deselect utilities without corresponding
enable/disable options to the configure script. In other words, we
always install the basic set of utilities.
- fsck has a configure option, so use it. Note that --enable-fsck is
only about the wrapper, not about e2fsck.
- Install e2fsprogs utilities at /bin and /sbin, overriding the ones
eventually installed by busybox.
- Let the e2fsprogs build system create the symlinks mkfs.ext2 -> mke2fs
etc. fsck.ext4dev and mkfs.ext4dev were dropped in version 1.43.4.
Notice that these changes do exactly the opposite of what is requested
in bug 9436. On the other hand the policy for e2fsprogs becomes coherent
with the one for util-linux: busybox never wins.
Fixes:
https://bugs.busybox.net/show_bug.cgi?id=9436 (no fix, in fact)
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
[Arnout:
- don't add 'default y' to resize2fs;
- don't install the host package in /bin instead of /usr/bin - we
install everything under /usr (until /usr will be removed, soon)]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-23 00:49:13 +02:00
|
|
|
--bindir=/bin \
|
|
|
|
--sbindir=/sbin \
|
2017-04-23 00:49:16 +02:00
|
|
|
$(if $(BR2_STATIC_LIBS),--disable-elf-shlibs,--enable-elf-shlibs) \
|
|
|
|
$(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),--enable-debugfs,--disable-debugfs) \
|
|
|
|
$(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),--enable-imager,--disable-imager) \
|
|
|
|
$(if $(BR2_PACKAGE_E2FSPROGS_E4DEFRAG),--enable-defrag,--disable-defrag) \
|
e2fsprogs: refactor to fix conflicts with busybox and util-linux
So far we attempted to solve the conflicts between busybox and e2fsprogs
by removing busybox programs from /bin and /sbin, leaving the e2fsprogs
ones at /usr/bin and /usr/sbin. This fails with BR2_ROOTFS_MERGED_USR=y,
leading to situations like the one described in bug 9436.
We could provide a better solution by means of a fine-grained selection
of programs, like util-linux does, but this would require big changes in
e2fsprogs. So instead of resorting to dirty tricks we switch to a more
pragmatic approach:
- Drop all configs to select/deselect utilities without corresponding
enable/disable options to the configure script. In other words, we
always install the basic set of utilities.
- fsck has a configure option, so use it. Note that --enable-fsck is
only about the wrapper, not about e2fsck.
- Install e2fsprogs utilities at /bin and /sbin, overriding the ones
eventually installed by busybox.
- Let the e2fsprogs build system create the symlinks mkfs.ext2 -> mke2fs
etc. fsck.ext4dev and mkfs.ext4dev were dropped in version 1.43.4.
Notice that these changes do exactly the opposite of what is requested
in bug 9436. On the other hand the policy for e2fsprogs becomes coherent
with the one for util-linux: busybox never wins.
Fixes:
https://bugs.busybox.net/show_bug.cgi?id=9436 (no fix, in fact)
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
[Arnout:
- don't add 'default y' to resize2fs;
- don't install the host package in /bin instead of /usr/bin - we
install everything under /usr (until /usr will be removed, soon)]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-23 00:49:13 +02:00
|
|
|
$(if $(BR2_PACKAGE_E2FSPROGS_FSCK),--enable-fsck,--disable-fsck) \
|
2017-04-23 00:49:16 +02:00
|
|
|
$(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),--enable-resizer,--disable-resizer) \
|
2011-09-06 09:12:51 +02:00
|
|
|
--disable-uuidd \
|
2012-02-28 12:22:33 +01:00
|
|
|
--disable-libblkid \
|
2011-07-29 08:49:48 +02:00
|
|
|
--disable-libuuid \
|
2009-10-29 21:35:33 +01:00
|
|
|
--disable-e2initrd-helper \
|
2014-06-04 01:15:56 +02:00
|
|
|
--disable-testio-debug \
|
e2fsprogs: refactor to fix conflicts with busybox and util-linux
So far we attempted to solve the conflicts between busybox and e2fsprogs
by removing busybox programs from /bin and /sbin, leaving the e2fsprogs
ones at /usr/bin and /usr/sbin. This fails with BR2_ROOTFS_MERGED_USR=y,
leading to situations like the one described in bug 9436.
We could provide a better solution by means of a fine-grained selection
of programs, like util-linux does, but this would require big changes in
e2fsprogs. So instead of resorting to dirty tricks we switch to a more
pragmatic approach:
- Drop all configs to select/deselect utilities without corresponding
enable/disable options to the configure script. In other words, we
always install the basic set of utilities.
- fsck has a configure option, so use it. Note that --enable-fsck is
only about the wrapper, not about e2fsck.
- Install e2fsprogs utilities at /bin and /sbin, overriding the ones
eventually installed by busybox.
- Let the e2fsprogs build system create the symlinks mkfs.ext2 -> mke2fs
etc. fsck.ext4dev and mkfs.ext4dev were dropped in version 1.43.4.
Notice that these changes do exactly the opposite of what is requested
in bug 9436. On the other hand the policy for e2fsprogs becomes coherent
with the one for util-linux: busybox never wins.
Fixes:
https://bugs.busybox.net/show_bug.cgi?id=9436 (no fix, in fact)
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
[Arnout:
- don't add 'default y' to resize2fs;
- don't install the host package in /bin instead of /usr/bin - we
install everything under /usr (until /usr will be removed, soon)]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-23 00:49:13 +02:00
|
|
|
--disable-rpath \
|
|
|
|
--enable-symlink-install
|
2009-10-29 21:35:33 +01:00
|
|
|
|
2016-05-18 21:08:23 +02:00
|
|
|
ifeq ($(BR2_PACKAGE_E2FSPROGS_FUSE2FS),y)
|
|
|
|
E2FSPROGS_CONF_OPTS += --enable-fuse2fs
|
|
|
|
E2FSPROGS_DEPENDENCIES += libfuse
|
|
|
|
else
|
|
|
|
E2FSPROGS_CONF_OPTS += --disable-fuse2fs
|
|
|
|
endif
|
|
|
|
|
2014-02-20 22:59:37 +01:00
|
|
|
ifeq ($(BR2_nios2),y)
|
|
|
|
E2FSPROGS_CONF_ENV += ac_cv_func_fallocate=no
|
|
|
|
endif
|
|
|
|
|
2016-06-03 14:19:50 +02:00
|
|
|
# Some programs are built for the host, but use definitions guessed by
|
|
|
|
# the configure script (i.e with the cross-compiler). Help them by
|
|
|
|
# saying that <sys/stat.h> is available on the host, which is needed
|
|
|
|
# for util/subst.c to build properly.
|
|
|
|
E2FSPROGS_CONF_ENV += BUILD_CFLAGS="-DHAVE_SYS_STAT_H"
|
|
|
|
|
2016-11-17 00:26:01 +01:00
|
|
|
# Disable use of the host magic.h, as on older hosts (e.g. RHEL 5)
|
|
|
|
# it doesn't provide definitions expected by e2fsprogs support lib.
|
|
|
|
HOST_E2FSPROGS_CONF_ENV += \
|
|
|
|
ac_cv_header_magic_h=no \
|
|
|
|
ac_cv_lib_magic_magic_file=no
|
|
|
|
|
2014-11-19 15:04:50 +01:00
|
|
|
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
|
|
|
|
# util-linux libuuid pulls in libintl if needed, so ensure we also
|
|
|
|
# link against it, otherwise static linking fails
|
|
|
|
E2FSPROGS_CONF_ENV += LIBS=-lintl
|
|
|
|
endif
|
|
|
|
|
2016-11-18 16:24:26 +01:00
|
|
|
E2FSPROGS_MAKE_OPTS = LDCONFIG=true
|
2016-12-12 10:19:38 +01:00
|
|
|
E2FSPROGS_INSTALL_STAGING_OPTS = \
|
|
|
|
DESTDIR=$(STAGING_DIR) \
|
|
|
|
LDCONFIG=true \
|
|
|
|
install-libs
|
|
|
|
E2FSPROGS_INSTALL_TARGET_OPTS = \
|
|
|
|
DESTDIR=$(TARGET_DIR) \
|
|
|
|
LDCONFIG=true \
|
|
|
|
install
|
2009-10-29 21:35:33 +01:00
|
|
|
|
2010-03-02 22:33:55 +01:00
|
|
|
define HOST_E2FSPROGS_INSTALL_CMDS
|
2014-10-23 10:43:37 +02:00
|
|
|
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
|
2010-03-02 22:33:55 +01:00
|
|
|
endef
|
|
|
|
|
2012-07-03 00:07:32 +02:00
|
|
|
$(eval $(autotools-package))
|
2012-07-03 00:06:54 +02:00
|
|
|
$(eval $(host-autotools-package))
|