mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-27 15:54:04 +02:00
e2fsprogs fixes:
- don't bundle libblkid shared lib in e2fsprogs, add a dependency instead - remove references to host dev files in pkgconfig files - add Build/UninstallDev git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8486 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
1676e90a34
commit
866de10b88
@ -22,7 +22,7 @@ define Package/e2fsprogs
|
||||
SECTION:=utils
|
||||
CATEGORY:=Utilities
|
||||
TITLE:=Ext2/3 filesystem utilities
|
||||
DEPENDS:=+libuuid
|
||||
DEPENDS:=+libblkid +libuuid
|
||||
DESCRIPTION:=\
|
||||
This package contains essential ext2 filesystem utilities which consists of \\\
|
||||
e2fsck, mke2fs, debugfs, dumpe2fs, tune2fs, and most of the other core ext2 \\\
|
||||
@ -92,6 +92,15 @@ define Build/InstallDev
|
||||
BUILDCC="$(HOSTCC)" \
|
||||
DESTDIR="$(STAGING_DIR)" \
|
||||
install-libs
|
||||
$(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/{blkid,com_err,e2p,ext2fs,ss,uuid}.pc
|
||||
$(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/{blkid,com_err,e2p,ext2fs,ss,uuid}.pc
|
||||
endef
|
||||
|
||||
define Build/UninstallDev
|
||||
-$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||
BUILDCC="$(HOSTCC)" \
|
||||
DESTDIR="$(STAGING_DIR)" \
|
||||
uninstall-libs
|
||||
endef
|
||||
|
||||
define Package/e2fsprogs/install
|
||||
@ -101,7 +110,7 @@ define Package/e2fsprogs/install
|
||||
ln -sf mke2fs $(1)/usr/sbin/mkfs.ext2
|
||||
ln -sf mke2fs $(1)/usr/sbin/mkfs.ext3
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(CP) $(foreach lib,blkid com_err e2p ext2fs,$(PKG_INSTALL_DIR)/usr/lib/lib$(lib).so.*) $(1)/usr/lib/
|
||||
$(CP) $(foreach lib,com_err e2p ext2fs,$(PKG_INSTALL_DIR)/usr/lib/lib$(lib).so.*) $(1)/usr/lib/
|
||||
endef
|
||||
|
||||
define Package/libuuid/install
|
||||
|
Loading…
Reference in New Issue
Block a user