mtd-utils cleanup
PATCH 1/1 mtd-utils cleanup
Hi
I wanted to clean mtd-utils situation a bit. All versions older then 1.1.0 (used by SlugOS) were dropped and 1.2.0+git are default now.
Next part is move of mkfs.ubifs into separate package (like we have with mkfs.jffs2). This was done to get rid of lzo & e2fsprogs-libs dependency from resulting 'mtd-utils' package (those libraries are only used by mkfs.ubifs binary).
I also updated mtd-utils-tests to 1.2.0+git version.
Please test and ack/nack it.
PATCH 1/3 mtd: dropped 1.0.0(+git) versions
From: Marcin Juszkiewicz <[email protected]>
--- recipes/mtd/mtd-utils-native_1.0.0+git.bb | 3 -- recipes/mtd/mtd-utils-native_1.0.0.bb | 2 - recipes/mtd/mtd-utils_1.0.0+git.bb | 51 ----------------------------- recipes/mtd/mtd-utils_1.0.0.bb | 19 ----------- 4 files changed, 0 insertions(+), 75 deletions(-) delete mode 100644 recipes/mtd/mtd-utils-native_1.0.0+git.bb delete mode 100644 recipes/mtd/mtd-utils-native_1.0.0.bb delete mode 100644 recipes/mtd/mtd-utils_1.0.0+git.bb delete mode 100644 recipes/mtd/mtd-utils_1.0.0.bb
recipes/mtd/mtd-utils-native_1.0.0+git.bb deleted +0 -3
@@ -1,3 +0,0 @@ -require mtd-utils_${PV}.bb -require mtd-utils-native.inc -
recipes/mtd/mtd-utils-native_1.0.0.bb deleted +0 -2
@@ -1,2 +0,0 @@ -require mtd-utils_${PV}.bb -require mtd-utils-native.inc
recipes/mtd/mtd-utils_1.0.0+git.bb deleted +0 -51
51 lines not on this page · raw message
recipes/mtd/mtd-utils_1.0.0.bb deleted +0 -19
@@ -1,19 +0,0 @@ -DESCRIPTION = "Tools for managing memory technology devices." -SECTION = "base" -DEPENDS = "zlib" -HOMEPAGE = "http://www.linux-mtd.infradead.org/" -LICENSE = "GPLv2" -PR = "r0" - -# RP/kergoth: Builds seem to break with recent mtd-utils -# Can't pin down the exact problems -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.0.0.tar.gz" -S = "${WORKDIR}/mtd-utils-${PV}" - -CFLAGS_prepend = "-I${WORKDIR}/mtd-utils-${PV}/include " - -do_install() { - oe_runmake install DESTDIR=${D} -}
Signature · 1 line
1.6.2.1
PATCH 2/3 mtd-utils: unify recipes, move mkfs.ubifs into separate package
From: Marcin Juszkiewicz <[email protected]>
mtd-utils package do not depend on libraries other then libc and libgcc now (ubifs depends on lzo and e2fsprogs)
--- recipes/mtd/mtd-utils.inc | 83 +++++++++++++++++++++++++++++++++ recipes/mtd/mtd-utils_1.1.0.bb | 48 ++----------------- recipes/mtd/mtd-utils_1.2.0+git.bb | 89 +++--------------------------------- 3 files changed, 95 insertions(+), 125 deletions(-) create mode 100644 recipes/mtd/mtd-utils.inc
recipes/mtd/mtd-utils.inc new file +83 -0
@@ -0,0 +1,83 @@ +DESCRIPTION = "Tools for managing memory technology devices." +SECTION = "base" +DEPENDS = "zlib lzo" +HOMEPAGE = "http://www.linux-mtd.infradead.org/" +LICENSE = "GPLv2" +PR = "r0" + +SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-${PV}.tar.bz2" + +S = "${WORKDIR}/mtd-utils-${PV}" + +EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'" + +do_stage () { + install -d ${STAGING_INCDIR}/mtd + for f in ${S}/include/mtd/*.h; do + install -m 0644 $f ${STAGING_INCDIR}/mtd/ + done + for binary in ${mtd_utils}; do + install -m 0755 $binary ${STAGING_BINDIR} + done +} + +do_install () { + install -d ${D}${bindir} + install -d ${D}${includedir}/mtd + for binary in ${mtd_utils}; do + install -m 0755 $binary ${D}${bindir} + done + for f in ${S}/include/mtd/*.h; do + install -m 0644 $f ${D}${includedir}/mtd + done +} + +mtd_utils = " docfdisk \ + doc_loadbios \ + flashcp \ + flash_erase \ + flash_eraseall \ + flash_info \ + flash_lock \ + flash_otp_dump \ + flash_otp_info \ + flash_unlock \ + ftl_check \ + ftl_format \ + jffs2dump \ + mkfs.jffs2 \ + mtd_debug \ + nanddump \ + nandtest \ + nandwrite \ + nftldump \ + nftl_format \ + recv_image \ + rfddump \ + rfdformat \ + serve_image \ + sumtool \ + mkfs.ubifs/mkfs.ubifs \ + ubi-utils/bin2nand \ + ubi-utils/mkbootenv \ + ubi-utils/nand2bin \ + ubi-utils/pddcustomize \ + ubi-utils/pfi2bin \ + ubi-utils/pfiflash \ + ubi-utils/ubigen \ + ubi-utils/ubimirror \ + ubi-utils/unubi \ + ubi-utils/new-utils/ubiattach \ + ubi-utils/new-utils/ubicrc32 \ + ubi-utils/new-utils/ubidetach \ + ubi-utils/new-utils/ubiformat \ + ubi-utils/new-utils/ubimkvol \ + ubi-utils/new-utils/ubinfo \ + ubi-utils/new-utils/ubinize \ + ubi-utils/new-utils/ubirmvol \ + ubi-utils/new-utils/ubiupdatevol" + +PACKAGES =+ "mkfs-jffs mkfs-jffs2 mkfs-ubifs" +FILES_mkfs-jffs = "${bindir}/mkfs.jffs" +FILES_mkfs-jffs2 = "${bindir}/mkfs.jffs2" +FILES_mkfs-ubifs = "${bindir}/mkfs.ubifs"
recipes/mtd/mtd-utils_1.1.0.bb +5 -43
50 lines not on this page · raw message
recipes/mtd/mtd-utils_1.2.0+git.bb +7 -82
100 lines not on this page · raw message
Signature · 1 line
1.6.2.1
PATCH 3/3 mtd-utils-tests: update to 1.2.0+git
From: Marcin Juszkiewicz <[email protected]>
---
...s_1.0.0+git.bb => mtd-utils-tests_1.2.0+git.bb} | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
rename recipes/mtd/{mtd-utils-tests_1.0.0+git.bb => mtd-utils-tests_1.2.0+git.bb} (97%)recipes/mtd/mtd-utils-tests_1.2.0+git.bb renamed from recipes/mtd/mtd-utils-tests_1.0.0+git.bb +1 -1
@@ -1,4 +1,4 @@ -require mtd-utils_1.0.0+git.bb +require mtd-utils_1.2.0+git.bb # this can probably be integrated into the main mtd-utils package # but I did not want to risk breakage -- but would be glad to
Signature · 1 line
1.6.2.1
Re: [PATCH 3/3] mtd-utils-tests: update to 1.2.0+git
Awesome. +1
Signature · 1 line
:M:
Quoted 9 lines · Marcin Juszkiewicz
Hi
I wanted to clean mtd-utils situation a bit. All versions older then 1.1.0 (used by SlugOS) were dropped and 1.2.0+git are default now.
Next part is move of mkfs.ubifs into separate package (like we have with mkfs.jffs2). This was done to get rid of lzo & e2fsprogs-libs dependency from resulting 'mtd-utils' package (those libraries are only used by mkfs.ubifs binary).
As a further cleanup, making a package of the NAND stuff and a package of the rest of the UBI utils might make sense, if you're so inclined. But for what's here now +1
Signature · 1 line
Tom Rini