util-linux: update to 2.29, install libs to /usr/lib and fixup pc files

5 files changed, 64 insertions, 10 deletions

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 2c6f60c52..1b73f505b 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -4,14 +4,14 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		util-linux
-PKG_VERSION:=		2.28.2
-PKG_RELEASE:=		2
-PKG_HASH:=		b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd
+PKG_VERSION:=		2.29
+PKG_RELEASE:=		1
+PKG_HASH:=		2c59ea67cc7b564104f60532f6e0a95fe17a91acb870ba8fd7e986f273abf9e7
 PKG_DESCR:=		basic utilities
 PKG_SECTION:=		base/apps
 PKG_BUILDDEP:=		ncurses
 PKG_NEEDS:=		threads
-PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.28/
+PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.29/
 PKG_OPTS:=		dev
 
 PKG_SUBPKGS:=		FDISK AGETTY SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT
@@ -70,7 +70,9 @@ $(eval $(call PKG_template,LIBMOUNT,libmount,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG
 TARGET_CFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK
 TARGET_LDFLAGS+=	-ltinfo
 
-CONFIGURE_ARGS+=	--with-pic \
+CONFIGURE_ARGS+=	--exec-prefix=/usr \
+			--libdir=/usr/lib \
+			--with-pic \
 			--disable-use-tty-group \
 			--disable-chfn-chsh \
 			--disable-more \
@@ -144,20 +146,20 @@ mcookie-install:
 
 libuuid-install:
 	$(INSTALL_DIR) $(IDIR_LIBUUID)/usr/lib
-	$(CP) $(WRKINST)/lib/libuuid.so* $(IDIR_LIBUUID)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libuuid.so* $(IDIR_LIBUUID)/usr/lib
 
 libblkid-install:
 	$(INSTALL_DIR) $(IDIR_LIBBLKID)/usr/lib
-	$(CP) $(WRKINST)/lib/libblkid.so* $(IDIR_LIBBLKID)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libblkid.so* $(IDIR_LIBBLKID)/usr/lib
 
 libfdisk-install:
 	$(INSTALL_DIR) $(IDIR_LIBFDISK)/usr/lib
-	$(CP) $(WRKINST)/lib/libfdisk.so* $(IDIR_LIBFDISK)/usr/lib
-	$(CP) $(WRKINST)/lib/libsmartcols.so* $(IDIR_LIBFDISK)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libfdisk.so* $(IDIR_LIBFDISK)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libsmartcols.so* $(IDIR_LIBFDISK)/usr/lib
 
 libmount-install:
 	$(INSTALL_DIR) $(IDIR_LIBMOUNT)/usr/lib
-	$(CP) $(WRKINST)/lib/libmount.so* $(IDIR_LIBMOUNT)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libmount.so* $(IDIR_LIBMOUNT)/usr/lib
 
 include $(ADK_TOPDIR)/mk/host-bottom.mk
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk
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..ec9b04ec3
--- /dev/null
+++ b/package/util-linux/patches/patch-libblkid_blkid_pc_in
@@ -0,0 +1,13 @@
+--- util-linux-2.29.orig/libblkid/blkid.pc.in	2016-05-31 11:45:28.600661352 +0200
++++ util-linux-2.29/libblkid/blkid.pc.in	2016-11-18 19:35:38.688868539 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@usrlib_execdir@
+-includedir=@includedir@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: blkid
+ Description: Block device id library
diff --git a/package/util-linux/patches/patch-libfdisk_fdisk_pc_in b/package/util-linux/patches/patch-libfdisk_fdisk_pc_in
new file mode 100644
index 000000000..50a7c9125
--- /dev/null
+++ b/package/util-linux/patches/patch-libfdisk_fdisk_pc_in
@@ -0,0 +1,13 @@
+--- util-linux-2.29.orig/libfdisk/fdisk.pc.in	2016-11-02 13:57:31.548167878 +0100
++++ util-linux-2.29/libfdisk/fdisk.pc.in	2016-11-18 19:36:11.374132281 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@usrlib_execdir@
+-includedir=@includedir@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: fdisk
+ Description: fdisk library
diff --git a/package/util-linux/patches/patch-libmount_mount_pc_in b/package/util-linux/patches/patch-libmount_mount_pc_in
new file mode 100644
index 000000000..65c9aadc3
--- /dev/null
+++ b/package/util-linux/patches/patch-libmount_mount_pc_in
@@ -0,0 +1,13 @@
+--- util-linux-2.29.orig/libmount/mount.pc.in	2016-05-31 11:45:28.610661283 +0200
++++ util-linux-2.29/libmount/mount.pc.in	2016-11-18 19:35:55.525519512 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@usrlib_execdir@
+-includedir=@includedir@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: mount
+ Description: mount library
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..c5fe2706d
--- /dev/null
+++ b/package/util-linux/patches/patch-libuuid_uuid_pc_in
@@ -0,0 +1,13 @@
+--- util-linux-2.29.orig/libuuid/uuid.pc.in	2016-05-31 11:45:28.620661213 +0200
++++ util-linux-2.29/libuuid/uuid.pc.in	2016-11-18 19:36:25.010659524 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@usrlib_execdir@
+-includedir=@includedir@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: uuid
+ Description: Universally unique id library