CVS commit: pkgsrc/filesystems

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Mon Oct  7 10:13:16 UTC 2019

Modified Files:
        pkgsrc/filesystems: Makefile
Added Files:
        pkgsrc/filesystems/mkspiffs: DESCR Makefile PLIST distinfo
        pkgsrc/filesystems/mkspiffs/patches: patch-Makefile

Log Message:
Add mkspiffs 0.2.3

Tool to build and unpack SPIFFS images.
This package provides binaries built with the following configuration:
mkspiffs-arduino-esp32: configuration compatible with the Espressif ESP32
    arduino developpement environnement
mkspiffs-arduino-esp8266: configuration compatible with the Espressif ESP8266
    arduino developpement environnement
mkspiffs-esp-idf: configuration compatible with the Espressif IoT Development
    Framework
mkspiffs-generic: configuration using the default SPIFFS parameters


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/filesystems/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/filesystems/mkspiffs/DESCR \
    pkgsrc/filesystems/mkspiffs/Makefile pkgsrc/filesystems/mkspiffs/PLIST \
    pkgsrc/filesystems/mkspiffs/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/filesystems/mkspiffs/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/filesystems/Makefile
diff -u pkgsrc/filesystems/Makefile:1.47 pkgsrc/filesystems/Makefile:1.48
--- pkgsrc/filesystems/Makefile:1.47    Fri Apr  5 19:33:53 2019
+++ pkgsrc/filesystems/Makefile Mon Oct  7 10:13:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2019/04/05 19:33:53 maya Exp $
+# $NetBSD: Makefile,v 1.48 2019/10/07 10:13:16 bouyer Exp $
 #
 
 COMMENT=       File systems, and file system related packages
@@ -40,6 +40,7 @@ SUBDIR+=      glusterfs
 SUBDIR+=       libntfs
 SUBDIR+=       ltfs
 SUBDIR+=       ltfs-ltotape
+SUBDIR+=       mkspiffs
 SUBDIR+=       openafs
 SUBDIR+=       openafs-devel
 SUBDIR+=       ori

Added files:

