Ignore:
Timestamp:
2011-04-25T22:36:26+02:00 (5 years ago)
Author:
luka
Message:

upgrade lvm2 package

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/utils/lvm2/Makefile

    r23756 r26754  
    11# 
    22# Copyright (C) 2009, 2010 Stefan Monnier 
     3# Copyright (C) 2011 OpenWrt.org 
    34# 
    45# This is free software, licensed under the GNU General Public License v3+. 
     
    910 
    1011PKG_NAME:=LVM2 
    11 PKG_VERSION:=2.02.64 
    12 PKG_RELEASE:=2 
     12PKG_VERSION:=2.02.84 
     13PKG_RELEASE:=1 
    1314 
    1415PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz 
    15 PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2/ \ 
    16                 http://netbsd.mirrors.tds.net/pub/sourceware.org/lvm2/ 
    17 PKG_MD5SUM:=59fc0f7f6703a8c7f12df6b7d2e509fb 
    18 # 2.02.43 = fc34655706a2aa116b92328b24fad619 
    19 # 2.02.44 = 4ed7b99903a6fc5165b7b0b8def42486 
    20 # 2.02.53 = f9ae3579bf15467b7f1d7aea8b9ed9b3 
    21 # 2.02.60 = 33e0e0f4b4582d495ff619696c634b2a 
    22 # 2.02.63 = 74bb3beeefe68d539ab712e92fddfb39 
    23  
    24 # OpenWRT normally expects the tarball to expand into 
    25 # $(PKG_NAME)-$(PKG_VERSION), and this magic incantation seems to make it 
    26 # understand that LVM2's tarball expands into $(PKG_NAME).$(PKG_VERSION). 
     16PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2 
     17PKG_MD5SUM:=8b4e0897ee48f02c0dff11940e44e23b 
    2718PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION) 
    2819 
    2920include $(INCLUDE_DIR)/package.mk 
    3021 
    31 define Package/libdevmapper/Default 
    32   SUBMENU:=disc 
    33   MAINTAINER:=Stefan Monnier <monnier@iro.umontreal.ca> 
    34 endef 
    35  
    3622define Package/libdevmapper 
    37   $(call Package/libdevmapper/Default) 
    3823  SECTION:=libs 
    3924  CATEGORY:=Libraries 
    40   DEPENDS:=+kmod-dm 
    4125  TITLE:=The Linux Kernel Device Mapper userspace library 
    4226  URL:=http://sourceware.org/dm/ 
     27  DEPENDS:=+kmod-dm 
     28  MAINTAINER:=Luka Perkov <openwrt@lukaperkov.net> 
    4329endef 
    4430 
    4531define Package/libdevmapper/description 
    46   The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management) 
    47   Team\'s implementation of a minimalistic kernel-space driver that handles 
    48   volume management, while keeping knowledge of the underlying device layout 
    49   in user-space.  This makes it useful for not only LVM, but EVMS, software 
    50   raid, and other drivers that create "virtual" block devices. 
    51   . 
    52   This package contains the (user-space) shared library for accessing the 
    53   device-mapper; it allows usage of the device-mapper through a clean, 
    54   consistent interface (as opposed to through kernel ioctls). 
     32 The device-mapper is a component of the 2.6 linux kernel that supports logical 
     33 volume management. It is required by LVM2 and EVMS. 
    5534endef 
    5635 
    5736define Package/lvm2 
    58   $(call Package/libdevmapper/Default) 
    5937  SECTION:=utils 
    6038  CATEGORY:=Utilities 
     39  SUBMENU:=disc 
    6140  TITLE:=The Linux Logical Volume Manager 
     41  URL:=http://sourceware.org/lvm2/ 
    6242  DEPENDS:=+libdevmapper +libreadline +libncurses 
    63   URL:=http://sourceware.org/lvm2/ 
     43  MAINTAINER:=Luka Perkov <openwrt@lukaperkov.net> 
    6444endef 
    6545 
    6646define Package/lvm2/description 
    67   This is LVM2, the rewrite of The Linux Logical Volume Manager.  LVM 
    68   supports enterprise level volume management of disk and disk subsystems 
    69   by grouping arbitrary disks into volume groups. The total capacity of 
    70   volume groups can be allocated to logical volumes, which are accessed as 
    71   regular block devices. 
     47 LVM2 refers to a new userspace toolset that provide logical volume management 
     48 facilities on linux. It is reasonably backwards-compatible with the original 
     49 LVM toolset. 
    7250endef 
    7351 
    74 # I got problems building with readline, so I originally just disabled it. 
    75 # I've since added patch 100-readline-link which fixes the problem instead. 
    76 # CONFIGURE_ARGS += --disable-readline 
    77  
    78 # Apparently we have problems when "read"ing using O_DIRECT, maybe because 
    79 # of uClibc.  More specifically, with O_DIRECT lvm becomes erratic, showing 
    80 # non-deterministic behavior: `lvs', `pvs' and friends can return anything 
    81 # from empty lists, to completely correct result, as well as checksum errors, 
    82 # complaints about missing volume groups, ... each run of the command can 
    83 # return something different.  The "root" of the problem is (maybe among 
    84 # other places) in the "_io" function in dev-io.c, where calls to the "read" 
    85 # function often return garbage, although not always.  There's nothing 
    86 # obviously wrong with the dev-io.c code, so the bug may just as well be in 
    87 # uClibc or in the kernel (it appeared on the MIPS platform and could be 
    88 # related to cache coherency issues). 
    89 # Debian Lenny's lvm2 also disables O_DIRECT on "arm armeb hppa mips mipsel". 
    9052CONFIGURE_ARGS += --disable-o_direct 
    9153 
    9254define Build/Compile 
    9355        $(MAKE) -C $(PKG_BUILD_DIR) \ 
    94                 CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)" \ 
     56                CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ 
    9557                DESTDIR="$(PKG_INSTALL_DIR)" \ 
    9658                install 
     
    9860 
    9961define Build/InstallDev 
    100         mkdir -p $(1)/usr/include 
    101         $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libdevmapper.h $(1)/usr/include/ 
    102         mkdir -p $(1)/usr/lib 
    103         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdevmapper.so* $(1)/usr/lib/ 
    104         mkdir -p $(1)/usr/lib/pkgconfig 
    105         $(CP) $(PKG_BUILD_DIR)/libdm/libdevmapper.pc $(1)/usr/lib/pkgconfig/ 
     62        $(INSTALL_DIR) $(1)/usr/include 
     63        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libdevmapper.h $(1)/usr/include 
     64        $(INSTALL_DIR) $(1)/usr/lib 
     65        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdevmapper.so* $(1)/usr/lib 
     66        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig 
     67        $(CP) $(PKG_BUILD_DIR)/libdm/libdevmapper.pc $(1)/usr/lib/pkgconfig 
    10668endef 
    10769 
    10870define Package/libdevmapper/install 
    10971        $(INSTALL_DIR) $(1)/usr/lib 
    110         $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdevmapper.so.* $(1)/usr/lib/ 
     72        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdevmapper.so.* $(1)/usr/lib 
    11173endef 
    11274 
    113 # This rule only installs the `lvm' executable.  Debian also installs 
    114 # a whole bunch of symlinks so that instead of `lvm <foo>' you can directly 
    115 # run `<foo>'. 
    11675define Package/lvm2/install 
    11776        $(INSTALL_DIR) $(1)/sbin 
    118         $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/lvm $(1)/sbin/ 
     77        $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/lvm $(1)/sbin 
    11978        $(INSTALL_DIR) $(1)/etc/lvm 
    120         $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/example.conf $(1)/etc/lvm/lvm.conf 
     79        $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/example.conf $(1)/etc/lvm/lvm.conf 
    12180        $(INSTALL_DIR) $(1)/etc/init.d 
    12281        $(INSTALL_BIN) ./files/lvm2.init $(1)/etc/init.d/lvm2 
Note: See TracChangeset for help on using the changeset viewer.