>From 0a2d389843c104f919a31d444639cfcb32b2d3f9 Mon Sep 17 00:00:00 2001
From: Gergely Kiss <[email protected]>
Date: Sat, 3 Jan 2015 19:09:43 +0100
Subject: [PATCH] util-linux: fix packaging issues

Signed-off-by: Gergely Kiss <[email protected]>
Tested-by: Gergely Kiss <[email protected]>
---

Hi Guys,

contributing some slight fixes for util-linux:

* losetup: missing dependency added
* losetup: include the binary in the package instead of the libtool wrapper 
script
* shared libraries: include all the symlink variations in the packages

I'd advise to nominate a maintainer for the util-linux package,
PKG_MAINTAINER is not currently set in the Makefile.


Thanks,
Gergely

 package/utils/util-linux/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/package/utils/util-linux/Makefile 
b/package/utils/util-linux/Makefile
index 70a865c..7ce3a77 100644
--- a/package/utils/util-linux/Makefile
+++ b/package/utils/util-linux/Makefile
@@ -248,6 +248,7 @@ endef
 define Package/losetup
 $(call Package/util-linux/Default)
   TITLE:=set up and control loop devices
+  DEPENDS:= +libsmartcols
 endef
 
 define Package/losetup/description
@@ -422,22 +423,22 @@ endef
 
 define Package/libblkid/install
         $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/.libs/libblkid.so.* $(1)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/.libs/libblkid.so* $(1)/usr/lib/
 endef
 
 define Package/libmount/install
         $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/.libs/libmount.so.* $(1)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/.libs/libmount.so* $(1)/usr/lib/
 endef
 
 define Package/libsmartcols/install
         $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/.libs/libsmartcols.so.* $(1)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/.libs/libsmartcols.so* $(1)/usr/lib/
 endef
 
 define Package/libuuid/install
         $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/.libs/libuuid.so.* $(1)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/.libs/libuuid.so* $(1)/usr/lib/
 endef
 
 define Package/agetty/install
@@ -502,7 +503,7 @@ endef
 
 define Package/losetup/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/losetup $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/losetup $(1)/usr/sbin/
 endef
 
 define Package/lsblk/install
-- 
1.8.3.1
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Reply via email to