NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ff3e2d69a9
kumquat-buildroot/package/e2fsprogs/e2fsprogs.mk

152 lines
5.2 KiB
Makefile
Raw Normal View History

Normalize separator size to 80 Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 01:53:30 +02:00
################################################################################
remove 'mke2fs' and instead add the properly named 'e2fsprogs'
2005-02-11 21:42:52 +01:00
#
# e2fsprogs
#
Normalize separator size to 80 Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 01:53:30 +02:00
################################################################################
e2fsprogs: convert to Makefile.autotools.in format and update Kconfig Closes #667. I have updated the e2fsprogs package to the new makefile format. I added the tools from the 1.41.9 release of e2fsprogs that could not yet be (de)selected (freefrag, e2undo) to the menu in Config.in. Signed-off-by: rvpaasen <rvpaasen@t3i.nl> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-29 21:35:33 +01:00
e2fsprogs: bump to version 1.42.13 Includes the security patch so drop it. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-05-27 00:30:58 +02:00
E2FSPROGS_VERSION = 1.42.13
e2fsprogs: change tarball compression to xz Also update hash file Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-03 09:41:11 +01:00
E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
e2fsprogs: switch site and add hash For some reason the kernel.org download hash doesn't match the sourceforge hash so switch to kernel.org for the download. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-09-17 16:20:09 +02:00
E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
e2fsprogs: add license info Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-13 02:05:41 +01:00
E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause
E2FSPROGS_LICENSE_FILES = COPYING lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h
e2fsprogs: Install libraries to staging Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se> Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-28 18:53:57 +01:00
E2FSPROGS_INSTALL_STAGING = YES
packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_INSTALL_STAGING_OPT. Sed command used: find * -type f | xargs sed -i 's#_INSTALL_STAGING_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:41 +02:00
E2FSPROGS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-libs
e2fsprogs: convert to Makefile.autotools.in format and update Kconfig Closes #667. I have updated the e2fsprogs package to the new makefile format. I added the tools from the 1.41.9 release of e2fsprogs that could not yet be (de)selected (freefrag, e2undo) to the menu in Config.in. Signed-off-by: rvpaasen <rvpaasen@t3i.nl> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-29 21:35:33 +01:00
e2fsprogs: disable e4defrag in host variant e4defrag from e2fsprogs 1.42.13 encounters these build errors on RHEL5.8 hosts: e4defrag.c:197:2: error: #error sync_file_range not available! e4defrag.c:201:2: error: #error fallocate64 not available! It's possible to fix these problems, but we don't use it on the host anyway, so just disable it. Signed-off-by: Hollis Blanchard <hollis_blanchard@mentor.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
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.
HOST_E2FSPROGS_CONF_OPTS += --disable-defrag
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
E2FSPROGS_CONF_OPTS = \
Rename BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS Since a while, the semantic of BR2_PREFER_STATIC_LIB has been changed from "prefer static libraries when possible" to "use only static libraries". The former semantic didn't make much sense, since the user had absolutely no control/idea of which package would use static libraries, and which packages would not. Therefore, for quite some time, we have been starting to enforce that BR2_PREFER_STATIC_LIB should really build everything with static libraries. As a consequence, this patch renames BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS, and adjust the Config.in option accordingly. This also helps preparing the addition of other options to select shared, shared+static or just static. Note that we have verified that this commit can be reproduced by simply doing a global rename of BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS plus adding BR2_PREFER_STATIC_LIB to Config.in.legacy. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
2014-12-03 22:41:29 +01:00
$(if $(BR2_STATIC_LIBS),,--enable-elf-shlibs) \
e2fsprogs: add options for debugfs/e2image/resize2fs utilities Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-28 15:04:09 +02:00
$(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \
$(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \
e2fsprogs: disable build of e4defrag unless explicitly enabled The e2fsprogs configure script enables the build of the e4defrag utility by default. Disable it unless BR2_PACKAGE_E2FSPROGS_E4DEFRAG is selected. Also the --disable-blkid option is not recognized by the configure script. Use --disable-libblkid instead. Signed-off-by: Sven Neumann <s.neumann@raumfeld.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-28 12:22:33 +01:00
$(if $(BR2_PACKAGE_E2FSPROGS_E4DEFRAG),,--disable-defrag) \
e2fsprogs: add options for debugfs/e2image/resize2fs utilities Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-28 15:04:09 +02:00
$(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),,--disable-resizer) \
e2fsprogs: drop uuidd option e2fsprogs uuidd no longer builds with libuuid from util-linux 2.20, and according to tytso the util-linux version should be used instead when using libuuid from there, so drop the e2fsprogs option. Reported-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-06 09:12:51 +02:00
--disable-uuidd \
e2fsprogs: disable build of e4defrag unless explicitly enabled The e2fsprogs configure script enables the build of the e4defrag utility by default. Disable it unless BR2_PACKAGE_E2FSPROGS_E4DEFRAG is selected. Also the --disable-blkid option is not recognized by the configure script. Use --disable-libblkid instead. Signed-off-by: Sven Neumann <s.neumann@raumfeld.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-28 12:22:33 +01:00
--disable-libblkid \
package: use libuuid from util-linux And adjust users. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-29 08:49:48 +02:00
--disable-libuuid \
e2fsprogs: convert to Makefile.autotools.in format and update Kconfig Closes #667. I have updated the e2fsprogs package to the new makefile format. I added the tools from the 1.41.9 release of e2fsprogs that could not yet be (de)selected (freefrag, e2undo) to the menu in Config.in. Signed-off-by: rvpaasen <rvpaasen@t3i.nl> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-29 21:35:33 +01:00
--enable-fsck \
--disable-e2initrd-helper \
e2fsprogs: bump to version 1.42.10 Drop --disable-tls since it's not needed. Add --disable-rpath to avoid unnecessary pollution. e4defrag now needs an (e)glibc or musl toolchain because of sync_file_range() See e2fsprogs commit 58229aaf85d435469e901c974f31ead6d9124166 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-04 01:15:56 +02:00
--disable-testio-debug \
--disable-rpath
e2fsprogs: convert to Makefile.autotools.in format and update Kconfig Closes #667. I have updated the e2fsprogs package to the new makefile format. I added the tools from the 1.41.9 release of e2fsprogs that could not yet be (de)selected (freefrag, e2undo) to the menu in Config.in. Signed-off-by: rvpaasen <rvpaasen@t3i.nl> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-29 21:35:33 +01:00
e2fsprogs: fix missing fallocate64() on nios2 (external) nios2 toolchain is currently missing the fallocate64 system call. Because of compiling the e2fsprogs package with _FILE_OFFSET_BITS=64, _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE the fallocate call is replaced by fallocate64 by the glibc. Therefore fallocate is entirely disabled while configuring the package. Fixes http://autobuild.buildroot.org/results/70a/70a47bd7392560cbc1c64769c8357c0b4c91ca3b/ Signed-off-by: Frank Bergmann <frank@frajasalo.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-20 22:59:37 +01:00
ifeq ($(BR2_nios2),y)
E2FSPROGS_CONF_ENV += ac_cv_func_fallocate=no
endif
e2fsprogs: fix static linking issues with libintl Util-linux (and hence libuuid) links against libintl if BR2_NEEDS_GETTEXT_IF_LOCALE, so e2fsprogs needs to link against it as when when statically linking, otherwise the configure test for libuuid (and later linking) fails. Fixes: http://autobuild.buildroot.net/results/833/8338a03028de9502be506a80bd947d80b3e50a49/ http://autobuild.buildroot.net/results/361/361aa2e47a7561ff6624829bdfcfe66ecaddc4a6/ http://autobuild.buildroot.net/results/4dc/4dc157bb9cd2e86b9b88ff9c1b66468fa930ede4/ http://autobuild.buildroot.net/results/ebf/ebf02964de98f82e7d5509c68cbfacdb5bc6f87e/ And many more. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
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
packages: switch to host-pkgconf Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-22 17:47:52 +02:00
E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
e2fsprogs: configure needs pkg-config Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-28 15:45:02 +02:00
packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS While the autotools infrastructure was using FOO_MAKE_OPT, generic packages were typically using FOO_MAKE_OPTS. This inconsistency becomes a problem when a new infrastructure is introduced that wants to make use of FOO_MAKE_OPT(S), and can live alongside either generic-package or autotools-package. The new infrastructure will have to choose between either OPT or OPTS, and thus rule out transparent usage by respectively generic packages or generic packages. An example of such an infrastructure is kconfig-package, which provides kconfig-related make targets. The OPTS variant is more logical, as there are typically multiple options. This patch renames all occurrences of FOO_MAKE_OPT in FOO_MAKE_OPTS. Sed command used: find * -type f | xargs sed -i 's#_MAKE_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:38 +02:00
E2FSPROGS_MAKE_OPTS = \
e2fsprogs: convert to Makefile.autotools.in format and update Kconfig Closes #667. I have updated the e2fsprogs package to the new makefile format. I added the tools from the 1.41.9 release of e2fsprogs that could not yet be (de)selected (freefrag, e2undo) to the menu in Config.in. Signed-off-by: rvpaasen <rvpaasen@t3i.nl> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-29 21:35:33 +01:00
LDCONFIG=true
e2fsprogs: add support for host package Host package is needed to get libuuid installed for the host, needed to build the mtd utils for the host. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-03-02 22:33:55 +01:00
define HOST_E2FSPROGS_INSTALL_CMDS
package: indentation cleanup Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-23 10:43:37 +02:00
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
e2fsprogs: add support for host package Host package is needed to get libuuid installed for the host, needed to build the mtd utils for the host. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-03-02 22:33:55 +01:00
endef
e2fsprogs: unbreak host build after auto-host-deps change Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-01-18 10:55:36 +01:00
# we don't have a host-util-linux
packages: switch to host-pkgconf Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-22 17:47:52 +02:00
HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf
e2fsprogs: add support for host package Host package is needed to get libuuid installed for the host, needed to build the mtd utils for the host. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-03-02 22:33:55 +01:00
e2fsprogs: convert to Makefile.autotools.in format and update Kconfig Closes #667. I have updated the e2fsprogs package to the new makefile format. I added the tools from the 1.41.9 release of e2fsprogs that could not yet be (de)selected (freefrag, e2undo) to the menu in Config.in. Signed-off-by: rvpaasen <rvpaasen@t3i.nl> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-29 21:35:33 +01:00
# binaries to keep or remove
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += usr/sbin/badblocks
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_CHATTR) += usr/bin/chattr
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_DUMPE2FS) += usr/sbin/dumpe2fs
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FREEFRAG) += usr/sbin/e2freefrag
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FSCK) += usr/sbin/e2fsck
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2LABEL) += usr/sbin/e2label
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2UNDO) += usr/sbin/e2undo
e2fsprogs: bump to version 1.42 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-01-26 17:51:29 +01:00
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E4DEFRAG) += usr/sbin/e4defrag
e2fsprogs: convert to Makefile.autotools.in format and update Kconfig Closes #667. I have updated the e2fsprogs package to the new makefile format. I added the tools from the 1.41.9 release of e2fsprogs that could not yet be (de)selected (freefrag, e2undo) to the menu in Config.in. Signed-off-by: rvpaasen <rvpaasen@t3i.nl> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-29 21:35:33 +01:00
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FILEFRAG) += usr/sbin/filefrag
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FSCK) += usr/sbin/fsck
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LOGSAVE) += usr/sbin/logsave
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LSATTR) += usr/bin/lsattr
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_MKE2FS) += usr/sbin/mke2fs
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND) += usr/sbin/mklost+found
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UUIDGEN) += usr/bin/uuidgen
# files to remove
E2FSPROGS_TXTTARGETS_ = \
usr/sbin/mkfs.ext[234] \
usr/sbin/mkfs.ext4dev \
usr/sbin/fsck.ext[234] \
usr/sbin/fsck.ext4dev \
usr/sbin/findfs \
usr/sbin/tune2fs
e2fsprogs: convert old-style hooks to new-style hook Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 22:52:48 +02:00
define E2FSPROGS_TARGET_REMOVE_UNNEEDED
e2fsprogs: convert to Makefile.autotools.in format and update Kconfig Closes #667. I have updated the e2fsprogs package to the new makefile format. I added the tools from the 1.41.9 release of e2fsprogs that could not yet be (de)selected (freefrag, e2undo) to the menu in Config.in. Signed-off-by: rvpaasen <rvpaasen@t3i.nl> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-29 21:35:33 +01:00
rm -f $(addprefix $(TARGET_DIR)/, $(E2FSPROGS_BINTARGETS_))
rm -f $(addprefix $(TARGET_DIR)/, $(E2FSPROGS_TXTTARGETS_))
e2fsprogs: convert old-style hooks to new-style hook Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 22:52:48 +02:00
endef
E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_REMOVE_UNNEEDED
define E2FSPROGS_TARGET_MKE2FS_SYMLINKS
ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext2
ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext3
ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext4
ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext4dev
endef
package/: get rid of unneeded $(strip ..)
2008-12-08 09:15:27 +01:00
ifeq ($(BR2_PACKAGE_E2FSPROGS_MKE2FS),y)
e2fsprogs: convert old-style hooks to new-style hook Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 22:52:48 +02:00
E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_MKE2FS_SYMLINKS
Allow selection of e2fsprogs to install in the target
2008-02-25 00:02:56 +01:00
endif
e2fsprogs: convert old-style hooks to new-style hook Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 22:52:48 +02:00
define E2FSPROGS_TARGET_E2FSCK_SYMLINKS
ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext2
ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext3
ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext4
ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext4dev
endef
package/: get rid of unneeded $(strip ..)
2008-12-08 09:15:27 +01:00
ifeq ($(BR2_PACKAGE_E2FSPROGS_E2FSCK),y)
e2fsprogs: convert old-style hooks to new-style hook Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 22:52:48 +02:00
E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_E2FSCK_SYMLINKS
Allow selection of e2fsprogs to install in the target
2008-02-25 00:02:56 +01:00
endif
e2fsprogs: convert old-style hooks to new-style hook Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 22:52:48 +02:00
e2fsprogs: remove busybox tune2fs when installing full version Currently, busybox installs a version of tune2fs in /sbin/ while e2fsprogs installs at /usr/sbin/. This causes issues if a user is expecting the to use the full version from a prompt via 'tune2fs' since busybox's tune2fs will be found first from the default path search. Fix this by removing the busybox version of tune2fs when a user has selected the option to install tune2fs from e2fsprogs. [Thomas: don't hijack E2FSPROGS_TARGET_TUNE2FS_SYMLINK for the removal and instead introduce a separate E2FSPROGS_REMOVE_BUSYBOX_APPLETS post install target hook, and do related code re-organization.] Signed-off-by: Ryan Barnett <ryan.barnett@rockwellcollins.com> Reviewed-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-08 23:51:00 +02:00
# Remove busybox tune2fs and e2label, since we want the e2fsprogs full
# blown variants to take precedence, but they are not installed in the
# same location.
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
E2FSPROGS_DEPENDENCIES += busybox
define E2FSPROGS_REMOVE_BUSYBOX_APPLETS
e2fsprogs: remove more busybox applet links Following commit aa02829240b2 (e2fsprogs: remove busybox tune2fs when installing full version, 2015-07-08), remove the rest of Busybox e2fsprogs applet links. All of them are installed in different locations than upstream e2fsprogs. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-22 18:29:16 +02:00
$(RM) -f $(TARGET_DIR)/bin/chattr
$(RM) -f $(TARGET_DIR)/bin/lsattr
$(RM) -f $(TARGET_DIR)/sbin/fsck
e2fsprogs: remove busybox tune2fs when installing full version Currently, busybox installs a version of tune2fs in /sbin/ while e2fsprogs installs at /usr/sbin/. This causes issues if a user is expecting the to use the full version from a prompt via 'tune2fs' since busybox's tune2fs will be found first from the default path search. Fix this by removing the busybox version of tune2fs when a user has selected the option to install tune2fs from e2fsprogs. [Thomas: don't hijack E2FSPROGS_TARGET_TUNE2FS_SYMLINK for the removal and instead introduce a separate E2FSPROGS_REMOVE_BUSYBOX_APPLETS post install target hook, and do related code re-organization.] Signed-off-by: Ryan Barnett <ryan.barnett@rockwellcollins.com> Reviewed-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-08 23:51:00 +02:00
$(RM) -f $(TARGET_DIR)/sbin/tune2fs
$(RM) -f $(TARGET_DIR)/sbin/e2label
endef
E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_REMOVE_BUSYBOX_APPLETS
endif
e2fsprogs: convert old-style hooks to new-style hook Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 22:52:48 +02:00
define E2FSPROGS_TARGET_TUNE2FS_SYMLINK
ln -sf e2label $(TARGET_DIR)/usr/sbin/tune2fs
endef
package/: get rid of unneeded $(strip ..)
2008-12-08 09:15:27 +01:00
ifeq ($(BR2_PACKAGE_E2FSPROGS_TUNE2FS),y)
e2fsprogs: convert old-style hooks to new-style hook Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 22:52:48 +02:00
E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_TUNE2FS_SYMLINK
Allow selection of e2fsprogs to install in the target
2008-02-25 00:02:56 +01:00
endif
e2fsprogs: convert old-style hooks to new-style hook Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 22:52:48 +02:00
define E2FSPROGS_TARGET_FINDFS_SYMLINK
ln -sf e2label $(TARGET_DIR)/usr/sbin/findfs
endef
package/: get rid of unneeded $(strip ..)
2008-12-08 09:15:27 +01:00
ifeq ($(BR2_PACKAGE_E2FSPROGS_FINDFS),y)
e2fsprogs: convert old-style hooks to new-style hook Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 22:52:48 +02:00
E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FINDFS_SYMLINK
Install uuid.h into staging as some other apps like xfsprogs need it [Peter: cleanup, only install header if libuuid is installed] Signed-off-by: Nigel Kukard <nkukard@lbsd.net> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-21 08:18:32 +01:00
endif
e2fsprogs: convert old-style hooks to new-style hook Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 22:52:48 +02:00
package/e2fsprogs: make /sbin/fsck available systemd looks for fsck in /sbin, so make symlink: /sbin/fsck -> /usr/sbin/fsck [Thomas: add comment.] Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com> Reviewed-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-01-19 17:14:08 +01:00
# 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
all packages: rename XXXTARGETS to xxx-package Also remove the redundant $(call ...). This is a purely mechanical change, performed with find package linux toolchain boot -name \*.mk | \ xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \ -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \ -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-03 00:07:32 +02:00
$(eval $(autotools-package))
all packages: use new host-xxx-package macros This is a purely mechanical change, performed with find package linux toolchain boot -name \*.mk | \ xargs sed -i -e 's/$(eval $(call GENTARGETS,host))/$(eval $(host-generic-package))/' \ -e 's/$(eval $(call AUTOTARGETS,host))/$(eval $(host-autotools-package))/' \ -e 's/$(eval $(call CMAKETARGETS,host))/$(eval $(host-cmake-package))/' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-03 00:06:54 +02:00
$(eval $(host-autotools-package))
Reference in New Issue Copy Permalink