Index: pkgsrc/filesystems/mkspiffs/DESCR
diff -u /dev/null pkgsrc/filesystems/mkspiffs/DESCR:1.1
--- /dev/null   Mon Oct  7 10:13:16 2019
+++ pkgsrc/filesystems/mkspiffs/DESCR   Mon Oct  7 10:13:16 2019
@@ -0,0 +1,9 @@
+Tool to build and unpack SPIFFS images.
+This package provides binaries built with the following configuration:
+mkspiffs-arduino-esp32: configuration compatible with the Espressif ESP32
+    arduino developpement environnement
+mkspiffs-arduino-esp8266: configuration compatible with the Espressif ESP8266
+    arduino developpement environnement
+mkspiffs-esp-idf: configuration compatible with the Espressif IoT Development
+    Framework
+mkspiffs-generic: configuration using the default SPIFFS parameters
Index: pkgsrc/filesystems/mkspiffs/Makefile
diff -u /dev/null pkgsrc/filesystems/mkspiffs/Makefile:1.1
--- /dev/null   Mon Oct  7 10:13:16 2019
+++ pkgsrc/filesystems/mkspiffs/Makefile        Mon Oct  7 10:13:16 2019
@@ -0,0 +1,58 @@
+# $NetBSD: Makefile,v 1.1 2019/10/07 10:13:16 bouyer Exp $
+
+VERSION=       0.2.3
+DISTNAME=      mkspiffs-${VERSION}
+CATEGORIES=    filesystems
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=igrr/}
+GITHUB_TAG=    ${VERSION}
+
+DISTFILES=     ${DEFAULT_DISTFILES}
+
+SPIFFS=                spiffs-f5e26c4e933189593a71c6b82cda381a7b21e41c
+DISTFILES+=    ${SPIFFS}.tar.gz
+SITES.spiffs-f5e26c4e933189593a71c6b82cda381a7b21e41c.tar.gz= -https://github.com/pellepl/spiffs/archive/f5e26c4e933189593a71c6b82cda381a7b21e41c.tar.gz
+
+MAINTAINER=    bouyer%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/igrr/mkspiffs
+COMMENT=       Tool to build and unpack SPIFFS images
+LICENSE=       mit
+
+USE_TOOLS+=    gmake
+USE_LANGUAGES= c c++
+
+MAKE_ENV+=     TARGET_OS=NetBSD VERSION=${VERSION}
+
+INSTALLATION_DIRS=     bin
+
+post-extract:
+       ${RM} -r ${WRKSRC}/spiffs
+       ${CP} -r ${WRKDIR}/${SPIFFS} ${WRKSRC}/spiffs
+
+do-build:
+       cd ${WRKSRC} && \
+         env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} dist
+       cd ${WRKSRC} && \
+         env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} clean
+       cd ${WRKSRC} && \
+         env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} dist \
+           BUILD_CONFIG_NAME="-arduino-esp8266" \
+           CPPFLAGS="${CPPFLAGS} -DSPIFFS_USE_MAGIC_LENGTH=0 -DSPIFFS_ALIGNED_OBJECT_INDEX_TABLES=1"
+       cd ${WRKSRC} && \
+         env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} clean
+       cd ${WRKSRC} && \
+         env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} dist \
+           BUILD_CONFIG_NAME="-arduino-esp32" \
+           CPPFLAGS="${CPPFLAGS} -DSPIFFS_OBJ_META_LEN=4"
+       cd ${WRKSRC} && \
+         env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} clean
+       cd ${WRKSRC} && \
+         env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} dist \
+           BUILD_CONFIG_NAME="-esp-idf" \
+           CPPFLAGS="${CPPFLAGS} -DSPIFFS_OBJ_META_LEN=4"
+
+do-install:
+.for i in arduino-esp32 arduino-esp8266 esp-idf generic
+       ${INSTALL_PROGRAM} ${WRKSRC}/mkspiffs-${VERSION}-$i-${OPSYS}/mkspiffs ${DESTDIR}${PREFIX}/bin/mkspiffs-$i
+.endfor
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/filesystems/mkspiffs/PLIST
diff -u /dev/null pkgsrc/filesystems/mkspiffs/PLIST:1.1
--- /dev/null   Mon Oct  7 10:13:16 2019
+++ pkgsrc/filesystems/mkspiffs/PLIST   Mon Oct  7 10:13:16 2019
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1 2019/10/07 10:13:16 bouyer Exp $
+bin/mkspiffs-arduino-esp32
+bin/mkspiffs-arduino-esp8266
+bin/mkspiffs-esp-idf
+bin/mkspiffs-generic
Index: pkgsrc/filesystems/mkspiffs/distinfo
diff -u /dev/null pkgsrc/filesystems/mkspiffs/distinfo:1.1
--- /dev/null   Mon Oct  7 10:13:16 2019
+++ pkgsrc/filesystems/mkspiffs/distinfo        Mon Oct  7 10:13:16 2019
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1 2019/10/07 10:13:16 bouyer Exp $
+
+SHA1 (mkspiffs-0.2.3.tar.gz) = 273a30ea9132bb3493b60aefa04c62855834a3e7
+RMD160 (mkspiffs-0.2.3.tar.gz) = ee3201759d05094b870c5fe2db6a42c82351c63f
+SHA512 (mkspiffs-0.2.3.tar.gz) = 85ad7005440ae9788c5ba4c948c63546d1bffd68aad0f5ac942d80f260e8b260a54df8050d1b877ae46baaf44ce95b07fcd76968a667e914e1c6a9b043b069bd
+Size (mkspiffs-0.2.3.tar.gz) = 41903 bytes
+SHA1 (spiffs-f5e26c4e933189593a71c6b82cda381a7b21e41c.tar.gz) = 0e3180fe474ca09ee30651a2b8d7aad378daf0ae
+RMD160 (spiffs-f5e26c4e933189593a71c6b82cda381a7b21e41c.tar.gz) = 0b967ce77389f51df6b5b08489738a61c8aaa883
+SHA512 (spiffs-f5e26c4e933189593a71c6b82cda381a7b21e41c.tar.gz) = 242cf08fbd034912bd7f25295f08f2713b2f0339f1cd05994db5ade4c4d4ba40941e0d304db97a89916696d0a69f95505dfb9f1df8c2cec040f15bce988b79db
+Size (spiffs-f5e26c4e933189593a71c6b82cda381a7b21e41c.tar.gz) = 94267 bytes
+SHA1 (patch-Makefile) = 45ea09b7f3ebfe6c96036393e24d3f75501d5188

Index: pkgsrc/filesystems/mkspiffs/patches/patch-Makefile
diff -u /dev/null pkgsrc/filesystems/mkspiffs/patches/patch-Makefile:1.1
--- /dev/null   Mon Oct  7 10:13:16 2019
+++ pkgsrc/filesystems/mkspiffs/patches/patch-Makefile  Mon Oct  7 10:13:16 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile,v 1.1 2019/10/07 10:13:16 bouyer Exp $
+
+don't rely on git to find the version
+
+--- Makefile.orig      2019-10-02 23:49:32.283894050 +0200
++++ Makefile   2019-10-02 23:50:23.808967927 +0200
+@@ -53,8 +53,7 @@
+ endif
+ 
+ 
+-VERSION ?= $(shell git describe --always)
+-SPIFFS_VERSION := $(shell git -C spiffs describe --tags || echo "unknown")
++SPIFFS_VERSION := $(VERSION)
+ BUILD_CONFIG_NAME ?= -generic
+ 
+ OBJ           := main.o \