Pull request for branch yem-host-image-tools
Hello All!
This series adds a few host packages usefull for manipulating the generated filesystem images.
It is of much interest now that the post-image series from Thomas has been applied.
I plan on submitting sample post-{build,image} scripts demonstrating use of those packages in the (hopefuly near) future (my current scripts are working great, but need some cleanup first).
Changes v4 -> v5:
- add licensing terms (Thomas)
Changes v3 -> v4:
- rebased on master
Changes v2 -> v3:
- rebased onto the 'next' branch for Peter
Changes v1 -> v2:
- use $(HOST_CONFIGURE_OPTS) instead of hand-crafted CC et al. (Thomas)
- use $(BR2_GNU_MIRROR) (Thomas)
- strip superfluous spaces (Thomas)
The following changes since commit eaf746eb9e8b10d5ff5011a989014b3df4b31ddc:
zeromq: add PGM/EPGM support (2013-03-17 16:03:40 +0100)
are available in the git repository at:
git://gitorious.org/buildroot/buildroot.git yem-host-image-tools
Yann E. MORIN (6):
package/e2fsprogs: add host-package selection package/dosfstools: add host-package selection package/libconfuse: add host variant package/genimage: new host-only package package/genpart: new host-only package package/mtools: new host-package
package/Config.in.host | 5 +++++ package/dosfstools/Config.in.host | 6 ++++++ package/dosfstools/dosfstools.mk | 9 +++++++++ package/e2fsprogs/Config.in.host | 6 ++++++ package/genimage/Config.in.host | 12 ++++++++++++ package/genimage/genimage.mk | 13 +++++++++++++ package/genpart/Config.in.host | 8 ++++++++ package/genpart/genpart-fix-return-code.patch | 25 +++++++++++++++++++++++++ package/genpart/genpart.mk | 18 ++++++++++++++++++ package/libconfuse/libconfuse.mk | 1 + package/mtools/Config.in.host | 9 +++++++++ package/mtools/mtools.mk | 17 +++++++++++++++++ 12 files changed, 129 insertions(+), 0 deletions(-) create mode 100644 package/dosfstools/Config.in.host create mode 100644 package/e2fsprogs/Config.in.host create mode 100644 package/genimage/Config.in.host create mode 100644 package/genimage/genimage.mk create mode 100644 package/genpart/Config.in.host create mode 100644 package/genpart/genpart-fix-return-code.patch create mode 100644 package/genpart/genpart.mk create mode 100644 package/mtools/Config.in.host create mode 100644 package/mtools/mtools.mk
Regards,
Yann E. MORIN
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/6 package/e2fsprogs: add host-package selection
Add the e2fsprogs as a host-package selection in the menuconfig.
--- package/Config.in.host | 1 + package/e2fsprogs/Config.in.host | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) create mode 100644 package/e2fsprogs/Config.in.host
package/Config.in.host +1 -0
@@ -1,6 +1,7 @@ menu "Host utilities" source "package/dfu-util/Config.in.host" +source "package/e2fsprogs/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/omap-u-boot-utils/Config.in.host" source "package/openocd/Config.in.host"
package/e2fsprogs/Config.in.host new file +6 -0
@@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_E2FSPROGS + bool "host e2fsprogs" + help + The EXT2 file system utilities. + + http://e2fsprogs.sf.net
Signature · 1 line
1.7.2.5
PATCH 1/6 package/e2fsprogs: add host-package selection
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Yann> Add the e2fsprogs as a host-package selection in the menuconfig. Yann> Signed-off-by: "Yann E. MORIN" <[email protected]> Yann> Tested-by: Thomas Petazzoni <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/6 package/dosfstools: add host-package selection
In reply to Yann E. MORINAdd dosfstools as a host-package selection in the menuconfig.
---
v1 -> v2
- use $(HOST_CONFIGURE_OPTS) (Thomas)
--- package/Config.in.host | 1 + package/dosfstools/Config.in.host | 6 ++++++ package/dosfstools/dosfstools.mk | 9 +++++++++ 3 files changed, 16 insertions(+), 0 deletions(-) create mode 100644 package/dosfstools/Config.in.host
package/Config.in.host +1 -0
@@ -1,6 +1,7 @@ menu "Host utilities" source "package/dfu-util/Config.in.host" +source "package/dosfstools/Config.in.host" source "package/e2fsprogs/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/omap-u-boot-utils/Config.in.host"
package/dosfstools/Config.in.host new file +6 -0
@@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_DOSFSTOOLS + bool "host dosfstools" + help + Tools for creating and checking DOS FAT filesystems. + + http://www.daniel-baumann.ch/software/dosfstools/
package/dosfstools/dosfstools.mk +9 -0
@@ -43,4 +43,13 @@ define DOSFSTOOLS_CLEAN_CMDS -$(MAKE) -C $(@D) clean endef +define HOST_DOSFSTOOLS_BUILD_CMDS + $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) +endef + +define HOST_DOSFSTOOLS_INSTALL_CMDS + $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) PREFIX=$(HOST_DIR)/usr install +endef + $(eval $(generic-package)) +$(eval $(host-generic-package))
Signature · 1 line
1.7.2.5
PATCH 2/6 package/dosfstools: add host-package selection
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Yann> Add dosfstools as a host-package selection in the menuconfig. Yann> Signed-off-by: "Yann E. MORIN" <[email protected]> Yann> Cc: Thomas Petazzoni <[email protected]> Yann> Tested-by: Thomas Petazzoni <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/6 package/libconfuse: add host variant
In reply to Yann E. MORINNeeded later by genimage.
--- package/libconfuse/libconfuse.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/libconfuse/libconfuse.mk +1 -0
@@ -10,3 +10,4 @@ LIBCONFUSE_INSTALL_STAGING = YES LIBCONFUSE_CONF_OPT = --disable-rpath $(eval $(autotools-package)) +$(eval $(host-autotools-package))
Signature · 1 line
1.7.2.5
PATCH 3/6 package/libconfuse: add host variant
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Yann> Needed later by genimage.
Yann> Signed-off-by: "Yann E. MORIN" <[email protected]> Yann> Tested-by: Thomas Petazzoni <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 4/6 package/genimage: new host-only package
In reply to Yann E. MORIN---
Changes v1 -> v2:
- add license info (Thomas)
--- package/Config.in.host | 1 + package/genimage/Config.in.host | 12 ++++++++++++ package/genimage/genimage.mk | 13 +++++++++++++ 3 files changed, 26 insertions(+), 0 deletions(-) create mode 100644 package/genimage/Config.in.host create mode 100644 package/genimage/genimage.mk
package/Config.in.host +1 -0
@@ -3,6 +3,7 @@ menu "Host utilities" source "package/dfu-util/Config.in.host" source "package/dosfstools/Config.in.host" source "package/e2fsprogs/Config.in.host" +source "package/genimage/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/omap-u-boot-utils/Config.in.host" source "package/openocd/Config.in.host"
package/genimage/Config.in.host new file +12 -0
@@ -0,0 +1,12 @@ +config BR2_PACKAGE_HOST_GENIMAGE + bool "host genimage" + help + genimage is a tool to generate multiple filesystem and flash images + from a given root filesystem tree. genimage is intended to be run + in a fakeroot environment. + + Configuration is done is a config file parsed by libconfuse. Options + like the path to tools can be given in environment variables, the config + file or commandline switches. + + http://www.pengutronix.de/software/genimage/
package/genimage/genimage.mk new file +13 -0
@@ -0,0 +1,13 @@ +############################################################# +# +# genimage +# +############################################################## + +GENIMAGE_VERSION = 4 +GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz +GENIMAGE_SITE = http://www.pengutronix.de/software/genimage/download/ +GENIMAGE_DEPENDENCIES = libconfuse +GENIMAGE_LICENSE = GPLv2 + +$(eval $(host-autotools-package))
Signature · 1 line
1.7.2.5
PATCH 4/6 package/genimage: new host-only package
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Yann> Signed-off-by: "Yann E. MORIN" <[email protected]> Yann> Tested-by: Thomas Petazzoni <[email protected]>
Yann> ---
Yann> Changes v1 -> v2:
Yann> - add license info (Thomas)
Yann> ---
Yann> package/Config.in.host | 1 + Yann> package/genimage/Config.in.host | 12 ++++++++++++ Yann> package/genimage/genimage.mk | 13 +++++++++++++ Yann> 3 files changed, 26 insertions(+), 0 deletions(-) Yann> create mode 100644 package/genimage/Config.in.host Yann> create mode 100644 package/genimage/genimage.mk
Yann> diff --git a/package/Config.in.host b/package/Config.in.host Yann> index 43f292c..c456d5d 100644
Yann> --- a/package/Config.in.host
Yann> +++ b/package/Config.in.host
Yann> @@ -3,6 +3,7 @@ menu "Host utilities"
Yann> source "package/dfu-util/Config.in.host" Yann> source "package/dosfstools/Config.in.host" Yann> source "package/e2fsprogs/Config.in.host" Yann> +source "package/genimage/Config.in.host" Yann> source "package/lpc3250loader/Config.in.host" Yann> source "package/omap-u-boot-utils/Config.in.host" Yann> source "package/openocd/Config.in.host" Yann> diff --git a/package/genimage/Config.in.host b/package/genimage/Config.in.host Yann> new file mode 100644 Yann> index 0000000..cfa267c Yann> --- /dev/null Yann> +++ b/package/genimage/Config.in.host Yann> @@ -0,0 +1,12 @@ Yann> +config BR2_PACKAGE_HOST_GENIMAGE Yann> + bool "host genimage" Yann> + help Yann> + genimage is a tool to generate multiple filesystem and flash images Yann> + from a given root filesystem tree. genimage is intended to be run Yann> + in a fakeroot environment. Yann> + Yann> + Configuration is done is a config file parsed by libconfuse. Options Yann> + like the path to tools can be given in environment variables, the config Yann> + file or commandline switches.
Yann> +
The help text lines are too long. Committed with that fixed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 5/6 package/genpart: new host-only package
In reply to Yann E. MORIN---
Changes v1 -> v2:
- add due note about potential licensing issue (Thomas)
--- package/Config.in.host | 1 + package/genpart/Config.in.host | 8 ++++++++ package/genpart/genpart-fix-return-code.patch | 25 +++++++++++++++++++++++++ package/genpart/genpart.mk | 18 ++++++++++++++++++ 4 files changed, 52 insertions(+), 0 deletions(-) create mode 100644 package/genpart/Config.in.host create mode 100644 package/genpart/genpart-fix-return-code.patch create mode 100644 package/genpart/genpart.mk
package/Config.in.host +1 -0
@@ -4,6 +4,7 @@ source "package/dfu-util/Config.in.host" source "package/dosfstools/Config.in.host" source "package/e2fsprogs/Config.in.host" source "package/genimage/Config.in.host" +source "package/genpart/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/omap-u-boot-utils/Config.in.host" source "package/openocd/Config.in.host"
package/genpart/Config.in.host new file +8 -0
@@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_GENPART + bool "host genpart" + help + Generate a 16 byte partition table entry defined by command line + arguments and dump it to stdout. No CHS magic is done, only lba + entries are filled out. + + http://www.pengutronix.de/software/genpart/index_en.html
package/genpart/genpart-fix-return-code.patch new file +25 -0
@@ -0,0 +1,25 @@ +genpart: return 0 if partition writen OK, with no do_magic + +If do_magic is false, we don't won't write the 0xaa55 magic. +However, if we succesfully wrote the partition entry, we still +want to return 0 to indicate success. + +Signed-off-by: "Yann E. MORIN" <[email protected]> +Cc: Robert Schwebel <[email protected]> + +-- +Patch sent upstream, but no mailing list. +Status: accepted upstream, not yet released. + +diff -durN host-genpart-1.0.2.orig/src/genpart.c host-genpart-1.0.2/src/genpart.c +--- host-genpart-1.0.2.orig/src/genpart.c 2009-12-20 21:54:56.000000000 +0100 ++++ host-genpart-1.0.2/src/genpart.c 2013-01-22 23:13:24.109752579 +0100 +@@ -92,6 +92,8 @@ + if (do_magic) { + if (fwrite(&magic, 2, 1, stdout) > 0) + rc=0; ++ } else { ++ rc=0; + } + } + return rc;
package/genpart/genpart.mk new file +18 -0
@@ -0,0 +1,18 @@ +############################################################# +# +# genpart +# +############################################################# + +GENPART_VERSION = 1.0.2 +GENPART_SOURCE = genpart-$(GENPART_VERSION).tar.bz2 +GENPART_SITE = http://www.pengutronix.de/software/genpart/download/ +# genpart has no license embedded in its source release. +# However, their project page mentions: +# > This community portal offers an overview about our own OSS +# > projects and projects Pengutronix is or was involved with. +# We can thus assume genpart is under a FLOSS license. +# So, until the authors have clarified the licensing terms: +GENPART_LICENSE = Unknown (clarification has been asked to the authors) + +$(eval $(host-autotools-package))
Signature · 1 line
1.7.2.5
PATCH 5/6 package/genpart: new host-only package
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Yann> Signed-off-by: "Yann E. MORIN" <[email protected]> Yann> Tested-by: Thomas Petazzoni <[email protected]>
Yann> ---
Yann> Changes v1 -> v2:
Yann> - add due note about potential licensing issue (Thomas)
Yann> ---
Yann> package/Config.in.host | 1 + Yann> package/genpart/Config.in.host | 8 ++++++++ Yann> package/genpart/genpart-fix-return-code.patch | 25 +++++++++++++++++++++++++ Yann> package/genpart/genpart.mk | 18 ++++++++++++++++++ Yann> 4 files changed, 52 insertions(+), 0 deletions(-) Yann> create mode 100644 package/genpart/Config.in.host Yann> create mode 100644 package/genpart/genpart-fix-return-code.patch Yann> create mode 100644 package/genpart/genpart.mk
Yann> diff --git a/package/genpart/genpart-fix-return-code.patch b/package/genpart/genpart-fix-return-code.patch Yann> new file mode 100644
Yann> index 0000000..ec18c82
Yann> --- /dev/null
Yann> +++ b/package/genpart/genpart-fix-return-code.patch
Yann> @@ -0,0 +1,25 @@
Yann> +genpart: return 0 if partition writen OK, with no do_magic
Yann> +
Yann> +If do_magic is false, we don't won't write the 0xaa55 magic.
s/don't//
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 6/6 package/mtools: new host-package
In reply to Yann E. MORIN---
v2 -> v3:
- add licensing terms (Thomas)
v1 -> v2
- remove extraneous spaces, use $(BR2_GNU_MIRROR) (Thomas)
--- package/Config.in.host | 1 + package/mtools/Config.in.host | 9 +++++++++ package/mtools/mtools.mk | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 0 deletions(-) create mode 100644 package/mtools/Config.in.host create mode 100644 package/mtools/mtools.mk
package/Config.in.host +1 -0
@@ -6,6 +6,7 @@ source "package/e2fsprogs/Config.in.host" source "package/genimage/Config.in.host" source "package/genpart/Config.in.host" source "package/lpc3250loader/Config.in.host" +source "package/mtools/Config.in.host" source "package/omap-u-boot-utils/Config.in.host" source "package/openocd/Config.in.host" source "package/sam-ba/Config.in.host"
package/mtools/Config.in.host new file +9 -0
@@ -0,0 +1,9 @@ +config BR2_PACKAGE_HOST_MTOOLS + bool "host mtools" + help + Mtools is a collection of utilities to access MS-DOS disks from + Unix without mounting them. It supports Win'95 style long file + names, OS/2 Xdf disks and 2m disks (store up to 1992k on a high + density 3 1/2 disk). + + http://www.tux.org/pub/tux/mtools/
package/mtools/mtools.mk new file +17 -0
@@ -0,0 +1,17 @@ +############################################################# +# +# mtools +# +############################################################# + +MTOOLS_VERSION = 4.0.18 +MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.bz2 +MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools/ +MTOOLS_LICENSE = GPLv3+ +MTOOLS_LICENSE_FILES = COPYING + +MTOOLS_CONF_OPT = --enable-xdf \ + --enable-vold \ + --enable-new-vold + +$(eval $(host-autotools-package))
Signature · 1 line
1.7.2.5
PATCH 6/6 package/mtools: new host-package
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Yann> Signed-off-by: "Yann E. MORIN" <[email protected]> Yann> Cc: Thomas Petazzoni <[email protected]> Yann> Tested-by: Thomas Petazzoni <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard