Commit Graph

93 Commits

Author SHA1 Message Date
Sonic Zhang
b7cac3e86e e2fsprogs: rename the first patch to match the naming policy
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-25 12:41:59 +01:00
Thomas De Schampheleire
35eaed8d07 Config.in files: use if/endif instead of 'depends on' for main symbol
In the Config.in file of package foo, it often happens that there are other
symbols besides BR2_PACKAGE_FOO. Typically, these symbols only make sense
when foo itself is enabled. There are two ways to express this: with
    depends on BR2_PACKAGE_FOO
in each extra symbol, or with
    if BR2_PACKAGE_FOO
        ...
    endif
around the entire set of extra symbols.

The if/endif approach avoids the repetition of 'depends on' statements on
multiple symbols, so this is clearly preferred. But even when there is only
one extra symbol, if/endif is a more logical choice:
- it is future-proof for when extra symbols are added
- it allows to have just one strategy instead of two (less confusion)

This patch modifies the Config.in files accordingly.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-25 12:21:39 +01:00
Sonic Zhang
efc35794c8 e2fsprogs: Disable elf shared library when BR2_PREFER_STATIC_LIB is selected.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-25 10:06:53 +01:00
Simon Dawson
f0c5c85215 e2fsprogs: disable e4defrag on avr32
The fallocate syscall is not available on avr32. This is needed by the e4defrag
utility, so we disable this on avr32.

Fixes build failures such as the following.

  http://autobuild.buildroot.net/results/dcb/dcb4e5c6981a9299a2eb18e325d4de621846afdb/

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-18 10:03:37 +01:00
Thomas De Schampheleire
bed4e27868 Config.in files: whitespace cleanup
This patch fixes the following whitespace problems in Config.in files:
- trailing whitespace
- spaces instead of tabs for indentation
- help text not indented with tab + 2 spaces

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-11 22:19:30 +01:00
Thomas De Schampheleire
66bb10b7b0 Config.in files: unify comments of toolchain option dependencies
This patch lines up the comments in Config.in files that clarify which
toolchain options the package depends on.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-14 22:45:57 +02:00
Gustavo Zacarias
65012b3b1e e2fsprogs: bump to version 1.42.8
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-30 21:29:59 +02:00
Alexandre Belloni
8dfd59d114 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 22:30:24 +02:00
Yann E. MORIN
69036c20f1 fs/ext2: add ability to build ext3/4 too
Use the host-e2fsprogs to tune2fs the generated rootfs.ext2 image,
and upgrade it to either one of ext2, ext3 or ext4.

Since calling tune2fs may require running e2fsck (tune2fs will warn
to do so when certain FS options are changed), we systematically call
e2fsck. This makes the code path simpler, and as a side-effect checks
that genext2fs did not generate garbage.

In turn, e2fsck will unconditionally add a UUID to the filesystem,
which is bad for reproducibility, so we call tune2fs again to remove
the UUID. This does not require checking the filesystem.

To ensure compatibility of Buildroot's .config, leave ext2 as the
default. Boards' .config can override this at will.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-12 14:39:24 +02:00
Yann E. MORIN
59d1fe58fa package/e2fsprogs: add host-package selection
Add the e2fsprogs as a host-package selection in the menuconfig.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-03-18 23:01:32 +01:00
Gustavo Zacarias
f375feb74a e2fsprogs: bump to version 1.42.7
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-25 19:56:00 +01:00
Arnout Vandecappelle (Essensium/Mind)
342d54e9a5 e2fsprogs: add license info
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-14 22:33:01 +01:00
Gustavo Zacarias
019a581f89 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-29 22:02:55 +01:00
Gustavo Zacarias
18bd242da0 e2fsprogs: bump to version 1.42.6
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-15 13:53:49 +02:00
Peter Korsgaard
7a7e03400c e2fsprogs: fix download URL
It is /v$VERSION, not just /$VERSION.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-03 22:37:27 +02:00
Peter Korsgaard
32a0454d3c Merge branch 'next'
Conflicts:
	package/e2fsprogs/e2fsprogs.mk
	package/libfuse/libfuse.mk
	package/multimedia/mpd/mpd.mk
	package/smartmontools/smartmontools.mk

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-09-03 21:59:03 +02:00
Stefan Fröberg
23ef45ca1e remove rest of the BR2_SOURCEFORGE_MIRROR references
Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-28 22:59:52 +02:00
Gustavo Zacarias
53824c97d3 e2fsprogs: bump to version 1.42.5
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-12 18:32:28 +02:00
Arnout Vandecappelle (Essensium/Mind)
e1502ebc0c 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-17 20:23:05 +02:00
Arnout Vandecappelle (Essensium/Mind)
69e64c42b7 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-17 20:18:03 +02:00
Yegor Yefremov
b5addce818 e2fsprogs: bump to 1.42.4
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-06-16 22:17:48 +02:00
Yegor Yefremov
4544589e7c e2fsprogs: bump to 1.42.3
remove e2fsprogs-add-missing-dep-of-tst_uuid-o.patch as
the changes are already upstream

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-05-21 10:32:31 +02:00
Gustavo Zacarias
2e59d1d7ed e2fsprogs: bump to version 1.42.2
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-04-03 23:27:02 +02:00
Gustavo Zacarias
b4f650feb2 e2fsprogs: bump to version 1.42.1
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-03-19 13:33:31 +01:00
Sven Neumann
e825561895 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 20:52:06 +01:00
Gustavo Zacarias
f8a117435a 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 22:24:11 +01:00
Peter Korsgaard
9e7663e299 e2fsprogs: unbreak host build after auto-host-deps change
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-01-18 16:02:55 +01:00
Thomas Petazzoni
300f9c9c9d package: remove useless arguments from AUTOTARGETS
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
AUTOTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-29 23:12:27 +02:00
Peter Korsgaard
044edd0637 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:27:39 +02:00
Peter Korsgaard
952d96d5ae util-linux: drop BR2_PACKAGE_BUSYBOX_SHOW_OTHERS dependency
Drop the dependency as it isn't really nice that other packages need
to select it, and kconf complains about it:

