Changeset 31178


Ignore:
Timestamp:
2012-04-02T18:25:48+02:00 (6 years ago)
Author:
florian
Message:

[package] util-linux: move and update

This patch makes several changes with util-linux-ng package:

  • moves it to util-linux (upstream name)
  • bumps it to last stable version 2.20.1 (was 2.13.0.1)
  • adds new package getopt
  • sorts packages inside Makefile
  • removes patch, it has been applied upstream

I would also like to maintain this package.

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

Location:
trunk/package
Files:
1 added
1 deleted
1 moved

Legend:

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

    r31177 r31178  
    11# 
    2 # Copyright (C) 2007-2010 OpenWrt.org 
     2# Copyright (C) 2007-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    88include $(TOPDIR)/rules.mk 
    99 
    10 PKG_NAME:=util-linux-ng 
    11 PKG_VERSION:=2.13.0.1 
    12 PKG_RELEASE:=4 
     10PKG_NAME:=util-linux 
     11PKG_VERSION:=2.20.1 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    15 PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.13 
    16 PKG_MD5SUM:=c841dc8743905c8f0db20c9db5094f57 
    17  
     15PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.20 
     16PKG_MD5SUM:=fcd18041c5390178b1aadc2fd298bee8 
     17 
     18PKG_BUILD_PARALLEL:=1 
    1819PKG_BUILD_DEPENDS=e2fsprogs libncurses 
    1920 
     
    2324  SECTION:=utils 
    2425  CATEGORY:=Utilities 
    25   URL:=http://www.kernel.org/pub/linux/utils/util-linux-ng/ 
    26 endef 
    27  
    28 define Package/fdisk 
    29 $(call Package/util-linux/Default) 
    30   TITLE:=Partition table manipulation utility 
    31   SUBMENU=disc 
    32 endef 
    33  
    34 define Package/fdisk/description 
    35  This package contains a utility for managing disk partition tables. 
    36 endef 
     26  URL:=http://www.kernel.org/pub/linux/utils/util-linux/ 
     27endef 
     28 
     29CONFIGURE_VARS += \ 
     30        scanf_cv_type_modifier="ms" 
     31 
     32CONFIGURE_ARGS += \ 
     33        --disable-nls \ 
     34        --disable-tls 
    3735 
    3836define Package/cfdisk 
     
    4745endef 
    4846 
     47define Package/fdisk 
     48$(call Package/util-linux/Default) 
     49  TITLE:=Partition table manipulation utility 
     50  SUBMENU=disc 
     51endef 
     52 
     53define Package/fdisk/description 
     54 This package contains a utility for managing disk partition tables. 
     55endef 
     56 
    4957define Package/sfdisk 
    5058$(call Package/util-linux/Default) 
     
    5765endef 
    5866 
     67define Package/getopt 
     68$(call Package/util-linux/Default) 
     69  TITLE:=Tool for parsing command parameters 
     70endef 
     71 
     72define Package/getopt/description 
     73 getopt is a program to help shell scripts parse command-line parameters. 
     74endef 
     75 
     76define Package/hwclock 
     77$(call Package/util-linux/Default) 
     78  TITLE:=Utilities for managing the hardware clock 
     79endef 
     80 
     81define Package/hwclock/description 
     82 This package contains a utility for managing the hardware clock. 
     83endef 
     84 
    5985define Package/losetup 
    6086$(call Package/util-linux/Default) 
     
    6490define Package/losetup/description 
    6591 This package contains a utility for managing loopback devices. 
    66 endef 
    67  
    68 define Package/mount-utils 
    69 $(call Package/util-linux/Default) 
    70   TITLE:=Devices mount/unmounting utilities 
    71   DEPENDS+= +libblkid +libuuid 
    72 endef 
    73  
    74 define Package/mount-utils/description 
    75  This package contains utilities to mount/unmount devices. 
    7692endef 
    7793 
     
    90106endef 
    91107 
    92 define Package/hwclock 
    93 $(call Package/util-linux/Default) 
    94   TITLE:=Utilities for managing the hardware clock 
    95 endef 
    96  
    97 define Package/hwclock/description 
    98  This package contains a utility for managing the hardware clock. 
     108define Package/mount-utils 
     109$(call Package/util-linux/Default) 
     110  TITLE:=Devices mount/unmounting utilities 
     111  DEPENDS+= +libblkid +libuuid 
     112endef 
     113 
     114define Package/mount-utils/description 
     115 This package contains utilities to mount/unmount devices. 
    99116endef 
    100117 
     
    116133 
    117134define Package/setterm/description 
    118   This package contains a utility for setting terminal attributes 
     135  This package contains a utility for setting terminal attributes. 
    119136endef 
    120137 
     
    127144define Package/script/description 
    128145 Script makes a typescript of everything printed on your terminal. 
    129  http://linux.die.net/man/1/script 
    130 endef 
    131  
     146endef 
    132147 
    133148define Build/Compile 
    134149        $(MAKE) -C $(PKG_BUILD_DIR)/disk-utils mkswap 
    135         $(MAKE) -C $(PKG_BUILD_DIR)/mount swapon losetup umount mount 
    136         $(MAKE) -C $(PKG_BUILD_DIR)/fdisk fdisk cfdisk sfdisk 
     150        $(MAKE) -C $(PKG_BUILD_DIR)/fdisk cfdisk fdisk sfdisk 
     151        $(MAKE) -C $(PKG_BUILD_DIR)/getopt getopt 
    137152        $(MAKE) -C $(PKG_BUILD_DIR)/hwclock hwclock 
     153        $(MAKE) -C $(PKG_BUILD_DIR)/mount losetup mount swapon umount 
    138154        $(MAKE) -C $(PKG_BUILD_DIR)/sys-utils flock 
    139         $(MAKE) -C $(PKG_BUILD_DIR)/misc-utils setterm 
    140         $(MAKE) -C $(PKG_BUILD_DIR)/misc-utils script 
     155        $(MAKE) -C $(PKG_BUILD_DIR)/term-utils setterm script 
     156endef 
     157 
     158define Package/cfdisk/install 
     159        $(INSTALL_DIR) $(1)/sbin 
     160        $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/cfdisk $(1)/sbin/ 
    141161endef 
    142162 
     
    144164        $(INSTALL_DIR) $(1)/sbin 
    145165        $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/fdisk $(1)/sbin/ 
    146 endef 
    147  
    148 define Package/cfdisk/install 
    149         $(INSTALL_DIR) $(1)/sbin 
    150         $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/cfdisk $(1)/sbin/ 
    151166endef 
    152167 
     
    156171endef 
    157172 
     173define Package/getopt/install 
     174        $(INSTALL_DIR) $(1)/usr/bin 
     175        $(INSTALL_BIN) $(PKG_BUILD_DIR)/getopt/getopt $(1)/usr/bin/ 
     176endef 
     177 
     178define Package/hwclock/install 
     179        $(INSTALL_DIR) $(1)/sbin 
     180        $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/sbin/ 
     181endef 
     182 
    158183define Package/losetup/install 
    159184        $(INSTALL_DIR) $(1)/sbin 
    160185        $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/losetup $(1)/sbin/ 
     186endef 
     187 
     188define Package/swap-utils/install 
     189        $(INSTALL_DIR) $(1)/sbin 
     190        $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/mkswap $(PKG_BUILD_DIR)/mount/swapon $(1)/sbin/ 
     191        ln -sf swapon $(1)/sbin/swapoff 
    161192endef 
    162193 
     
    166197endef 
    167198 
    168 define Package/swap-utils/install 
    169         $(INSTALL_DIR) $(1)/sbin 
    170         $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/mkswap $(PKG_BUILD_DIR)/mount/swapon $(1)/sbin/ 
    171         ln -sf swapon $(1)/sbin/swapoff 
    172 endef 
    173  
    174 define Package/hwclock/install 
    175         $(INSTALL_DIR) $(1)/sbin 
    176         $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/sbin/ 
    177 endef 
    178  
    179199define Package/flock/install 
    180200        $(INSTALL_DIR) $(1)/usr/bin 
     
    184204define Package/setterm/install 
    185205        $(INSTALL_DIR) $(1)/usr/bin 
    186         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/setterm $(1)/usr/bin/ 
     206        $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/setterm $(1)/usr/bin/ 
    187207endef 
    188208 
    189209define Package/script/install 
    190210        $(INSTALL_DIR) $(1)/usr/bin 
    191         $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/script $(1)/usr/bin/ 
    192 endef 
    193  
    194  
     211        $(INSTALL_BIN) $(PKG_BUILD_DIR)/term-utils/script $(1)/usr/bin/ 
     212endef 
     213 
     214$(eval $(call BuildPackage,cfdisk)) 
    195215$(eval $(call BuildPackage,fdisk)) 
    196 $(eval $(call BuildPackage,cfdisk)) 
    197216$(eval $(call BuildPackage,sfdisk)) 
     217$(eval $(call BuildPackage,getopt)) 
     218$(eval $(call BuildPackage,hwclock)) 
    198219$(eval $(call BuildPackage,losetup)) 
     220$(eval $(call BuildPackage,swap-utils)) 
    199221$(eval $(call BuildPackage,mount-utils)) 
    200 $(eval $(call BuildPackage,swap-utils)) 
    201 $(eval $(call BuildPackage,hwclock)) 
    202222$(eval $(call BuildPackage,flock)) 
    203223$(eval $(call BuildPackage,setterm)) 
Note: See TracChangeset for help on using the changeset viewer.