Commit 6b057362 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

e2fsprogs: install into staging so other stuff can find the libs/includes 

And explicitly install the libuuid headers. Needed for the gupnp stuff in #35.
parent 582ff239

package/e2fsprogs/e2fsprogs.mk

+8 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ $(E2FSPROGS_DIR)/.configured: $(E2FSPROGS_DIR)/.unpacked 
		--exec-prefix=/usr \

		--bindir=/bin \

		--sbindir=/sbin \

		--libdir=/lib \

		--libdir=/usr/lib \

		--libexecdir=/usr/lib \

		--sysconfdir=/etc \

		--datadir=/usr/share \
@@ -69,6 +69,12 @@ $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY): $(E2FSPROGS_DIR)/.configured 
	#$(STRIPCMD) $(E2FSPROGS_DIR)/lib/lib*.so.*.*

	touch -c $@



$(STAGING_DIR)/$(E2FSPROGS_TARGET_BINARY): $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY)

	$(MAKE1) PATH=$(TARGET_PATH) DESTDIR=$(STAGING_DIR) LDCONFIG=true \

		-C $(E2FSPROGS_DIR) install

	$(MAKE1) PATH=$(TARGET_PATH) DESTDIR=$(STAGING_DIR) LDCONFIG=true \

		-C $(E2FSPROGS_DIR)/lib/uuid install



E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += ${TARGET_DIR}/sbin/badblocks

E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_BLKID) += ${TARGET_DIR}/sbin/blkid

E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_CHATTR) += ${TARGET_DIR}/bin/chattr
@@ -83,7 +89,7 @@ E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_MKE2FS) += ${TARGET_DIR}/sbin/mke2fs 
E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND) += ${TARGET_DIR}/sbin/mklost+found

E2FSPROGS_RM$(BR2_PACKAGE_E2FSPROGS_UUIDGEN) += ${TARGET_DIR}/bin/uuidgen



$(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY): $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY)

$(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY): $(STAGING_DIR)/$(E2FSPROGS_TARGET_BINARY)

	$(MAKE1) PATH=$(TARGET_PATH) DESTDIR=$(TARGET_DIR) LDCONFIG=true \

		-C $(E2FSPROGS_DIR) install

	rm -rf ${TARGET_DIR}/sbin/mkfs.ext[234] \