Commit 666d7e2e authored by Romain Naour's avatar Romain Naour Committed by Peter Korsgaard
Browse files

package/mtd: install libubi.a and libmtd.a to staging 



Currently, the mtd package only installs the mtd utilities into the
target directory. However, the mtd-utils also provide two
static libraries (libmtd.a and libubi.a) that can be used by other
packages or tools.

Therefore, this commit extends the mtd package by adding the
installation to the staging directory of those two libraries.

Signed-off-by: default avatarRomain Naour <romain.naour@openwide.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 6f6a6222

package/mtd/mtd.mk

+9 −5
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils 
MTD_LICENSE = GPLv2

MTD_LICENSE_FILES = COPYING



MTD_INSTALL_STAGING = YES



ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)

MTD_DEPENDENCIES = zlib lzo

endif
@@ -36,6 +38,7 @@ endef 
MKFS_JFFS2 = $(HOST_DIR)/usr/sbin/mkfs.jffs2

SUMTOOL = $(HOST_DIR)/usr/sbin/sumtool



MTD_STAGING_y = lib/libmtd.a ubi-utils/libubi.a

MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK)		+= docfdisk

MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS)	+= doc_loadbios

MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP)		+= flashcp
@@ -79,16 +82,17 @@ MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIBLOCK) += ubiblock 
MTD_TARGETS_y += $(addprefix ubi-utils/,$(MTD_TARGETS_UBI_y))

MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSUBIFS) += mkfs.ubifs/mkfs.ubifs



# only call make if atleast a single tool is enabled

ifneq ($(MTD_TARGETS_y),)



define MTD_BUILD_CMDS

	$(TARGET_CONFIGURE_OPTS) $(MAKE1) CROSS=$(TARGET_CROSS) \

		BUILDDIR=$(@D) WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1 -C $(@D) \

		$(addprefix $(@D)/,$(MTD_TARGETS_y))

		$(addprefix $(@D)/,$(MTD_TARGETS_y)) \

		$(addprefix $(@D)/,$(MTD_STAGING_y))

endef



endif

define MTD_INSTALL_STAGING_CMDS

	$(INSTALL) -D -m 0755 $(@D)/lib/libmtd.a $(STAGING_DIR)/usr/lib/libmtd.a

	$(INSTALL) -D -m 0755 $(@D)/ubi-utils/libubi.a $(STAGING_DIR)/usr/lib/libubi.a

endef



define MTD_INSTALL_TARGET_CMDS

 for f in $(MTD_TARGETS_y) ; do \