Re: [ptxdist] [PATCH v2] replace umkimage by u-boot sources
Hi Bernhard, On 22.01.2012 15:57, Bernhard Walle wrote: * Andreas Bießmann andr...@biessmann.de [2012-01-22 15:49]: +config ROOTFS_FW_ENV_CONFIG +bool +prompt install /etc/fw_env.config +default y Shouldn't this default to n if there's no generic fallback file (in the generic/ directory)? you may be right here. But fw_printenv will not work without configuration, therefore I want to force the user to provide one. best regards Andreas Bießmann -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2] replace umkimage by u-boot sources
Hi all, On 22.01.2012 15:49, Andreas Bießmann wrote: This patch removes the forked mkimage u-boot tool and uses the mainline u-boot code to build this tool. Signed-off-by: Andreas Bießmann andr...@biessmann.de --- snip +# +# Target-Install +# +$(STATEDIR)/u-boot-tools.install: + @$(call targetinfo) + @$(call touch) + +$(STATEDIR)/u-boot-tools.targetinstall: + @$(call targetinfo) + + @$(call install_init, u-boot-tools) + @$(call install_fixup, u-boot-tools,PRIORITY,optional) + @$(call install_fixup, u-boot-tools,SECTION,base) + @$(call install_fixup, u-boot-tools,AUTHOR,Andreas Bießmann andr...@biessmann.de) + @$(call install_fixup, u-boot-tools,DESCRIPTION,missing) + +ifdef PTXCONF_U_BOOT_TOOLS_TOOL_MKIMAGE + @$(call install_copy, u-boot-tools, 0, 0, 0755, \ + $(U_BOOT_TOOLS_DIR)/tools/mkimage, /usr/bin/mkimage) +endif + +ifdef PTXCONF_U_BOOT_TOOLS_TOOL_ENV + @$(call install_copy, u-boot-tools, 0, 0, 0755, \ + $(U_BOOT_TOOLS_DIR)/tools/env/fw_printenv, /usr/sbin/fw_printenv) + @$(call install_link, u-boot-tools, fw_printenv, /usr/sbin/fw_saveenv) +endif shouldn't we build two different packages (u-boot-tool-mkimage, u-boot-tool-env) here? best regards Andreas Bießmann -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2] replace umkimage by u-boot sources
* Andreas Bießmann biessm...@corscience.de [2012-01-23 13:40]: shouldn't we build two different packages (u-boot-tool-mkimage, u-boot-tool-env) here? I would add that tools as part of the u-boot package. Mixing a host tool with target tools don't sound like a good idea. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2] replace umkimage by u-boot sources
Hi Bernhard, On 23.01.2012 14:07, Bernhard Walle wrote: * Andreas Bießmann biessm...@corscience.de [2012-01-23 13:40]: shouldn't we build two different packages (u-boot-tool-mkimage, u-boot-tool-env) here? I would add that tools as part of the u-boot package. Mixing a host tool with target tools don't sound like a good idea. no, you got me wrong here. We have a host-u-boot-tools package which have the mkimage build for the host (currently only that tool, but maybe sometimes mkenvimage too?). Here we have the target package build for the specified target architecture (yes some want to run mkimage ion the target ;) My question here is, should we provide a u-boot-tool-mkimage-target arch.ipkg and u-boot-tool-env-target arch.ipkg here rather than a u-boot-tools-target arch.ipkg which includes mkimage/fw_printenv depending on the configuration. best regards Andreas Bießmann -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2] replace umkimage by u-boot sources
* Andreas Bießmann biessm...@corscience.de [2012-01-23 14:16]: no, you got me wrong here. We have a host-u-boot-tools package which have the mkimage build for the host (currently only that tool, but maybe sometimes mkenvimage too?). Here we have the target package build for the specified target architecture (yes some want to run mkimage ion the target ;) Yes, sorry. Should have read the whole mail. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] host-localedef: Fix on Darwin
Hi Bernhard, On 22.01.12 00:29, Bernhard Walle wrote: This patch is by far the most ugly part of all of the Darwin patches. At least the md5sum of a locale-archive when generating a de_DE.UTF-8 locale is identical... A first review, please. I get some warnings and a linker error: ---8--- glibc/locale -I./include -I. -I. -include ./include/always.h -Wall -Wno-format -c -o getopt.o glibc/posix/getopt.c glibc/posix/getopt.c:74:1: warning: _ redefined In file included from ./include/gettext.h:1, from glibc/posix/getopt.c:73: ./include/libintl.h:27:1: warning: this is the location of the previous definition ... gcc -I/Users/andreas/Documents/source/ptxdist-arm-boards/platform-beagle/sysroot-host/include -g -O2 -fnested-functions -DNO_SYSCONF -DLOCALE_PATH='/usr/lib/locale:/usr/share/i18n' -DLOCALEDIR='/usr/lib/locale' -DLOCALE_ALIAS_PATH='/usr/share/locale' -DCHARMAP_PATH='/usr/share/i18n/charmaps' -DREPERTOIREMAP_PATH='/usr/share/i18n/repertoiremaps' -DLOCSRCDIR='/usr/share/i18n/locales' -Iglibc/locale/programs -Iglibc/locale -I./include -I. -I. -include ./include/always.h -Wall -Wno-format -c -o vasprintf.o vasprintf.c gcc -o localedef charmap.o charmap-dir.o ld-address.o ld-collate.o ld-ctype.o ld-identification.o ld-measurement.o ld-messages.o ld-monetary.o ld-name.o ld-numeric.o ld-paper.o ld-telephone.o ld-time.o linereader.o localedef.o locarchive.o locfile.o repertoire.o simple-hash.o xmalloc.o xstrdup.o argp-ba.o argp-eexst.o argp-fmtstream.o argp-help.o argp-parse.o argp-pv.o argp-xinl.o error.o getopt.o getopt1.o md5.o obstack.o asprintf.o getdelim.o localedef_extra.o obstack_printf.o vasprintf.o Undefined symbols for architecture x86_64: _argp_fmtstream_putc, referenced from: _usage_argful_short_opt in argp-help.o _argp_args_usage in argp-help.o ld: symbol(s) not found for architecture x86_64 collect2: ld returned 1 exit status make[1]: *** [localedef] Error 1 make: *** [/Users/andreas/Documents/source/ptxdist-arm-boards/platform-beagle/state/host-localedef.compile] Error 2 ---8--- regards Andreas -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] host-localedef: Fix on Darwin
* Andreas Bießmann andr...@biessmann.de [2012-01-23 22:29]: On 22.01.12 00:29, Bernhard Walle wrote: This patch is by far the most ugly part of all of the Darwin patches. At least the md5sum of a locale-archive when generating a de_DE.UTF-8 locale is identical... A first review, please. I get some warnings and a linker error: Is 'gcc' llvm-gcc (gcc --version)? I'm using gcc-4.2 (FSF gcc) as host compiler, but of course it should be fixed to work with llvm-gcc too as it's the default on Lion (and I think even Snow Leopard). Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/3] Add host-elf-h-compat package
On Sun, Jan 22, 2012 at 12:43:13PM +0100, Bernhard Walle wrote: This package should provide elf.h on host operating systems that have no /usr/include/elf.h. The header is copied from glibc, modified a bit to remove Gnu dependencies and is sufficient to compile the Linux kernel and module-init-tools. The package itself only checks if elf.h is present. If yes, it does nothing on make install. If not, it installs its own copy of elf.h in make install to the include directory set in autoconf. I like it in general, but I'm a bit concerned about maintaining the correct dependencies. How about this: Signed-off-by: Bernhard Walle bernh...@bwalle.de --- rules/host-elf-h-compat.in |4 rules/host-elf-h-compat.make | 32 2 files changed, 36 insertions(+), 0 deletions(-) create mode 100644 rules/host-elf-h-compat.in create mode 100644 rules/host-elf-h-compat.make diff --git a/rules/host-elf-h-compat.in b/rules/host-elf-h-compat.in new file mode 100644 index 000..8a263ea --- /dev/null +++ b/rules/host-elf-h-compat.in @@ -0,0 +1,4 @@ +## SECTION=hosttools_noprompt + +config HOST_ELF_H_COMPAT + bool default y diff --git a/rules/host-elf-h-compat.make b/rules/host-elf-h-compat.make new file mode 100644 index 000..7001344 --- /dev/null +++ b/rules/host-elf-h-compat.make @@ -0,0 +1,32 @@ +# -*-makefile-*- +# +# Copyright (C) 2012 by Bernhard Walle bernh...@bwalle.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# LAZY_PACKAGES-$(PTXCONF_HOST_ELF_H_COMPAT) += host-elf-h-compat + +# +# Paths and names +# +HOST_ELF_H_COMPAT_VERSION:= 0.1 +HOST_ELF_H_COMPAT_MD5:= dc45cdadcac50a42175f66ffed2d4375 +HOST_ELF_H_COMPAT:= elf-h-compat-$(HOST_ELF_H_COMPAT_VERSION) +HOST_ELF_H_COMPAT_SUFFIX := tar.bz2 +HOST_ELF_H_COMPAT_URL:= http://bwalle.de/programme//$(HOST_ELF_H_COMPAT).$(HOST_ELF_H_COMPAT_SUFFIX) +HOST_ELF_H_COMPAT_SOURCE := $(SRCDIR)/$(HOST_ELF_H_COMPAT).$(HOST_ELF_H_COMPAT_SUFFIX) +HOST_ELF_H_COMPAT_DIR:= $(HOST_BUILDDIR)/$(HOST_ELF_H_COMPAT) ifneq($(shell uname -s),Linux) $(STATEDIR)/base.prepare: $(STATEDIR)host-elf-h-compat.install.post endif This way, it's built before any real packages on non-Linux hosts. Michael + +# +# autoconf +# +HOST_ELF_H_COMPAT_CONF_TOOL := autoconf + +# vim: syntax=make -- 1.7.7.4 -- ptxdist mailing list ptxdist@pengutronix.de -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