warning: (BR2_PACKAGE_E2FSPROGS && BR2_PACKAGE_USBMOUNT) selects
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS which has unmet direct dependencies
 (!BR2_PACKAGE_BUSYBOX)

Instead ensure that only the libraries are built by default, so
busybox applets are still used unless explicitly configured.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-29 08:53:55 +02:00
Peter Korsgaard
e1fbd63f3c 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
Peter Korsgaard
1af183e95b e2fsprogs: ensure util-linux is built before e2fsprogs
For libblkid.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-28 23:26:29 +02:00
Peter Korsgaard
e1ffc2f791 e2fsprogs: use libblkid / blkid from util-linux
e2fsprogs and util-linux both provide blkid / libblkid causing conflicts
if both are enabled. The preferred upstream (E.G. what is used by Debian)
is util-linux, so remove the options from e2fsprogs and make it use the
util-linux version instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-28 17:58:50 +02:00
Peter Korsgaard
c2b730f447 e2fsprogs: configure needs pkg-config
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-28 15:45:02 +02:00
Peter Korsgaard
5d7cac5eb2 e2fsprogs: add options for debugfs/e2image/resize2fs utilities
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-28 15:35:55 +02:00
Peter Korsgaard
f94057d89d e2fsprogs: don't build uuidd if not requested
Rather than not installing it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-28 15:05:09 +02:00
Peter Korsgaard
bf10224167 e2fsprogs: simplify Config.in
No need for 'depends on' for all individual options when they already
are in a conditional section.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-28 14:42:39 +02:00
Arnout Vandecappelle (Essensium/Mind)
0af4136c54 e2fsprogs: Add missing dependency of tst_uuid.o on uuid.h
The missing dependency used to break parallel builds.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-07-25 00:22:28 +02:00
Gustavo Zacarias
8d3e6abc6b e2fsprogs: bump to 1.41.14 and fixup
Bump e2fsprogs to version 1.41.14

Also export libblkid properly for util-linux to use.

[Peter: install pkg-config files]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-09 22:40:44 +01:00
Thomas Petazzoni
cfe2c192d1 e2fsprogs: convert old-style hooks to new-style hook
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-12 19:26:49 +02:00
H Hartley Sweeten
049cf426e3 e2fsprogs: bump version
Version 1.41.12 was released May 18, 2010.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-08 10:19:58 +02:00
Thomas Petazzoni
e7cf05aebe 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-04-09 11:03:55 +02:00
Gustavo Zacarias
801f22b356 e2fsprogs: bump version
Closes #1423

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-03-31 11:02:34 +02:00
Peter Korsgaard
a96be19bc3 package: remove redundant DISABLE_{IPV6,NLS,LARGEFILE} configure args
Makefile.autotools.in automatically adds these to the configure invocation,
so there's no need to explicitly list them.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-03-22 14:29:00 +01:00
Peter Korsgaard
73f244d594 e2fsprogs: fix build when no binaries/libs are selected
Reported by "Thomas".

Strip fails as it gets called without any arguments. Instead of working
around this, simply remove the package-specific stripping as it is
done later (in target-finalize) anyway.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-03-07 23:00:06 +01:00
Richard van Paasen
598334166d e2fsprogs: fix lsattr chattr and e2label e2undo mixup
In Config.in lsattr/chattr and e2label/e2undo are mixed up.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-02-23 21:06:47 +01:00
Nigel Kukard
1752420807 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 10:00:40 +01:00
rvpaasen
69ec17cd8d 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
Daniel Mack
44b5637ab2 e2fsprogs: add a patch to link against SEM_INIT libs
This patch is needed to make e2fsprogs being linked against
SEM_INIT libraries. In this particular case, it causes the
Makefiles to add -lpthread. Without that, all binaries crash
at startup, at least on x86.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-07 15:31:11 +02:00
Daniel Mack
0b7ec8ea32 e2fsprogs: bump version number to 1.41.9
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-07 15:31:09 +02:00