Changeset 40010


Ignore:
Timestamp:
2014-03-24T01:19:44+01:00 (4 years ago)
Author:
luka
Message:

[package] util-linux: update to 2.24.1

Signed-off-by: Luka Perkov <luka@…>

Location:
trunk/package/utils/util-linux
Files:
1 added
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/utils/util-linux/Makefile

    r38672 r40010  
    11# 
    2 # Copyright (C) 2007-2012 OpenWrt.org 
     2# Copyright (C) 2007-2014 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=util-linux 
    11 PKG_VERSION:=2.21.2 
    12 PKG_RELEASE:=2 
     11PKG_VERSION:=2.24.1 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz 
    15 PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.21 
    16 PKG_MD5SUM:=54ba880f1d66782c2287ee2c898520e9 
     15PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.24 
     16PKG_MD5SUM:=88d46ae23ca599ac5af9cf96b531590f 
    1717 
    1818PKG_LICENSE:=GPLv2 LGPLv2.1 BSD-3c 
     
    3434        --enable-new-mount      \ 
    3535        --with-ncurses          \ 
    36         --disable-nls           \ 
    3736        --disable-tls           \ 
    3837        --without-udev 
     
    5958 
    6059        $(INSTALL_DIR) $(1)/usr/lib 
    61         $(CP) $(PKG_BUILD_DIR)/libblkid/src/.libs/libblkid.{a,so*} $(1)/usr/lib 
    62         $(CP) $(PKG_BUILD_DIR)/libmount/src/.libs/libmount.{a,so*} $(1)/usr/lib 
    63         $(CP) $(PKG_BUILD_DIR)/libuuid/src/.libs/libuuid.{a,so*} $(1)/usr/lib 
     60        $(CP) $(PKG_BUILD_DIR)/.libs/libblkid.{a,so*} $(1)/usr/lib 
     61        $(CP) $(PKG_BUILD_DIR)/.libs/libmount.{a,so*} $(1)/usr/lib 
     62        $(CP) $(PKG_BUILD_DIR)/.libs/libuuid.{a,so*} $(1)/usr/lib 
    6463endef 
    6564 
     
    406405define Package/libblkid/install 
    407406        $(INSTALL_DIR) $(1)/usr/lib 
    408         $(CP) $(PKG_BUILD_DIR)/libblkid/src/.libs/libblkid.so.* $(1)/usr/lib/ 
     407        $(CP) $(PKG_BUILD_DIR)/.libs/libblkid.so.* $(1)/usr/lib/ 
    409408endef 
    410409 
    411410define Package/libmount/install 
    412411        $(INSTALL_DIR) $(1)/usr/lib 
    413         $(CP) $(PKG_BUILD_DIR)/libmount/src/.libs/libmount.so.* $(1)/usr/lib/ 
     412        $(CP) $(PKG_BUILD_DIR)/.libs/libmount.so.* $(1)/usr/lib/ 
    414413endef 
    415414 
    416415define Package/libuuid/install 
    417416        $(INSTALL_DIR) $(1)/usr/lib 
    418         $(CP) $(PKG_BUILD_DIR)/libuuid/src/.libs/libuuid.so.* $(1)/usr/lib/ 
     417        $(CP) $(PKG_BUILD_DIR)/.libs/libuuid.so.* $(1)/usr/lib/ 
    419418endef 
    420419 
    421420define Package/agetty/install 
    422421        $(INSTALL_DIR) $(1)/usr/sbin 
    423         $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/agetty $(1)/usr/sbin/ 
     422        $(INSTALL_BIN) $(PKG_BUILD_DIR)/agetty $(1)/usr/sbin/ 
    424423endef 
    425424 
    426425define Package/blkid/install 
    427426        $(INSTALL_DIR) $(1)/usr/sbin 
    428         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/blkid $(1)/usr/sbin/ 
     427        $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/blkid $(1)/usr/sbin/ 
    429428endef 
    430429 
    431430define Package/cal/install 
    432431        $(INSTALL_DIR) $(1)/usr/bin 
    433         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/cal $(1)/usr/bin/ 
     432        $(INSTALL_BIN) $(PKG_BUILD_DIR)/cal $(1)/usr/bin/ 
    434433endef 
    435434 
    436435define Package/cfdisk/install 
    437436        $(INSTALL_DIR) $(1)/usr/sbin 
    438         $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/cfdisk $(1)/usr/sbin/ 
     437        $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/cfdisk $(1)/usr/sbin/ 
    439438endef 
    440439 
    441440define Package/fdisk/install 
    442441        $(INSTALL_DIR) $(1)/usr/sbin 
    443         $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/.libs/fdisk $(1)/usr/sbin/ 
     442        $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/fdisk $(1)/usr/sbin/ 
    444443endef 
    445444 
    446445define Package/findfs/install 
    447446        $(INSTALL_DIR) $(1)/usr/sbin 
    448         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/findfs $(1)/usr/sbin/ 
     447        $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/findfs $(1)/usr/sbin/ 
    449448endef 
    450449 
    451450define Package/flock/install 
    452451        $(INSTALL_DIR) $(1)/usr/bin 
    453         $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/flock $(1)/usr/bin/ 
     452        $(INSTALL_BIN) $(PKG_BUILD_DIR)/flock $(1)/usr/bin/ 
    454453endef 
    455454 
    456455define Package/getopt/install 
    457456        $(INSTALL_DIR) $(1)/usr/bin 
    458         $(INSTALL_BIN) $(PKG_BUILD_DIR)/getopt/getopt $(1)/usr/bin/ 
     457        $(INSTALL_BIN) $(PKG_BUILD_DIR)/getopt $(1)/usr/bin/ 
    459458endef 
    460459 
    461460define Package/hwclock/install 
    462461        $(INSTALL_DIR) $(1)/usr/sbin 
    463         $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/usr/sbin/ 
     462        $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock $(1)/usr/sbin/ 
    464463endef 
    465464 
    466465define Package/logger/install 
    467466        $(INSTALL_DIR) $(1)/usr/bin 
    468         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/logger $(1)/usr/bin/ 
     467        $(INSTALL_BIN) $(PKG_BUILD_DIR)/logger $(1)/usr/bin/ 
    469468endef 
    470469 
    471470define Package/look/install 
    472471        $(INSTALL_DIR) $(1)/usr/bin 
    473         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/look $(1)/usr/bin/ 
     472        $(INSTALL_BIN) $(PKG_BUILD_DIR)/look $(1)/usr/bin/ 
    474473endef 
    475474 
    476475define Package/losetup/install 
    477476        $(INSTALL_DIR) $(1)/usr/sbin 
    478         $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/losetup $(1)/usr/sbin/ 
     477        $(INSTALL_BIN) $(PKG_BUILD_DIR)/losetup $(1)/usr/sbin/ 
    479478endef 
    480479 
    481480define Package/lsblk/install 
    482481        $(INSTALL_DIR) $(1)/usr/bin 
    483         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/lsblk $(1)/usr/bin/ 
     482        $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/lsblk $(1)/usr/bin/ 
    484483endef 
    485484 
    486485define Package/mcookie/install 
    487486        $(INSTALL_DIR) $(1)/usr/bin 
    488         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/mcookie $(1)/usr/bin/ 
     487        $(INSTALL_BIN) $(PKG_BUILD_DIR)/mcookie $(1)/usr/bin/ 
    489488endef 
    490489 
    491490define Package/mount-utils/install 
    492491        $(INSTALL_DIR) $(1)/usr/bin 
    493         $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/{u,}mount $(1)/usr/bin/ 
    494         $(INSTALL_BIN) $(PKG_BUILD_DIR)/sys-utils/.libs/mountpoint $(1)/usr/bin/ 
    495         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/findmnt $(1)/usr/bin/ 
     492        $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/{u,}mount $(1)/usr/bin/ 
     493        $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/mountpoint $(1)/usr/bin/ 
     494        $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/findmnt $(1)/usr/bin/ 
    496495endef 
    497496 
    498497define Package/namei/install 
    499498        $(INSTALL_DIR) $(1)/usr/bin 
    500         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/namei $(1)/usr/bin/ 
     499        $(INSTALL_BIN) $(PKG_BUILD_DIR)/namei $(1)/usr/bin/ 
    501500endef 
    502501 
    503502define Package/rename/install 
    504503        $(INSTALL_DIR) $(1)/usr/bin 
    505         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/rename $(1)/usr/bin/ 
     504        $(INSTALL_BIN) $(PKG_BUILD_DIR)/rename $(1)/usr/bin/ 
    506505endef 
    507506 
    508507define Package/partx-utils/install 
    509508        $(INSTALL_DIR) $(1)/usr/sbin 
    510         $(INSTALL_BIN) $(PKG_BUILD_DIR)/partx/.libs/partx $(1)/usr/sbin/ 
    511         $(INSTALL_BIN) $(PKG_BUILD_DIR)/partx/addpart $(1)/usr/sbin/ 
    512         $(INSTALL_BIN) $(PKG_BUILD_DIR)/partx/delpart $(1)/usr/sbin/ 
     509        $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/partx $(1)/usr/sbin/ 
     510        $(INSTALL_BIN) $(PKG_BUILD_DIR)/addpart $(1)/usr/sbin/ 
     511        $(INSTALL_BIN) $(PKG_BUILD_DIR)/delpart $(1)/usr/sbin/ 
    513512endef 
    514513 
    515514define Package/script-utils/install 
    516515        $(INSTALL_DIR) $(1)/usr/bin 
    517         $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/script $(1)/usr/bin/ 
    518         $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/scriptreplay $(1)/usr/bin/ 
     516        $(INSTALL_BIN) $(PKG_BUILD_DIR)/script $(1)/usr/bin/ 
     517        $(INSTALL_BIN) $(PKG_BUILD_DIR)/scriptreplay $(1)/usr/bin/ 
    519518endef 
    520519 
    521520define Package/setterm/install 
    522521        $(INSTALL_DIR) $(1)/usr/bin 
    523         $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/setterm $(1)/usr/bin/ 
     522        $(INSTALL_BIN) $(PKG_BUILD_DIR)/setterm $(1)/usr/bin/ 
    524523endef 
    525524 
    526525define Package/sfdisk/install 
    527526        $(INSTALL_DIR) $(1)/usr/sbin 
    528         $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/sfdisk $(1)/usr/sbin/ 
     527        $(INSTALL_BIN) $(PKG_BUILD_DIR)/sfdisk $(1)/usr/sbin/ 
    529528endef 
    530529 
    531530define Package/swap-utils/install 
    532531        $(INSTALL_DIR) $(1)/usr/sbin 
    533         $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/.libs/mkswap $(1)/usr/sbin/ 
    534         $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/.libs/swaplabel $(1)/usr/sbin/ 
     532        $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/mkswap $(1)/usr/sbin/ 
     533        $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/swaplabel $(1)/usr/sbin/ 
    535534endef 
    536535 
    537536define Package/uuidd/install 
    538537        $(INSTALL_DIR) $(1)/usr/sbin 
    539         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/uuidd $(1)/usr/sbin/ 
     538        $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/uuidd $(1)/usr/sbin/ 
    540539endef 
    541540 
    542541define Package/uuidgen/install 
    543542        $(INSTALL_DIR) $(1)/usr/bin 
    544         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/uuidgen $(1)/usr/bin/ 
     543        $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/uuidgen $(1)/usr/bin/ 
    545544endef 
    546545 
    547546define Package/wall/install 
    548547        $(INSTALL_DIR) $(1)/usr/bin 
    549         $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/wall $(1)/usr/bin/ 
     548        $(INSTALL_BIN) $(PKG_BUILD_DIR)/wall $(1)/usr/bin/ 
    550549endef 
    551550 
    552551define Package/whereis/install 
    553552        $(INSTALL_DIR) $(1)/usr/bin 
    554         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/whereis $(1)/usr/bin/ 
     553        $(INSTALL_BIN) $(PKG_BUILD_DIR)/whereis $(1)/usr/bin/ 
    555554endef 
    556555 
    557556define Package/wipefs/install 
    558557        $(INSTALL_DIR) $(1)/usr/sbin 
    559         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/wipefs $(1)/usr/sbin/ 
     558        $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/wipefs $(1)/usr/sbin/ 
    560559endef 
    561560 
  • trunk/package/utils/util-linux/patches/001-no-printf-alloc.patch

    r37007 r40010  
    1 for systems that don't support latest POSIX standard: %as 
    2  
    3 https://bugs.gentoo.org/406303 
    4  
    51--- a/configure.ac 
    62+++ b/configure.ac 
    7 @@ -688,7 +688,6 @@ AC_ARG_ENABLE([libmount], 
     3@@ -769,7 +769,6 @@ AC_ARG_ENABLE([libmount], 
    84 UL_BUILD_INIT([libmount]) 
    95 UL_REQUIRES_LINUX([libmount]) 
    106 UL_REQUIRES_BUILD([libmount], [libblkid]) 
    117-UL_REQUIRES_HAVE([libmount], [scanf_alloc_modifier], [scanf string alloc modifier]) 
    12  AM_CONDITIONAL(BUILD_LIBMOUNT, test "x$build_libmount" = xyes) 
     8 AM_CONDITIONAL([BUILD_LIBMOUNT], [test "x$build_libmount" = xyes]) 
     9 AM_CONDITIONAL([BUILD_LIBMOUNT_TESTS], [test "x$build_libmount" = xyes -a "x$enable_static" = xyes]) 
    1310  
    14  AC_SUBST([LIBMOUNT_VERSION]) 
    1511--- a/libmount/src/tab_parse.c 
    1612+++ b/libmount/src/tab_parse.c 
     
    9187  
    9288        if (rc >= 7 && end > 0) 
    93 @@ -167,9 +202,15 @@ static int mnt_parse_mountinfo_line(stru 
     89@@ -169,9 +204,15 @@ static int mnt_parse_mountinfo_line(stru 
    9490                        UL_SCNsA" "     /* (9) source */ 
    9591                        UL_SCNsA,       /* (10) fs options (fs specific) */ 
Note: See TracChangeset for help on using the changeset viewer.