From 236f477f0a88998e8d751660736f5c5e622b17f4 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 17 Jun 2014 22:41:25 +0200
Subject: enabling XATTR is broken, missing acl.h, fix ubi dependencies

---
 package/mtd-utils/Makefile | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'package/mtd-utils')

diff --git a/package/mtd-utils/Makefile b/package/mtd-utils/Makefile
index ce10bc777..c4d699dc4 100644
--- a/package/mtd-utils/Makefile
+++ b/package/mtd-utils/Makefile
@@ -9,11 +9,10 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		fd929de593acadd658d45feb07f993aa
 PKG_DESCR:=		flash filesystem utilities
 PKG_SECTION:=		sys/fs
-PKG_DEPENDS:=		liblzo
-PKG_BUILDDEP:=		liblzo
 HOST_BUILDDEP:=		liblzo-host
 PKG_URL:=		http://www.linux-mtd.infradead.org
 PKG_SITES:=		http://git.infradead.org/mtd-utils.git/snapshot/
+
 DISTFILES:=             ca39eb1d98e736109c64ff9c1aa2a6ecca222d8f.tar.gz
 WRKDIST=		${WRKDIR}/mtd-utils-ca39eb1
 
@@ -26,14 +25,13 @@ PKGSD_FLASH_OTP_INFO:=	mtd-utils flash_otp_info utility
 PKGSD_FLASH_OTP_DUMP:=	mtd-utils flash_otp_dump utility
 PKGSD_FLASH_LOCK:=	mtd-utils flash_lock/flash_unlock utilities
 
-PKG_CFLINE_MTD_UTILS:= depends on ADK_HOST_ONLY
-
-PKG_FLAVOURS_MTD_UTILS:= WITH_XATTR WITH_LZO WITH_UBIFS
-PKGFD_WITH_XATTR:=	enable support for extended attributes
-PKGFD_WITH_LZO:=	enable LZO support
+PKG_FLAVOURS_MTD_UTILS:=WITH_LZO WITH_UBIFS
+PKGFD_WITH_LZO:=	enable lzo support
+PKGFS_WITH_LZO:=	liblzo
+PKGFB_WITH_LZO:=	liblzo
 PKGFD_WITH_UBIFS:=	enable ubifs support
-PKGFS_WITH_UBIFS:=	liblzo
-PKGFB_WITH_UBIFS:=	liblzo
+PKGFS_WITH_UBIFS:=	libuuid
+PKGFB_WITH_UBIFS:=	util-linux
 
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
@@ -61,9 +59,7 @@ mtd-utils-hostinstall:
 		${STAGING_HOST_DIR}/usr/bin
 
 CONFIG_STYLE:=		manual
-ifneq (${ADK_PACKAGE_MTD_UTILS_WITH_XATTR},y)
 XAKE_FLAGS+=		WITHOUT_XATTR=1
-endif
 ifneq (${ADK_PACKAGE_MTD_UTILS_WITH_LZO},y)
 XAKE_FLAGS+=		WITHOUT_LZO=1
 endif
@@ -72,29 +68,43 @@ XAKE_FLAGS+=		WITHOUT_UBI=1
 endif
 XAKE_FLAGS+=		BUILDDIR="${WRKDIST}"
 
-post-install:
+mtd-utils-install:
 	$(INSTALL_DIR) $(IDIR_MTD_UTILS)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/sbin/{doc,flash_otp_,ftl_,nftl,rfd}* \
 		${WRKINST}/usr/sbin/{flashcp,jffs2dump,mkfs.jffs2,mtd_debug,recv_image,serve_image,sumtool} \
 		$(IDIR_MTD_UTILS)/usr/bin
+
+nandwrite-install:
 	$(INSTALL_DIR) $(IDIR_NANDWRITE)/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/nandwrite \
 		${IDIR_NANDWRITE}/usr/sbin
+
+nanddump-install:
 	$(INSTALL_DIR) $(IDIR_NANDDUMP)/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/nanddump \
 		${IDIR_NANDDUMP}/usr/sbin
+
+nandtest-install:
 	$(INSTALL_DIR) $(IDIR_NANDTEST)/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/nandtest \
 		${IDIR_NANDTEST}/usr/sbin
+
+flash-erase-install:
 	$(INSTALL_DIR) $(IDIR_FLASH_ERASE)/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/flash_erase \
 		${IDIR_FLASH_ERASE}/usr/sbin
+
+flash-otp-info-install:
 	$(INSTALL_DIR) $(IDIR_FLASH_OTP_INFO)/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/flash_otp_info \
 		${IDIR_FLASH_OTP_INFO}/usr/sbin
+
+flash-otp-dump-install:
 	$(INSTALL_DIR) $(IDIR_FLASH_OTP_DUMP)/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/flash_otp_dump \
 		${IDIR_FLASH_OTP_DUMP}/usr/sbin
+
+flash-lock-install:
 	$(INSTALL_DIR) $(IDIR_FLASH_LOCK)/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/flash_{lock,unlock} \
 		${IDIR_FLASH_LOCK}/usr/sbin
-- 
cgit v1.2.3