util-linux: update to util-linux-2.21

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-03-12 22:10:00 +01:00
parent c0db7ab62b
commit b03285e452
4 changed files with 47 additions and 16 deletions

View File

@ -23,6 +23,7 @@
. config/options $1 . config/options $1
cd $PKG_BUILD cd $PKG_BUILD
#scanf_cv_type_modifier=ms \
gt_cv_func_gnugettext1_libintl=no \ gt_cv_func_gnugettext1_libintl=no \
./configure --host=$TARGET_NAME \ ./configure --host=$TARGET_NAME \
--build=$HOST_NAME \ --build=$HOST_NAME \
@ -35,7 +36,7 @@ gt_cv_func_gnugettext1_libintl=no \
--disable-gtk-doc \ --disable-gtk-doc \
--enable-tls \ --enable-tls \
--disable-mount \ --disable-mount \
--disable-fsck \ --enable-fsck \
--disable-partx \ --disable-partx \
--enable-libuuid \ --enable-libuuid \
--enable-uuidd \ --enable-uuidd \
@ -76,17 +77,20 @@ gt_cv_func_gnugettext1_libintl=no \
--without-ncurses \ --without-ncurses \
--without-slang \ --without-slang \
--without-utempter \ --without-utempter \
--without-pam \
--without-selinux \ --without-selinux \
--without-audit --without-audit
make -C fsck fsck make
make -C mount swapon
make -C misc-utils blkid $MAKEINSTALL
make -C sys-utils fstrim
make -C libuuid #make -C fsck fsck
make -C libblkid #make -C mount swapon
#make -C misc-utils blkid
#make -C sys-utils fstrim
#make -C libuuid
#make -C libblkid
# libuuid must be installed before libblkid!!! # libuuid must be installed before libblkid!!!
$MAKEINSTALL -C libuuid # $MAKEINSTALL -C libuuid
$MAKEINSTALL -C libblkid # $MAKEINSTALL -C libblkid

View File

@ -25,7 +25,7 @@
mkdir -p $INSTALL/usr/bin mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/misc-utils/.libs/blkid $INSTALL/usr/bin cp $PKG_BUILD/misc-utils/.libs/blkid $INSTALL/usr/bin
cp $PKG_BUILD/sys-utils/fstrim $INSTALL/usr/bin cp $PKG_BUILD/sys-utils/fstrim $INSTALL/usr/bin
cp $PKG_BUILD/mount/.libs/swapon $INSTALL/usr/bin cp $PKG_BUILD/sys-utils/.libs/swapon $INSTALL/usr/bin
ln -sf swapon $INSTALL/usr/bin/swapoff ln -sf swapon $INSTALL/usr/bin/swapoff
cp $PKG_BUILD/fsck/.libs/fsck $INSTALL/usr/bin cp $PKG_BUILD/fsck/.libs/fsck $INSTALL/usr/bin

View File

@ -19,14 +19,11 @@
################################################################################ ################################################################################
PKG_NAME="util-linux" PKG_NAME="util-linux"
PKG_VERSION="2.20" PKG_VERSION="2.21"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://userweb.kernel.org/~kzak/util-linux-ng/" PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.21/$PKG_NAME-$PKG_VERSION.tar.xz"
#PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.20/$PKG_NAME-$PKG_VERSION.tar.bz2"
#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/util-linux/v2.20/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/utils/util-linux/v2.20/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="" PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain" PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional" PKG_PRIORITY="optional"

View File

@ -0,0 +1,30 @@
From b420e279691f8ac865ccdbccb377024a55debd41 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Fri, 24 Feb 2012 18:16:07 +0100
Subject: [PATCH] build-sys: add a crosscompile path for
scanf_cv_alloc_modifier
This allows to building the package cross again. Since the return value
is not used I guess there is little loss.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
configure.ac | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index eab9f85..966e9da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -383,6 +383,8 @@ AC_CACHE_VAL([scanf_cv_alloc_modifier],
[scanf_cv_alloc_modifier=as],
[scanf_cv_alloc_modifier=no]
)
+ ,
+ [scanf_cv_alloc_modifier=no]
)
)
--
1.7.5.4