[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, 95 insertions, 72 deletions

diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index 511e3516e..18e8578fb 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -37,8 +37,6 @@ $(E2FSPROGS_SOURCE):
 # Prepare
 # ----------------------------------------------------------------------------
 
-e2fsprogs_prepare: $(STATEDIR)/e2fsprogs.prepare
-
 E2FSPROGS_PATH	:=  PATH=$(CROSS_PATH)
 E2FSPROGS_ENV 	:=  $(CROSS_ENV)
 
@@ -66,21 +64,25 @@ E2FSPROGS_AUTOCONF += --enable-compression
 else
 E2FSPROGS_AUTOCONF += --disable-compression
 endif
+
 ifdef PTXCONF_E2FSPROGS_HTREE
 E2FSPROGS_AUTOCONF += --enable-htree
 else
 E2FSPROGS_AUTOCONF += --disable-htree
 endif
+
 ifdef PTXCONF_E2FSPROGS_IMAGER
 E2FSPROGS_AUTOCONF += --enable-imager
 else
 E2FSPROGS_AUTOCONF += --disable-imager
 endif
+
 ifdef PTXCONF_E2FSPROGS_RESIZER
 E2FSPROGS_AUTOCONF += --enable-resizer
 else
 E2FSPROGS_AUTOCONF += --disable-resizer
 endif
+
 ifdef PTXCONF_E2FSPROGS_FSCK
 E2FSPROGS_AUTOCONF += --enable-fsck
 else
@@ -112,132 +114,153 @@ $(STATEDIR)/e2fsprogs.targetinstall:
 	@$(call install_fixup,e2fsprogs,DEPENDS,)
 	@$(call install_fixup,e2fsprogs,DESCRIPTION,missing)
 
-	#
-	# libraries
-	#
+#	#
+#	# libraries
+#	#
+
+ifdef PTXCONF_E2FSPROGS_LIBBLKID
+	@$(call install_copy, e2fsprogs, 0, 0, 0644, $(E2FSPROGS_DIR)/lib/libblkid.so.1.0, /usr/lib/libblkid.so.1.0)
+	@$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so.1)
+	@$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so)
+endif
 
-ifdef PTXCONF_E2FSPROGS_LIBS
+ifdef PTXCONF_E2FSPROGS_LIBCOM_ERR
 	@$(call install_copy, e2fsprogs, 0, 0, 0644, $(E2FSPROGS_DIR)/lib/libcom_err.so.2.1, /usr/lib/libcom_err.so.2.1)
 	@$(call install_link, e2fsprogs, libcom_err.so.2.1, /usr/lib/libcom_err.so.2)
 	@$(call install_link, e2fsprogs, libcom_err.so.2.1, /usr/lib/libcom_err.so)
+endif
 
+ifdef PTXCONF_E2FSPROGS_LIBE2P
 	@$(call install_copy, e2fsprogs, 0, 0, 0644, $(E2FSPROGS_DIR)/lib/libe2p.so.2.3, /usr/lib/libe2p.so.2.3)
 	@$(call install_link, e2fsprogs, libe2p.so.2.3, /usr/lib/libe2p.so.2)
 	@$(call install_link, e2fsprogs, libe2p.so.2.3, /usr/lib/libe2p.so)
+endif
 
+ifdef PTXCONF_E2FSPROGS_LIBEXT2FS
 	@$(call install_copy, e2fsprogs, 0, 0, 0644, $(E2FSPROGS_DIR)/lib/libext2fs.so.2.4, /usr/lib/libext2fs.so.2.4)
 	@$(call install_link, e2fsprogs, libext2fs.so.2.4, /usr/lib/libext2fs.so.2)
 	@$(call install_link, e2fsprogs, libext2fs.so.2.4, /usr/lib/libext2fs.so)
+endif
 
+ifdef PTXCONF_E2FSPROGS_LIBSS
 	@$(call install_copy, e2fsprogs, 0, 0, 0644, $(E2FSPROGS_DIR)/lib/libss.so.2.0, /usr/lib/libss.so.2.0)
 	@$(call install_link, e2fsprogs, libss.so.2.0, /usr/lib/libss.so.2)
 	@$(call install_link, e2fsprogs, libss.so.2.0, /usr/lib/libss.so)
 endif
 
-ifdef PTXCONF_E2FSPROGS_LIBBLKID
-	@$(call install_copy, e2fsprogs, 0, 0, 0644, $(E2FSPROGS_DIR)/lib/libblkid.so.1.0, /usr/lib/libblkid.so.1.0)
-	@$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so.1)
-	@$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so)
-endif
-
 ifdef PTXCONF_E2FSPROGS_LIBUUID
 	@$(call install_copy, e2fsprogs, 0, 0, 0644, $(E2FSPROGS_DIR)/lib/libuuid.so.1.2, /usr/lib/libuuid.so.1.2)
 	@$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so.1)
 	@$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so)
 endif
 
-	#
-	# binaries in /usr/bin
-	#
 
