diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-03-14 16:02:58 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-03-20 09:28:26 +0100 |
| commit | 47c979f379472f39e74bb3e01de24b32e72e6fc9 (patch) | |
| tree | d555a6a1bee85164441e557875060ed80f972a47 /rules/e2fsprogs.make | |
| parent | 8299987215986855b70f1967330c8b01e0f251d7 (diff) | |
| download | ptxdist-47c979f379472f39e74bb3e01de24b32e72e6fc9.tar.gz ptxdist-47c979f379472f39e74bb3e01de24b32e72e6fc9.tar.xz | |
e2fsprogs: set --with-root-prefix=
At least systemd and probably others look for fsck.* in /sbin
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/e2fsprogs.make')
| -rw-r--r-- | rules/e2fsprogs.make | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 261d06092..665396195 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -51,6 +51,7 @@ E2FSPROGS_CONF_OPT := \ --disable-libuuid \ --disable-libblkid \ --disable-quota \ + --disable-backtrace \ --disable-debugfs \ --$(call ptx/endis,PTXCONF_E2FSPROGS_IMAGER)-imager \ --$(call ptx/endis,PTXCONF_E2FSPROGS_RESIZER)-resizer \ @@ -62,7 +63,7 @@ E2FSPROGS_CONF_OPT := \ --disable-nls \ --disable-rpath \ --without-diet-libc \ - --disable-backtrace + --with-root-prefix= E2FSPROGS_INSTALL_OPT := install @@ -111,42 +112,42 @@ endif # # binaries in /usr/sbin # # ifdef PTXCONF_E2FSPROGS_INSTALL_BADBLOCKS - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/badblocks) + @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /sbin/badblocks) endif ifdef PTXCONF_E2FSPROGS_INSTALL_DUMPE2FS - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/dumpe2fs) + @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /sbin/dumpe2fs) endif ifdef PTXCONF_E2FSPROGS_INSTALL_E2FSCK - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/e2fsck) - @$(call install_link, e2fsprogs, e2fsck, /usr/sbin/fsck.auto) + @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /sbin/e2fsck) + @$(call install_link, e2fsprogs, e2fsck, /sbin/fsck.auto) endif ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT2 - @$(call install_link, e2fsprogs, e2fsck, /usr/sbin/fsck.ext2) + @$(call install_link, e2fsprogs, e2fsck, /sbin/fsck.ext2) endif ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT3 - @$(call install_link, e2fsprogs, e2fsck, /usr/sbin/fsck.ext3) + @$(call install_link, e2fsprogs, e2fsck, /sbin/fsck.ext3) endif ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT4 - @$(call install_link, e2fsprogs, e2fsck, /usr/sbin/fsck.ext4) + @$(call install_link, e2fsprogs, e2fsck, /sbin/fsck.ext4) endif ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT4DEV - @$(call install_link, e2fsprogs, e2fsck, /usr/sbin/fsck.ext4dev) + @$(call install_link, e2fsprogs, e2fsck, /sbin/fsck.ext4dev) endif ifdef PTXCONF_E2FSPROGS_INSTALL_E2IMAGE - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/e2image) + @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /sbin/e2image) endif ifdef PTXCONF_E2FSPROGS_INSTALL_E2LABEL - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/e2label) + @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /sbin/e2label) endif ifdef PTXCONF_E2FSPROGS_INSTALL_E2UNDO - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/e2undo) + @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /sbin/e2undo) endif ifdef PTXCONF_E2FSPROGS_INSTALL_FILEFRAG @@ -154,24 +155,24 @@ ifdef PTXCONF_E2FSPROGS_INSTALL_FILEFRAG endif ifdef PTXCONF_E2FSPROGS_INSTALL_LOGSAVE - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/logsave) + @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /sbin/logsave) endif ifdef PTXCONF_E2FSPROGS_INSTALL_MKE2FS - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/mke2fs) + @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /sbin/mke2fs) endif ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT2 - @$(call install_link, e2fsprogs, mke2fs, /usr/sbin/mkfs.ext2) + @$(call install_link, e2fsprogs, mke2fs, /sbin/mkfs.ext2) endif ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT3 - @$(call install_link, e2fsprogs, mke2fs, /usr/sbin/mkfs.ext3) + @$(call install_link, e2fsprogs, mke2fs, /sbin/mkfs.ext3) endif ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4 - @$(call install_link, e2fsprogs, mke2fs, /usr/sbin/mkfs.ext4) + @$(call install_link, e2fsprogs, mke2fs, /sbin/mkfs.ext4) endif ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4DEV - @$(call install_link, e2fsprogs, mke2fs, /usr/sbin/mkfs.ext4dev) + @$(call install_link, e2fsprogs, mke2fs, /sbin/mkfs.ext4dev) endif @@ -180,11 +181,11 @@ ifdef PTXCONF_E2FSPROGS_INSTALL_MKLOSTANDFOUND endif ifdef PTXCONF_E2FSPROGS_INSTALL_RESIZE2FS - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/resize2fs) + @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /sbin/resize2fs) endif ifdef PTXCONF_E2FSPROGS_INSTALL_TUNE2FS - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/sbin/tune2fs) + @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /sbin/tune2fs) endif @$(call install_alternative, e2fsprogs, 0, 0, 0644, /etc/mke2fs.conf, n) |