summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2012-02-18 13:06:37 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2012-02-18 20:22:08 +0100
commit7135a6f80cde7d26b4a6b678103ce24cb160a039 (patch)
tree73ec22c05a2173a0cdb0a1a2a574e93c752ca546
parentd9dd138ce2c372da2c9d638cd02e8552a57f64ff (diff)
downloadptxdist-7135a6f80cde7d26b4a6b678103ce24cb160a039.tar.gz
ptxdist-7135a6f80cde7d26b4a6b678103ce24cb160a039.tar.xz
e2fsprogs: disable uuidd
it will be provided by util-linux Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/e2fsprogs.in6
-rw-r--r--rules/e2fsprogs.make6
2 files changed, 1 insertions, 11 deletions
diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in
index f88baf41e..3134c3e71 100644
--- a/rules/e2fsprogs.in
+++ b/rules/e2fsprogs.in
@@ -260,12 +260,6 @@ config E2FSPROGS_INSTALL_TUNE2FS
help
Enable support for tune2fs program.
-config E2FSPROGS_INSTALL_UUIDD
- bool
- prompt "uuid"
- help
- Enable support for uuid program.
-
endmenu
endif
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index f2c2801f1..858aeac10 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -57,7 +57,7 @@ E2FSPROGS_CONF_OPT := \
--$(call ptx/endis,PTXCONF_E2FSPROGS_INSTALL_E2FSCK)-fsck \
--disable-e2initrd-helper \
--disable-tls \
- --$(call ptx/endis,PTXCONF_E2FSPROGS_INSTALL_UUIDD)-uuidd \
+ --disable-uuidd \
--disable-nls \
--disable-rpath \
--without-diet-libc
@@ -184,10 +184,6 @@ ifdef PTXCONF_E2FSPROGS_INSTALL_TUNE2FS
@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/tune2fs)
endif
-ifdef PTXCONF_E2FSPROGS_INSTALL_UUIDD
- @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/uuidd)
-endif
-
@$(call install_alternative, e2fsprogs, 0, 0, 0644, /etc/mke2fs.conf, n)
@$(call install_finish, e2fsprogs)