diff options
| -rw-r--r-- | package/util-linux/Makefile | 26 | ||||
| -rw-r--r-- | package/util-linux/patches/patch-Makefile_am | 62 | ||||
| -rw-r--r-- | package/util-linux/patches/patch-configure_ac | 41 |
3 files changed, 14 insertions, 115 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 diff --git a/package/util-linux/patches/patch-Makefile_am b/package/util-linux/patches/patch-Makefile_am deleted file mode 100644 index 97e473a0b..000000000 --- a/package/util-linux/patches/patch-Makefile_am +++ /dev/null @@ -1,62 +0,0 @@ ---- util-linux-2.24.2.orig/Makefile.am 2014-04-23 15:28:29.131326219 +0200 -+++ util-linux-2.24.2/Makefile.am 2014-06-17 11:59:16.244597631 +0200 -@@ -9,8 +9,6 @@ AM_LDFLAGS = - # Add gettext stuff to the global LDADD for systems with separate libintl - # library. The LTLIBINTL is generated by AM_GNU_GETTEXT macro. - # --LDADD = $(LTLIBINTL) -- - # Automake (at least up to 1.10) mishandles dist_man_MANS inside conditionals. - # Unlike with other dist primaries, the files are not distributed if the - # conditional is false. -@@ -56,7 +54,7 @@ CHECK_LOCALS = - EXTRA_DIST = - CLEANFILES = - --SUBDIRS = po -+SUBDIRS = - - RCS_FIND_IGNORE = \( -name SCCS -o -name BitKeeper -o -name .svn -o \ - -name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o -@@ -93,41 +91,6 @@ include bash-completion/Makemodule.am - - include tests/Makemodule.am - --# --# Don't rely on configure.ac AC_CONFIG_FILES for install paths. --# --# The paths should be expanded at make time rather than configure: --# - to support 'make install prefix=/foo DESTDIR=/foo' --# - to recursively expands the paths (e.g. AC_CONFIG_FILES expands --# '@usrsbin_execdir@' to ${exec_prefix}/sbin') --# --edit_cmd = sed \ -- -e 's|@prefix[@]|$(prefix)|g' \ -- -e 's|@exec_prefix[@]|$(exec_prefix)|g' \ -- -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -- -e 's|@datadir[@]|$(datadir)|g' \ -- -e 's|@sbindir[@]|$(sbindir)|g' \ -- -e 's|@bindir[@]|$(bindir)|g' \ -- -e 's|@includedir[@]|$(includedir)|g' \ -- -e 's|@localstatedir[@]|$(localstatedir)|g' \ -- -e 's|@usrlib_execdir[@]|$(usrlib_execdir)|g' \ -- -e 's|@usrbin_execdir[@]|$(usrbin_execdir)|g' \ -- -e 's|@usrsbin_execdir[@]|$(usrsbin_execdir)|g' \ -- -e 's|@VERSION[@]|$(VERSION)|g' \ -- -e 's|@LIBUUID_VERSION[@]|$(LIBUUID_VERSION)|g' \ -- -e 's|@LIBMOUNT_VERSION[@]|$(LIBMOUNT_VERSION)|g' \ -- -e 's|@LIBBLKID_VERSION[@]|$(LIBBLKID_VERSION)|g' -- --CLEANFILES += $(PATHFILES) --EXTRA_DIST += $(PATHFILES:=.in) -- --$(PATHFILES): Makefile -- @ rm -f $@ $@.tmp -- $(AM_V_GEN) srcdir=''; \ -- test -f ./$@.in || srcdir=$(srcdir)/; \ -- $(edit_cmd) $${srcdir}$@.in >$@.tmp -- @ mv $@.tmp $@ -- - # Arrange so that .tarball-version appears only in the distribution - # tarball, and never in a checked-out repository. - dist-hook: diff --git a/package/util-linux/patches/patch-configure_ac b/package/util-linux/patches/patch-configure_ac deleted file mode 100644 index f373d4503..000000000 --- a/package/util-linux/patches/patch-configure_ac +++ /dev/null @@ -1,41 +0,0 @@ ---- util-linux-2.24.2.orig/configure.ac 2014-04-24 11:23:25.576928936 +0200 -+++ util-linux-2.24.2/configure.ac 2014-06-17 12:11:07.831364911 +0200 -@@ -46,15 +46,6 @@ LIBMOUNT_LT_MINOR=1 - LIBMOUNT_LT_MICRO=0 - LIBMOUNT_VERSION_INFO=`expr $LIBMOUNT_LT_MAJOR + $LIBMOUNT_LT_MINOR`:$LIBMOUNT_LT_MICRO:$LIBMOUNT_LT_MINOR - --# Check whether exec_prefix=/usr: --AS_CASE([$exec_prefix:$prefix], --[NONE:NONE | NONE:/usr | /usr:*], -- [AC_MSG_NOTICE([Default --exec-prefix detected.]) -- AS_CASE([$bindir], ['${exec_prefix}/bin'], [bindir=/bin; AC_MSG_NOTICE([ --bindir defaults to /bin]) ]) -- AS_CASE([$sbindir], ['${exec_prefix}/sbin'], [sbindir=/sbin; AC_MSG_NOTICE([ --sbindir defaults to /sbin])]) -- AS_CASE([$libdir], ['${exec_prefix}/lib'], [libdir=/lib; AC_MSG_NOTICE([ --libdir defaults to /lib]) ]) -- ] --) - - AS_CASE([$prefix:$localstatedir], - [NONE:'${prefix}/var' | /usr:'${prefix}/var'], -@@ -145,9 +136,6 @@ UL_SET_ARCH([HPPA], [hppa*]) - - AC_SYS_LARGEFILE - --AM_GNU_GETTEXT_VERSION([0.14.1]) --AM_GNU_GETTEXT([external]) -- - AS_IF([test -d "$srcdir/po"], [ - ALL_LINGUAS=`cd $srcdir/po > /dev/null && echo *.po | sed 's/\.po//g'` - ], [ -@@ -1573,9 +1561,12 @@ Makefile - libblkid/docs/Makefile - libblkid/docs/version.xml - libblkid/src/blkid.h -+libblkid/blkid.pc -+libuuid/uuid.pc - libmount/docs/Makefile - libmount/docs/version.xml - libmount/src/libmount.h -+libmount/mount.pc - po/Makefile.in - ]) - |