[e2fsprogs] reworked dependencys

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9871 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 160 insertions, 164 deletions

diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in
index 826c549c1..c583d7e4d 100644
--- a/rules/e2fsprogs.in
+++ b/rules/e2fsprogs.in
@@ -4,7 +4,6 @@ menuconfig E2FSPROGS
 	tristate
 	prompt "e2fsprogs                     "
 	select HOST_GETTEXT
-	select E2FSPROGS_LIBS if (!E2FSPROGS_LIBUUID && !E2FSPROGS_LIBBLKID)
 	help
 	 The e2fsprogs package provides the filesystem utilities for use
 	 with the ext2 filesystem. It also supports the ext3 filesystem
@@ -22,12 +21,6 @@ config E2FSPROGS_COMPRESSION
 	help
 	  Enable experimental compression support.
 
-config E2FSPROGS_HTREE
-	bool
-	prompt "htree"
-	help
-	  Enable experimental htree support.
-
 config E2FSPROGS_IMAGER
 	bool
 	# no prompt
@@ -48,23 +41,47 @@ endmenu
 menu "libraries                     "
 # -----------------------------------
 
-config E2FSPROGS_LIBS
+config E2FSPROGS_LIBBLKID
 	bool
-	prompt "e2fsprogs support libraries"
+	prompt "libblkid"
+	select E2FSPROGS_LIBUUID
 	help
-	  Install the e2fsprogs default libraries.
+	  Install libblkid.
 
-config E2FSPROGS_LIBUUID
+config E2FSPROGS_LIBCOM_ERR
 	bool
-	prompt "libuuid"
+	prompt "libcom_err"
 	help
-	  Install libuuid.
+	  Install libcom_err.
 
-config E2FSPROGS_LIBBLKID
+config E2FSPROGS_LIBE2P
 	bool
-	prompt "libblkid"
+	prompt "libe2p"
 	help
-	  Install libblkid.
+	  Install libe2p.
+
+config E2FSPROGS_LIBEXT2FS
+	bool
+	prompt "libext2fs"
+	select E2FSPROGS_LIBCOM_ERR
+	select LIBC_PTHREAD
+	help
+	  Install libext2fs.
+
+config E2FSPROGS_LIBSS
+	bool
+	prompt "libss"
+	select E2FSPROGS_LIBCOM_ERR
+	select LIBC_DL
+	select LIBC_PTHREAD
+	help
+	  Install libss.
+
+config E2FSPROGS_LIBUUID
+	bool
+	prompt "libuuid"
+	help
+	  Install libuuid.
 
 endmenu
 
@@ -72,247 +89,226 @@ endmenu
 menu "binaries                      "
 # -----------------------------------
 
+config E2FSPROGS_INSTALL_CHATTR
+	bool
+	select E2FSPROGS_LIBCOMM_ERR
+	select E2FSPROGS_LIBE2P
+	prompt "chattr"
+	help
+	  Enable support for chattr program.
+
 config E2FSPROGS_INSTALL_LSATTR
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
+	select E2FSPROGS_LIBCOMM_ERR
+	select E2FSPROGS_LIBE2P
 	prompt "lsattr"
 	help
 	  Enable support for lsattr program.
 
 config E2FSPROGS_INSTALL_UUIDGEN
 	bool
-	select E2FSPROGS_LIBS
 	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
 	prompt "uuidgen"
 	help
 	  Enable support for uuidgen program.
 
-config E2FSPROGS_INSTALL_MK_CMDS
+# -----
+
+config E2FSPROGS_INSTALL_BADBLOCKS
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
-	prompt "mk_cmds"
+	select E2FSPROGS_LIBEXT2FS
+	select E2FSPROGS_LIBCOM_ERR
+	prompt "badblocks"
 	help
-	  Enable support for mk_cmds program.
+	  Enable support for badblocks program.
 
-config E2FSPROGS_INSTALL_CHATTR
+config E2FSPROGS_INSTALL_BLKID
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
 	select E2FSPROGS_LIBBLKID
-	prompt "chattr"
+	select E2FSPROGS_LIBCOM_ERR
+	select E2FSPROBS_LIBEXT2FS
+	select E2FSPROGS_LIBUUID
+	prompt "blkid"
 	help
-	  Enable support for chattr program.
+	  Enable support for blkid program.
 
-config E2FSPROGS_INSTALL_COMPILE_ET
+config E2FSPROGS_INSTALL_DUMPE2FS
 	bool
