summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-06-04 10:13:01 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-06-04 10:13:45 +0200
commit21cb6fcad12597c6e8b9aed01097ef82af7f1e8f (patch)
tree51c4b4bd2f703b03e6d544243d7fc6b500a5105e
parente94890bb229951a28cf1fa67e61128e47ff7acfd (diff)
downloadptxdist-21cb6fcad12597c6e8b9aed01097ef82af7f1e8f.tar.gz
ptxdist-21cb6fcad12597c6e8b9aed01097ef82af7f1e8f.tar.xz
util-linux-ng: add option for fsck
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/util-linux-ng.in17
-rw-r--r--rules/util-linux-ng.make10
2 files changed, 24 insertions, 3 deletions
diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index f6beb149e..48b147444 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -102,6 +102,19 @@ config UTIL_LINUX_NG_UMOUNT
comment "BusyBox' umount is selected!"
depends on BUSYBOX_UMOUNT
+config UTIL_LINUX_NG_FSCK
+ bool
+ prompt "fsck"
+ depends on !BUSYBOX_FSCK || ALLYES
+ help
+ fsck is used to check and optionally repair one or
+ more Linux file systems. fsck is simply a front-end for
+ the various file system checkers (fsck.fstype) available
+ under Linux.
+
+comment "BusyBox' fsck is selected!"
+ depends on BUSYBOX_FSCK
+
config UTIL_LINUX_NG_IPCS
bool
prompt "ipcs"
@@ -144,7 +157,7 @@ config UTIL_LINUX_NG_CHRT
help
chrt manipulates the real-time attributes of a process.
-comment "chrt from busybox selected"
+comment "BusyBox' chrt is selected!"
depends on BUSYBOX_CHRT
config UTIL_LINUX_NG_HWCLOCK
@@ -157,7 +170,7 @@ config UTIL_LINUX_NG_HWCLOCK
on shutdown in the hardware clock, so the hardware will keep the
correct time when Linux is _not_ running.
-comment "hwclock from busybox selected"
+comment "BusyBox' hwclock is selected!"
depends on BUSYBOX_HWCLOCK
config UTIL_LINUX_NG_IONICE
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 8d66c1f3c..95d2c15fe 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -62,7 +62,6 @@ UTIL_LINUX_NG_AUTOCONF := \
--disable-cramfs \
--disable-elvtune \
--disable-fallocate \
- --disable-fsck \
--disable-init \
--disable-kill \
--disable-last \
@@ -88,6 +87,12 @@ UTIL_LINUX_NG_AUTOCONF := \
--without-audit \
--without-utempter
+ifdef PTXCONF_UTIL_LINUX_NG_FSCK
+UTIL_LINUX_NG_AUTOCONF += --enable-fsck
+else
+UTIL_LINUX_NG_AUTOCONF += --disable-fsck
+endif
+
ifdef PTXCONF_UTIL_LINUX_NG_AGETTY
UTIL_LINUX_NG_AUTOCONF += --enable-agetty
else
@@ -129,6 +134,9 @@ endif
ifdef PTXCONF_UTIL_LINUX_NG_UMOUNT
@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /bin/umount)
endif
+ifdef PTXCONF_UTIL_LINUX_NG_FSCK
+ @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/fsck)
+endif
ifdef PTXCONF_UTIL_LINUX_NG_IPCS
@$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/ipcs)
endif