aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2015-01-05 10:11:28 +0000
committerSteven Barth <steven@midlink.org>2015-01-05 10:11:28 +0000
commit2aff2f335b70f587e5413c00144dc2579b53f2ab (patch)
treeed3fadc9724b30eef01a59864549b00105dc6130
parentb1446f3173e48b116f7deb56fb4f12ed07fa1850 (diff)
downloadupstream-2aff2f335b70f587e5413c00144dc2579b53f2ab.tar.gz
upstream-2aff2f335b70f587e5413c00144dc2579b53f2ab.tar.bz2
upstream-2aff2f335b70f587e5413c00144dc2579b53f2ab.zip
util-linux: fix packaging issues
Signed-off-by: Gergely Kiss <mail.gery@gmail.com> Tested-by: Gergely Kiss <mail.gery@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43828 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/utils/util-linux/Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile
index 70a865c9003..7ce3a774cc5 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
185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277