-	select E2FSPROGS_LIBS
+	select E2FSPROGS_LIBCOM_ERR
+	select E2FSPROGS_LIBE2P
+	select E2FSPROGS_LIBEXT2FS
 	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
-	prompt "compile_et"
+	prompt "dumpe2fs"
 	help
-	  Enable support for compile_et program.
+	  Enable support for dumpe2fs program.
 
-# -----
 
-config E2FSPROGS_INSTALL_BLKID
-	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
-	prompt "blkid"
-	help
-	  Enable support for blkid program.
 
-config E2FSPROGS_INSTALL_MKFS_EXT4DEV
+config E2FSPROGS_INSTALL_E2FSCK
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
 	select E2FSPROGS_LIBBLKID
-	prompt "mkfs.ext4dev"
+	select E2FSPROGS_LIBCOM_ERR
+	select E2FSPROGS_LIBE2P
+	select E2FSPROGS_LIBEXT2FS
+	select E2FSPROGS_LIBUUID
+	prompt "e2fsck"
 	help
-	  Enable support for mkfs.ext4dev program.
+	  Enable support for e2fsck program.
 
-config E2FSPROGS_INSTALL_LOGSAVE
+config E2FSPROGS_INSTALL_FSCK_EXT2
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
-	prompt "logsave"
+	prompt "fsck.ext2"
+	select E2FSPROGS_INSTALL_E2FSCK
 	help
-	  Enable support for logsave program.
+	  Create link to fsck.ext2 program.
 
-config E2FSPROGS_INSTALL_MKFS_EXT3
+
+config E2FSPROGS_INSTALL_FSCK_EXT3
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
-	prompt "mkfs.ext3"
+	prompt "fsck.ext3"
+	select E2FSPROGS_INSTALL_E2FSCK
 	help
-	  Enable support for mkfs.ext3 program.
+	  Enable support for fsck.ext3 program.
 
 config E2FSPROGS_INSTALL_FSCK_EXT4
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
 	prompt "fsck.ext4"
+	select E2FSPROGS_INSTALL_E2FSCK
 	help
-	  Enable support for fsck.ext4 program.
+	  Create link to fsck.ext4 program.
 
-config E2FSPROGS_INSTALL_DUMPE2FS
+config E2FSPROGS_INSTALL_FSCK_EXT4DEV
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
-	prompt "dumpe2fs"
+	prompt "fsck.ext4dev"
+	select E2FSPROGS_INSTALL_E2FSCK
 	help
-	  Enable support for dumpe2fs program.
+	  Create link to fsck.ext4dev program.
 
-config E2FSPROGS_INSTALL_FINDFS
+
+
+config E2FSPROGS_INSTALL_E2IMAGE
+	bool
+	select E2FSPROGS_LIBCOM_ERR
+	select E2FSPROGS_LIBEXT2FS
+	prompt "e2image"
+	help
+	  Enable support for e2image program.
+
+
+config E2FSPROGS_INSTALL_E2LABEL
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
 	select E2FSPROGS_LIBBLKID
-	prompt "findfs"
+	select E2FSPROGS_LIBCOM_ERR
+	select E2FSPROGS_LIBE2P
+	select E2FSPROBS_LIBEXT2FS
+	select E2FSPROGS_LIBUUID
+	prompt "e2label"
 	help
-	  Enable support for findfs program.
+	  Enable support for e2label program.
+
+config E2FSPROGS_INSTALL_E2UNDO
+	bool
+	select E2FSPROGS_LIBCOM_ERR
+	select E2FSPROBS_LIBEXT2FS
+	prompt "e2undo"
+	help
+	  Enable support for e2undo program.
 
 config E2FSPROGS_INSTALL_FILEFRAG
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
 	prompt "filefrag"
 	help
 	  Enable support for filefrag program.
 
-config E2FSPROGS_INSTALL_MKE2FS
+config E2FSPROGS_INSTALL_FINDFS
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
 	select E2FSPROGS_LIBBLKID
-	prompt "mke2fs"
-	help
-	  Enable support for mke2fs program.
-
-config E2FSPROGS_INSTALL_MKLOSTANDFOUND
-	bool
-	select E2FSPROGS_LIBS
+	select E2FSPROGS_LIBCOM_ERR
+	select E2FSPROGS_LIBE2P
+	select E2FSPROBS_LIBEXT2FS
 	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
-	prompt "mklost+found"
+	prompt "findfs"
 	help
