diff options
| -rw-r--r-- | package/lvm/Makefile | 3 | ||||
| -rw-r--r-- | package/lvm/patches/patch-libdm_Makefile_in | 24 | ||||
| -rw-r--r-- | package/util-linux/Makefile | 2 | ||||
| -rw-r--r-- | package/util-linux/patches/patch-libblkid_blkid_pc_in | 16 | ||||
| -rw-r--r-- | package/util-linux/patches/patch-libuuid_uuid_pc_in | 16 | ||||
| -rw-r--r-- | package/util-linux/patches/patch-misc-utils_uuidd_8 | 20 |
6 files changed, 79 insertions, 2 deletions
diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 401855955..aa3f5eca8 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -5,11 +5,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= lvm PKG_VERSION:= 2.02.106 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 77f84279fb649b3dc4edad1c6d1a1b0e PKG_DESCR:= logical volume management PKG_SECTION:= fs PKG_DEPENDS:= libdevmapper libncurses +PKG_BUILDDEP:= ncurses util-linux PKG_URL:= http://sourceware.org/lvm2/ PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/ PKG_LIBNAME:= libdevmapper diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in new file mode 100644 index 000000000..2f1ade6c4 --- /dev/null +++ b/package/lvm/patches/patch-libdm_Makefile_in @@ -0,0 +1,24 @@ +--- LVM2.2.02.106.orig/libdm/Makefile.in 2014-04-10 17:38:45.000000000 +0200 ++++ LVM2.2.02.106/libdm/Makefile.in 2014-05-24 12:42:42.819190264 +0200 +@@ -39,10 +39,7 @@ INCLUDES += @VALGRIND_CFLAGS@ + endif + CFLAGS += $(UDEV_CFLAGS) + +-ifeq ("@STATIC_LINK@", "yes") + LIB_STATIC = $(interface)/libdevmapper.a +-endif +- + LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX) + LIB_VERSION = $(LIB_VERSION_DM) + TARGETS += libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) +@@ -71,9 +68,7 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper. + + INSTALL_TYPE = install_dynamic + +-ifeq ("@STATIC_LINK@", "yes") +- INSTALL_TYPE += install_static +-endif ++INSTALL_TYPE += install_static + + ifeq ("@PKGCONFIG@", "yes") + INSTALL_TYPE += install_pkgconfig diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 01976cb6d..129584e6d 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= util-linux PKG_VERSION:= 2.24.2 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 3f191727a0d28f7204b755cf1b6ea0aa PKG_DESCR:= basic Linux utilities PKG_SECTION:= core diff --git a/package/util-linux/patches/patch-libblkid_blkid_pc_in b/package/util-linux/patches/patch-libblkid_blkid_pc_in new file mode 100644 index 000000000..b9abbbb9e --- /dev/null +++ b/package/util-linux/patches/patch-libblkid_blkid_pc_in @@ -0,0 +1,16 @@ +--- util-linux-2.24.2.orig/libblkid/blkid.pc.in 2013-02-27 17:46:29.858020511 +0100 ++++ util-linux-2.24.2/libblkid/blkid.pc.in 2014-05-24 12:49:28.928809032 +0200 +@@ -1,11 +1,8 @@ + prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@usrlib_execdir@ +-includedir=@includedir@ + + Name: blkid + Description: Block device id library + Version: @LIBBLKID_VERSION@ + Requires.private: uuid +-Cflags: -I${includedir}/blkid +-Libs: -L${libdir} -lblkid ++Cflags: -I${prefix}/include/blkid ++Libs: -L${prefix}/lib -lblkid diff --git a/package/util-linux/patches/patch-libuuid_uuid_pc_in b/package/util-linux/patches/patch-libuuid_uuid_pc_in new file mode 100644 index 000000000..010f3cffe --- /dev/null +++ b/package/util-linux/patches/patch-libuuid_uuid_pc_in @@ -0,0 +1,16 @@ +--- util-linux-2.24.2.orig/libuuid/uuid.pc.in 2013-02-27 17:46:29.883020734 +0100 ++++ util-linux-2.24.2/libuuid/uuid.pc.in 2014-05-24 12:50:07.644975668 +0200 +@@ -1,11 +1,8 @@ + prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@usrlib_execdir@ +-includedir=@includedir@ + + Name: uuid + Description: Universally unique id library + Version: @LIBUUID_VERSION@ + Requires: +-Cflags: -I${includedir}/uuid +-Libs: -L${libdir} -luuid ++Cflags: -I${prefix}/include/uuid ++Libs: -L${prefix}/lib -luuid diff --git a/package/util-linux/patches/patch-misc-utils_uuidd_8 b/package/util-linux/patches/patch-misc-utils_uuidd_8 new file mode 100644 index 000000000..0b16a57f5 --- /dev/null +++ b/package/util-linux/patches/patch-misc-utils_uuidd_8 @@ -0,0 +1,20 @@ +--- util-linux-2.24.2.orig/misc-utils/uuidd.8 2014-04-24 11:25:49.089462731 +0200 ++++ util-linux-2.24.2/misc-utils/uuidd.8 2014-05-19 15:36:26.182277055 +0200 +@@ -34,7 +34,7 @@ UUIDs. + .TP + .BR \-p , " \-\-pid " \fIpath\fR + Specify the pathname where the pid file should be written. By default, +-the pid file is written to /run/uuidd/uuidd.pid. ++the pid file is written to /var/uuidd/uuidd.pid. + .TP + .BR \-P , " \-\-no-pid " + Do not create pid file. +@@ -57,7 +57,7 @@ request it to return a random-based UUID + .TP + .BR \-s , " \-\-socket " \fIpath\fR + Specify the pathname used for the unix-domain socket used by uuidd. By +-default, the pathname used is /run/uuidd/request. This is primarily ++default, the pathname used is /var/uuidd/request. This is primarily + for debugging purposes, since the pathname is hard-coded in the libuuid + library. + .TP |