summaryrefslogtreecommitdiff
path: root/package/util-linux/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'package/util-linux/Makefile')
-rw-r--r--package/util-linux/Makefile26
1 files changed, 14 insertions, 12 deletions
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index f4024eae8..69c7bc02b 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -4,13 +4,13 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= util-linux
-PKG_VERSION:= 2.24.2
-PKG_RELEASE:= 4
-PKG_HASH:= 1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0
+PKG_VERSION:= 2.25.2
+PKG_RELEASE:= 1
+PKG_HASH:= cab3d7be354000f629bc601238b629b3
PKG_DESCR:= basic utilities
PKG_SECTION:= base/apps
PKG_BUILDDEP:= ncurses pam
-PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.24/
+PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.25/
PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
@@ -61,7 +61,7 @@ $(eval $(call PKG_template,LIBMOUNT,libmount,${PKG_VERSION}-${PKG_RELEASE},${PKG
TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK
TARGET_LDFLAGS+= -ltinfo
-AUTOTOOL_STYLE:= autoreconf
+#AUTOTOOL_STYLE:= autoreconf
CONFIGURE_ENV+= have_scanf_alloc_modifier=yes \
scanf_cv_alloc_modifier=ms
@@ -77,6 +77,8 @@ CONFIGURE_ARGS+= --disable-use-tty-group \
--disable-cramfs \
--disable-login \
--disable-eject \
+ --without-python \
+ --without-systemd \
--enable-libuuid \
--enable-libblkid \
--enable-libmount \
@@ -85,28 +87,28 @@ FAKE_FLAGS+= INSTALLSUID="install -m 4755"
fdisk-install:
${INSTALL_DIR} ${IDIR_FDISK}/usr/sbin
- ${CP} ${WRKINST}/usr/sbin/fdisk ${IDIR_FDISK}/usr/sbin
+ ${CP} ${WRKINST}/sbin/fdisk ${IDIR_FDISK}/usr/sbin
cfdisk-install:
${INSTALL_DIR} ${IDIR_CFDISK}/usr/sbin
- ${CP} ${WRKINST}/usr/sbin/cfdisk ${IDIR_FDISK}/usr/sbin
+ ${CP} ${WRKINST}/sbin/cfdisk ${IDIR_FDISK}/usr/sbin
sfdisk-install:
${INSTALL_DIR} ${IDIR_SFDISK}/usr/sbin
- ${CP} ${WRKINST}/usr/sbin/sfdisk ${IDIR_SFDISK}/usr/sbin
+ ${CP} ${WRKINST}/sbin/sfdisk ${IDIR_SFDISK}/usr/sbin
losetup-install:
${INSTALL_DIR} ${IDIR_LOSETUP}/usr/sbin
- ${CP} ${WRKINST}/usr/sbin/losetup ${IDIR_LOSETUP}/usr/sbin
+ ${CP} ${WRKINST}/sbin/losetup ${IDIR_LOSETUP}/usr/sbin
swap-utils-install:
${INSTALL_DIR} ${IDIR_SWAP_UTILS}/usr/sbin
- ${CP} ${WRKINST}/usr/sbin/mkswap ${IDIR_SWAP_UTILS}/usr/sbin
- ${CP} ${WRKINST}/usr/sbin/swap{on,off} ${IDIR_SWAP_UTILS}/usr/sbin
+ ${CP} ${WRKINST}/sbin/mkswap ${IDIR_SWAP_UTILS}/usr/sbin
+ ${CP} ${WRKINST}/sbin/swap{on,off} ${IDIR_SWAP_UTILS}/usr/sbin
mkfs-install:
${INSTALL_DIR} ${IDIR_MKFS}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/mkfs ${IDIR_MKFS}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/sbin/mkfs ${IDIR_MKFS}/usr/sbin
mount-install:
${INSTALL_DIR} ${IDIR_MOUNT}/bin