+#	#
+#	# binaries in /usr/bin
+#	#
+ifdef PTXCONF_E2FSPROGS_INSTALL_CHATTR
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/chattr)
+endif
 ifdef PTXCONF_E2FSPROGS_INSTALL_LSATTR
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/lsattr, /usr/bin/lsattr)
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/lsattr)
 endif
 ifdef PTXCONF_E2FSPROGS_INSTALL_UUIDGEN
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/uuidgen, /usr/bin/uuidgen)
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/uuidgen)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_MK_CMDS
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/lib/ss/mk_cmds, /usr/bin/mk_cmds)
+
+
+#	#
+#	# binaries in /usr/sbin
+#	#
+ifdef PTXCONF_E2FSPROGS_INSTALL_BADBLOCKS
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/badblocks)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_CHATTR
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/chattr, /usr/bin/chattr)
+
+ifdef PTXCONF_E2FSPROGS_INSTALL_BLKID
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/blkid)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_COMPILE_ET
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/lib/et/compile_et, /usr/bin/compile_et)
+
+ifdef PTXCONF_E2FSPROGS_INSTALL_DUMPE2FS
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/dumpe2fs)
 endif
 
-	#
-	# binaries in /usr/sbin
-	#
 
-ifdef PTXCONF_E2FSPROGS_INSTALL_BLKID
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/blkid, /usr/sbin/blkid)
-endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4DEV
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/mke2fs, /usr/sbin/mkfs.ext4dev)
+ifdef PTXCONF_E2FSPROGS_INSTALL_E2FSCK
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/e2fsck)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_LOGSAVE
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/logsave, /usr/sbin/logsave)
+ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT2
+	@$(call install_link, e2fsprogs, e2fsck, /usr/sbin/fsck.ext2)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT3
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/mke2fs, /usr/sbin/mkfs.ext3)
+ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT3
+	@$(call install_link, e2fsprogs, e2fsck, /usr/sbin/fsck.ext3)
 endif
 ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT4
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/e2fsck/e2fsck, /usr/sbin/fsck.ext4)
-endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_DUMPE2FS
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/dumpe2fs, /usr/sbin/dumpe2fs)
+	@$(call install_link, e2fsprogs, e2fsck, /usr/sbin/fsck.ext4)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_FINDFS
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/tune2fs, /usr/sbin/findfs)
+ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT4DEV
+	@$(call install_link, e2fsprogs, e2fsck, /usr/sbin/fsck.ext4dev)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_FILEFRAG
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/filefrag, /usr/sbin/filefrag)
+
+
+ifdef PTXCONF_E2FSPROGS_INSTALL_E2IMAGE
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/e2image)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_MKE2FS
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/mke2fs, /usr/sbin/mke2fs)
+
+ifdef PTXCONF_E2FSPROGS_INSTALL_E2LABEL
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/e2label)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_MKLOSTANDFOUND
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/mklost+found, /usr/sbin/mklost+found)
+
+ifdef PTXCONF_E2FSPROGS_INSTALL_E2UNDO
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/e2undo)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT4DEV
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/e2fsck/e2fsck, /usr/sbin/fsck.ext4dev)
+
+ifdef PTXCONF_E2FSPROGS_INSTALL_FILEFRAG
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/filefrag)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_E2FSCK
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/e2fsck/e2fsck, /usr/sbin/e2fsck)
+
+ifdef PTXCONF_E2FSPROGS_INSTALL_FINDFS
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/findfs)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT2
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/mke2fs, /usr/sbin/mkfs.ext2)
+
+ifdef PTXCONF_E2FSPROGS_INSTALL_LOGSAVE
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/logsave)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/mke2fs, /usr/sbin/mkfs.ext4)
+
+
+ifdef PTXCONF_E2FSPROGS_INSTALL_MKE2FS
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/mke2fs)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_RESIZE2FS
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/resize/resize2fs, /usr/sbin/resize2fs)
+ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT2
+	@$(call install_link, e2fsprogs, mke2fs, /usr/sbin/mkfs.ext2)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_E2IMAGE
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/e2image, /usr/sbin/e2image)
+ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT3
+	@$(call install_link, e2fsprogs, mke2fs, /usr/sbin/mkfs.ext3)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_TUNE2FS
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/tune2fs, /usr/sbin/tune2fs)
+ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4
+	@$(call install_link, e2fsprogs, mke2fs, /usr/sbin/mkfs.ext4)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_E2UNDO
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/e2undo, /usr/sbin/e2undo)
+ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4DEV
+	@$(call install_link, e2fsprogs, mke2fs, /usr/sbin/mkfs.ext4dev)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT2
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/e2fsck/e2fsck, /usr/sbin/fsck.ext2)
+
+
+ifdef PTXCONF_E2FSPROGS_INSTALL_MKLOSTANDFOUND
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/mklost+found)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT3
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/e2fsck/e2fsck, /usr/sbin/fsck.ext3)
+
+ifdef PTXCONF_E2FSPROGS_INSTALL_RESIZE2FS
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/resize2fs)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_BADBLOCKS
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/badblocks, /usr/sbin/badblocks)
+
+ifdef PTXCONF_E2FSPROGS_INSTALL_TUNE2FS
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/tune2fs)
 endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_UUID
-	@$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/uuidgen, /usr/sbin/uuidgen)
+
+ifdef PTXCONF_E2FSPROGS_INSTALL_UUIDD
+	@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/uuidd)
 endif
 
-#./etc/mke2fs.conf
+	@$(call install_alternative, e2fsprogs, 0, 0, 0644, /etc/mke2fs.conf, n)
 
 	@$(call install_finish,e2fsprogs)