-	  Enable support for mklost+found program.
+	  Enable support for findfs program.
 
-config E2FSPROGS_INSTALL_FSCK_EXT4DEV
+config E2FSPROGS_INSTALL_LOGSAVE
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
-	prompt "fsck.ext4dev"
+	prompt "logsave"
 	help
-	  Enable support for fsck.ext4dev program.
+	  Enable support for logsave program.
 
-config E2FSPROGS_INSTALL_E2FSCK
+
+
+config E2FSPROGS_INSTALL_MKE2FS
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
 	select E2FSPROGS_LIBBLKID
-	prompt "e2fsck"
+	select E2FSPROGS_LIBCOM_ERR
+	select E2FSPROGS_LIBE2P
+	select E2FSPROBS_LIBEXT2FS
+	select E2FSPROGS_LIBUUID
+	prompt "mke2fs"
 	help
-	  Enable support for e2fsck program.
+	  Enable support for mke2fs program.
 
 config E2FSPROGS_INSTALL_MKFS_EXT2
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
 	prompt "mkfs.ext2"
+	select E2FSPROGS_INSTALL_MKE2FS
 	help
-	  Enable support for mkfs.ext2 program.
+	  Create link to mkfs.ext2 program.
 
-config E2FSPROGS_INSTALL_MKFS_EXT4
+config E2FSPROGS_INSTALL_MKFS_EXT3
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
-	prompt "mkfs.ext4"
+	prompt "mkfs.ext3"
+	select E2FSPROGS_INSTALL_MKE2FS
 	help
-	  Enable support for mkfs.ext4 program.
+	  Create link to mkfs.ext3 program.
 
-config E2FSPROGS_INSTALL_RESIZE2FS
+config E2FSPROGS_INSTALL_MKFS_EXT4
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
-	prompt "resize2fs"
+	prompt "mkfs.ext4"
+	select E2FSPROGS_INSTALL_MKE2FS
 	help
-	  Enable support for resize2fs program.
+	  Create link to mkfs.ext4 program.
 
-config E2FSPROGS_INSTALL_E2IMAGE
+config E2FSPROGS_INSTALL_MKFS_EXT4DEV
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
-	prompt "e2image"
+	prompt "mkfs.ext4dev"
+	select E2FSPROGS_INSTALL_MKE2FS
 	help
-	  Enable support for e2image program.
+	  Create link to mkfs.ext4dev program.
 
-config E2FSPROGS_INSTALL_TUNE2FS
-	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
-	prompt "tune2fs"
-	help
-	  Enable support for tune2fs program.
 
-config E2FSPROGS_INSTALL_E2UNDO
-	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
-	prompt "e2undo"
-	help
-	  Enable support for e2undo program.
 
-config E2FSPROGS_INSTALL_FSCK_EXT2
+config E2FSPROGS_INSTALL_MKLOSTANDFOUND
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
-	prompt "fsck.ext2"
+	prompt "mklost+found"
 	help
-	  Enable support for fsck.ext2 program.
+	  Enable support for mklost+found program.
 
-config E2FSPROGS_INSTALL_FSCK_EXT3
+config E2FSPROGS_INSTALL_RESIZE2FS
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
-	prompt "fsck.ext3"
+	select E2FSPROGS_LIBCOM_ERR
+	select E2FSPROGS_LIBE2P
+	select E2FSPROBS_LIBEXT2FS
+	prompt "resize2fs"
 	help
-	  Enable support for fsck.ext3 program.
+	  Enable support for resize2fs program.
 
-config E2FSPROGS_INSTALL_BADBLOCKS
+config E2FSPROGS_INSTALL_TUNE2FS
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
 	select E2FSPROGS_LIBBLKID
-	prompt "badblocks"
+	select E2FSPROGS_LIBCOM_ERR
+	select E2FSPROGS_LIBE2P
+	select E2FSPROBS_LIBEXT2FS
+	select E2FSPROGS_LIBUUID
+	prompt "tune2fs"
 	help
-	  Enable support for badblocks program.
+	  Enable support for tune2fs program.
 
-config E2FSPROGS_INSTALL_UUID
+config E2FSPROGS_INSTALL_UUIDD
 	bool
-	select E2FSPROGS_LIBS
-	select E2FSPROGS_LIBUUID
-	select E2FSPROGS_LIBBLKID
+	select E2FSPROGS_LIBUUIDD
 	prompt "uuid"
 	help
 	  Enable support for uuid program.