Re: [ptxdist] [PATCH] ptxdist: Don't assume that we have a bashrc
Am 20.03.12 23:15, schrieb Alexander Dahl: > > Am 20.03.2012 20:46, schrieb Bernhard Walle: >> Usually there is one, but don't print an error if there is no one. > > I'm using zsh, not bash, but still have ~/.bashrc … what does this code > try to do in the first place and how does this affect users of other shells? It only avoids two error messages when running "ptxdist bash" when the files are not present. You can also use bash and have no ~/.bashrc although that might be seldom. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] ptxdist: Don't assume that we have a bashrc
Hei hei, Am 20.03.2012 20:46, schrieb Bernhard Walle: > Usually there is one, but don't print an error if there is no one. I'm using zsh, not bash, but still have ~/.bashrc … what does this code try to do in the first place and how does this affect users of other shells? Greets Alex -- »With the first link, the chain is forged. The first speech censured, the first thought forbidden, the first freedom denied, chains us all irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie) *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Fix ptxdist -q kernelconfig without extracted kernel
Normally if the kernel is not extracted when "ptxdist kernelconfig" is
called, ptxdist extracts the kernel first. However, when used in quiet
mode, that fails with an error like
bash: -c: line 0: syntax error near unexpected token `;'
bash: -c: line 0:
`target="/Users/bwalle/devel/ptxdist-arm-boards/platform-beagle/state/kernel.get";
\
target="${target##*/}"; dep="/Volumes/Daten/src/linux-3.3.tar.bz2";
dep="${dep##*/}"; \
echo "${target} : ${dep}" >>
/Users/bwalle/devel/ptxdist-arm-boards/platform-beagle/state/depend.out; \
echo "started : ${target}" >&; target="target: ${target##*/}"; \
echo -e "\n${target//?/-}\n${target}\n${target//?/-}\n"; 'o
The problem is also there when calling "ptxdist kernelconfig" from "ptxdist
menu".
This patch attempts to fix the problem.
Signed-off-by: Bernhard Walle
---
rules/post/function-targetinfo.make |3 +++
rules/post/function-touch.make |3 +++
2 files changed, 6 insertions(+)
diff --git a/rules/post/function-targetinfo.make
b/rules/post/function-targetinfo.make
index f8bcebe..40e119a 100644
--- a/rules/post/function-targetinfo.make
+++ b/rules/post/function-targetinfo.make
@@ -15,6 +15,9 @@
# Print out the targetinfo line on the terminal
#
ifdef PTXDIST_QUIET
+ifndef PTXDIST_FD_STDOUT
+PTXDIST_FD_STDOUT := 1
+endif
_targetinfo_opt_output := echo "started :
$(PTX_COLOR_BLUE)$${target}$(PTX_COLOR_OFF)" >&$(PTXDIST_FD_STDOUT);
endif
diff --git a/rules/post/function-touch.make b/rules/post/function-touch.make
index 0a7919e..4d8fc28 100644
--- a/rules/post/function-touch.make
+++ b/rules/post/function-touch.make
@@ -13,6 +13,9 @@
# touch
#
ifdef PTXDIST_QUIET
+ifndef PTXDIST_FD_STDOUT
+PTXDIST_FD_STDOUT := 1
+endif
_touch_opt_output := echo "finished:
$(PTX_COLOR_GREEN)$${target}$(PTX_COLOR_OFF)" >&$(PTXDIST_FD_STDOUT);
endif
--
1.7.9.4
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] ptxdist: Don't assume that we have a bashrc
Usually there is one, but don't print an error if there is no one.
Signed-off-by: Bernhard Walle
---
bin/ptxdist |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/ptxdist b/bin/ptxdist
index 440a7aa..37ab098 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -1656,8 +1656,8 @@ parse_second()
if [ ${#} -eq 0 ]; then
local bashrc="${PTXDIST_TEMPDIR}/bashrc"
cat > "${bashrc}" <
Re: [ptxdist] [PATCH] flashbench: Fix error when flashbench is not selected
Hi, 2012/3/20 Bernhard Walle : > When flashbench is not selected in "ptxdist menuconfig", then > $(PTXCONF_FLASHBENCH_MAX_BUFSIZE) is undefined. In that case, the expr > call fails. > > Fix the problem by delaying the evaluation of FLASHBENCH_MAKE_OPT until > it's really needed, i.e. when flashbench has been selected. > > Signed-off-by: Bernhard Walle > --- > rules/flashbench.make | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/rules/flashbench.make b/rules/flashbench.make > index fcb669e..0ef52d1 100644 > --- a/rules/flashbench.make > +++ b/rules/flashbench.make > @@ -31,7 +31,7 @@ FLASHBENCH_LICENSE := GPL v2 > > FLASHBENCH_CONF_TOOL := NO > FLASHBENCH_MAKE_ENV := $(CROSS_ENV) > -FLASHBENCH_MAKE_OPT := CC=$(CROSS_CC) \ > +FLASHBENCH_MAKE_OPT = CC=$(CROSS_CC) \ > EXTRA_CFLAGS=-DMAX_BUFSIZE=$(shell expr 1024 \* 1024 \* > $(PTXCONF_FLASHBENCH_MAX_BUFSIZE)) Acked-by: Remy Bohmer Kind regards, Remy -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [flashbench] Fix syntax error in case FLASHBENCH_MAX_BUFSIZE not defined
Hi, 2012/3/20 Bernhard Walle : > Sorry, I had the old (unpatched) flashbench.make in the rules directory > of the project... > > Will send a patch that uses '=' instead of ':=' which is ready to be > applied. In that case I will drop my patch. Thanks. Kind regards, Remy -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [flashbench] Fix syntax error in case FLASHBENCH_MAX_BUFSIZE not defined
Hi, 2012/3/20 Juergen Beisert : > Just delay the evaluation of the expression to the point of time when it is > really required. > > diff --git a/rules/flashbench.make b/rules/flashbench.make > index fcb669e..0ef52d1 100644 > --- a/rules/flashbench.make > +++ b/rules/flashbench.make > @@ -31,7 +31,7 @@ FLASHBENCH_LICENSE := GPL v2 > > FLASHBENCH_CONF_TOOL := NO > FLASHBENCH_MAKE_ENV := $(CROSS_ENV) > -FLASHBENCH_MAKE_OPT := CC=$(CROSS_CC) \ > +FLASHBENCH_MAKE_OPT = CC=$(CROSS_CC) \ > EXTRA_CFLAGS=-DMAX_BUFSIZE=$(shell expr 1024 \* 1024 \* > $(PTXCONF_FLASHBENCH_MAX_BUFSIZE)) This works fine here as well. Kind regards, Remy -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] configure.ac: Check for GNU ar
Hi Andreas, * Andreas Bießmann [2012-03-20 09:37]: > > this is annoying, it will require gnu binutils which is not available on > my mac by default. > Couldn't we use some approach like > http://thread.gmane.org/gmane.comp.embedded.ptxdist.devel/8533 > (pachting ipkg to use toolchain provided ar, which should be GNU > binutils for linux targets). You're right, GNU ar is not needed. I just had an old patches directory for opkg... Forget the patch. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] flashbench: Fix error when flashbench is not selected
When flashbench is not selected in "ptxdist menuconfig", then $(PTXCONF_FLASHBENCH_MAX_BUFSIZE) is undefined. In that case, the expr call fails. Fix the problem by delaying the evaluation of FLASHBENCH_MAKE_OPT until it's really needed, i.e. when flashbench has been selected. Signed-off-by: Bernhard Walle --- rules/flashbench.make |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/flashbench.make b/rules/flashbench.make index fcb669e..0ef52d1 100644 --- a/rules/flashbench.make +++ b/rules/flashbench.make @@ -31,7 +31,7 @@ FLASHBENCH_LICENSE:= GPL v2 FLASHBENCH_CONF_TOOL := NO FLASHBENCH_MAKE_ENV:= $(CROSS_ENV) -FLASHBENCH_MAKE_OPT:= CC=$(CROSS_CC) \ +FLASHBENCH_MAKE_OPT= CC=$(CROSS_CC) \ EXTRA_CFLAGS=-DMAX_BUFSIZE=$(shell expr 1024 \* 1024 \* $(PTXCONF_FLASHBENCH_MAX_BUFSIZE)) # -- 1.7.9.4 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [flashbench] Fix syntax error in case FLASHBENCH_MAX_BUFSIZE not defined
Hi Juergen, * Juergen Beisert [2012-03-20 20:28]: > Bernhard Walle wrote: > > * Juergen Beisert [2012-03-20 10:09]: > > > Just delay the evaluation of the expression to the point of time when it > > > is really required. > > > > > > diff --git a/rules/flashbench.make b/rules/flashbench.make > > > index fcb669e..0ef52d1 100644 > > > --- a/rules/flashbench.make > > > +++ b/rules/flashbench.make > > > @@ -31,7 +31,7 @@ FLASHBENCH_LICENSE:= GPL v2 > > > > > > FLASHBENCH_CONF_TOOL := NO > > > FLASHBENCH_MAKE_ENV:= $(CROSS_ENV) > > > -FLASHBENCH_MAKE_OPT:= CC=$(CROSS_CC) \ > > > +FLASHBENCH_MAKE_OPT= CC=$(CROSS_CC) \ > > > EXTRA_CFLAGS=-DMAX_BUFSIZE=$(shell expr 1024 \* 1024 \* > > > $(PTXCONF_FLASHBENCH_MAX_BUFSIZE)) > > > > Did you try it out? It doesn't work here. > > Yes I did. Sorry, I had the old (unpatched) flashbench.make in the rules directory of the project... Will send a patch that uses '=' instead of ':=' which is ready to be applied. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [flashbench] Fix syntax error in case FLASHBENCH_MAX_BUFSIZE not defined
Hi Bernhard, Bernhard Walle wrote: > * Juergen Beisert [2012-03-20 10:09]: > > Just delay the evaluation of the expression to the point of time when it > > is really required. > > > > diff --git a/rules/flashbench.make b/rules/flashbench.make > > index fcb669e..0ef52d1 100644 > > --- a/rules/flashbench.make > > +++ b/rules/flashbench.make > > @@ -31,7 +31,7 @@ FLASHBENCH_LICENSE:= GPL v2 > > > > FLASHBENCH_CONF_TOOL := NO > > FLASHBENCH_MAKE_ENV:= $(CROSS_ENV) > > -FLASHBENCH_MAKE_OPT:= CC=$(CROSS_CC) \ > > +FLASHBENCH_MAKE_OPT= CC=$(CROSS_CC) \ > > EXTRA_CFLAGS=-DMAX_BUFSIZE=$(shell expr 1024 \* 1024 \* > > $(PTXCONF_FLASHBENCH_MAX_BUFSIZE)) > > Did you try it out? It doesn't work here. Yes I did. [jb@isonoe]> ptxdist --version 2012.03.0-00045-gbea40f0 [jb@isonoe]> ptxdist go expr: syntax error make: Nothing to be done for `world'. Now with the change above: [jb@isonoe]> ptxdist go make: Nothing to be done for `world'. all tests with a disabled 'flashbench' in the menu. Regards, Juergen -- Pengutronix e.K. | Juergen Beisert | Linux Solutions for Science and Industry | http://www.pengutronix.de/ | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [flashbench] Fix syntax error in case FLASHBENCH_MAX_BUFSIZE not defined
Hi Juergen, * Juergen Beisert [2012-03-20 10:09]: > > Just delay the evaluation of the expression to the point of time when it is > really required. > > diff --git a/rules/flashbench.make b/rules/flashbench.make > index fcb669e..0ef52d1 100644 > --- a/rules/flashbench.make > +++ b/rules/flashbench.make > @@ -31,7 +31,7 @@ FLASHBENCH_LICENSE:= GPL v2 > > FLASHBENCH_CONF_TOOL := NO > FLASHBENCH_MAKE_ENV:= $(CROSS_ENV) > -FLASHBENCH_MAKE_OPT:= CC=$(CROSS_CC) \ > +FLASHBENCH_MAKE_OPT= CC=$(CROSS_CC) \ > EXTRA_CFLAGS=-DMAX_BUFSIZE=$(shell expr 1024 \* 1024 \* > $(PTXCONF_FLASHBENCH_MAX_BUFSIZE)) > Did you try it out? It doesn't work here. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 4/9] [x86_64, multilib] Make packages install their libraries at the right place
Hi,
2012/3/20 Michael Olbrich :
>> >> - local file="$(for dir in "${pkg_pkg_dir}/"{,usr/}lib; do
>> >> + local file="$(for dir in "${pkg_pkg_dir}/"{,usr/}lib{,64}; do
>> >
>> > I don't like the explicit lib64 here. Next we'll get some debian like
>> > multilib toolchain and it's lib/x86_64-linux-gnu oor so. Can't we get that
>> > from ptxd_get_lib_dir?
>>
>> I think you are right and we can get it from ptxd_get_lib_dir, did not
>> thought about that before. Good idea!
>
> export -f ptxd_get_lib_dir
>
> directly after the function.
Was already part of my v2 patch ;-)
Thanks.
Kind regards,
Remy
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] Curious message when working with current PTXdist
Andreas Bießmann wrote: > On 20.03.2012 09:21, Juergen Beisert wrote: > > When working with the current master PTXdist (2012.03.0-00045-gbea40f0) > > at least when running the 'go' and 'images' commands PTXdist outputs the > > following text to stderr: > > > > expr: syntax error > > see http://thread.gmane.org/gmane.comp.embedded.ptxdist.devel/8906 Thanks. jbe -- Pengutronix e.K. | Juergen Beisert | Linux Solutions for Science and Industry | http://www.pengutronix.de/ | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [flashbench] Fix syntax error in case FLASHBENCH_MAX_BUFSIZE not defined
Bernhard Walle wrote: > Am 20.03.2012 09:43, schrieb Michael Olbrich: > > On Mon, Mar 19, 2012 at 08:57:50PM +0100, Remy Bohmer wrote: > >> This error occurs in case PTXCONF_FLASHBENCH_MAX_BUFSIZE is not > >> defined: > >> $ ptxdist get > >> expr: syntax error > >> make: Nothing to be done for `get'. > >> > >> Change-Id: I1978d62b8781dbd5090b8a47b8fd8b944e6c79dc > >> Signed-off-by: Remy Bohmer > >> --- > >> rules/flashbench.make |8 +++- > >> 1 files changed, 7 insertions(+), 1 deletions(-) > >> > >> diff --git a/rules/flashbench.make b/rules/flashbench.make > >> index fcb669e..b312979 100644 > >> --- a/rules/flashbench.make > >> +++ b/rules/flashbench.make > >> @@ -31,8 +31,14 @@ FLASHBENCH_LICENSE := GPL v2 > >> > >> FLASHBENCH_CONF_TOOL := NO > >> FLASHBENCH_MAKE_ENV := $(CROSS_ENV) > >> + > >> +ifdef PTXCONF_FLASHBENCH_MAX_BUFSIZE > >> +FLASHBENCH_MAX_BUFSIZE:= $(PTXCONF_FLASHBENCH_MAX_BUFSIZE) > >> +else > >> +FLASHBENCH_MAX_BUFSIZE:= 1 > >> +endif > > > > I think we should report an error here: > > > > ifndef PTXCONF_FLASHBENCH_MAX_BUFSIZE > > $(error some error message here) > > endif > > I think the problem is here that flashbench is not selected, so the > PTXCONF_FLASHBENCH_MAX_BUFSIZE > option is unset. Just delay the evaluation of the expression to the point of time when it is really required. diff --git a/rules/flashbench.make b/rules/flashbench.make index fcb669e..0ef52d1 100644 --- a/rules/flashbench.make +++ b/rules/flashbench.make @@ -31,7 +31,7 @@ FLASHBENCH_LICENSE:= GPL v2 FLASHBENCH_CONF_TOOL := NO FLASHBENCH_MAKE_ENV:= $(CROSS_ENV) -FLASHBENCH_MAKE_OPT:= CC=$(CROSS_CC) \ +FLASHBENCH_MAKE_OPT= CC=$(CROSS_CC) \ EXTRA_CFLAGS=-DMAX_BUFSIZE=$(shell expr 1024 \* 1024 \* $(PTXCONF_FLASHBENCH_MAX_BUFSIZE)) jbe -- Pengutronix e.K. | Juergen Beisert | Linux Solutions for Science and Industry | http://www.pengutronix.de/ | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [flashbench] Fix syntax error in case FLASHBENCH_MAX_BUFSIZE not defined
On Mon, Mar 19, 2012 at 08:57:50PM +0100, Remy Bohmer wrote: > This error occurs in case PTXCONF_FLASHBENCH_MAX_BUFSIZE is not defined: > $ ptxdist get > expr: syntax error > make: Nothing to be done for `get'. > > Change-Id: I1978d62b8781dbd5090b8a47b8fd8b944e6c79dc > Signed-off-by: Remy Bohmer > --- > rules/flashbench.make |8 +++- > 1 files changed, 7 insertions(+), 1 deletions(-) > > diff --git a/rules/flashbench.make b/rules/flashbench.make > index fcb669e..b312979 100644 > --- a/rules/flashbench.make > +++ b/rules/flashbench.make > @@ -31,8 +31,14 @@ FLASHBENCH_LICENSE := GPL v2 > > FLASHBENCH_CONF_TOOL := NO > FLASHBENCH_MAKE_ENV := $(CROSS_ENV) > + > +ifdef PTXCONF_FLASHBENCH_MAX_BUFSIZE > +FLASHBENCH_MAX_BUFSIZE := $(PTXCONF_FLASHBENCH_MAX_BUFSIZE) > +else > +FLASHBENCH_MAX_BUFSIZE := 1 > +endif ifdef PTXCONF_FLASHBENCH > FLASHBENCH_MAKE_OPT := CC=$(CROSS_CC) \ > - EXTRA_CFLAGS=-DMAX_BUFSIZE=$(shell expr 1024 \* 1024 \* > $(PTXCONF_FLASHBENCH_MAX_BUFSIZE)) > + EXTRA_CFLAGS=-DMAX_BUFSIZE=$(shell expr 1024 \* 1024 \* > $(FLASHBENCH_MAX_BUFSIZE)) endif I think. Also config FLASHBENCH_MAX_BUFSIZE int prompt "Maximum flashbench buffer size in megabytes" default 64 [...] That way it will always be a number. Michael > > # > > # Install > -- > 1.7.5.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
[ptxdist] [PATCH][OSELAS.Toolchain] binutils-2.21.1a: remove annoying 'warn-on-all-TEXTRELs.patch'
The 'warn-on-all-TEXTRELs.patch' produces warnings on some embedded projects:
---8<---
arm-v5te-linux-gnueabi-ld: warning: creating a DT_TEXTREL in object.
textdata bss dec hex filename
4230767480 305016 735572 b3954 /tmp/build_arm_at91/u-boot
--->8---
This renders this toolchain nearly un-usable for this use-case. If one will
see these warnings he can always use the '--warn-shared-textrel' switch so
this patch will only revert the 'default to warn' to 'default to ignore
warning' which is in fact the default for GNU linker.
Another point is that even crosstool-ng has switched back and removed this
patch, it seems there are some other users bothered by that warning.
Signed-off-by: Andreas Bießmann
---
...1-05-31-Paul-Brook-paul-codesourcery.com.patch} |0
.../0002-warn-on-all-TEXTRELs.patch| 80
patches/binutils-2.21.1a/series|5 +-
3 files changed, 2 insertions(+), 83 deletions(-)
rename
patches/binutils-2.21.1a/{0003-2011-05-31-Paul-Brook-paul-codesourcery.com.patch
=> 0002-2011-05-31-Paul-Brook-paul-codesourcery.com.patch} (100%)
delete mode 100644 patches/binutils-2.21.1a/0002-warn-on-all-TEXTRELs.patch
diff --git
a/patches/binutils-2.21.1a/0003-2011-05-31-Paul-Brook-paul-codesourcery.com.patch
b/patches/binutils-2.21.1a/0002-2011-05-31-Paul-Brook-paul-codesourcery.com.patch
similarity index 100%
rename from
patches/binutils-2.21.1a/0003-2011-05-31-Paul-Brook-paul-codesourcery.com.patch
rename to
patches/binutils-2.21.1a/0002-2011-05-31-Paul-Brook-paul-codesourcery.com.patch
diff --git a/patches/binutils-2.21.1a/0002-warn-on-all-TEXTRELs.patch
b/patches/binutils-2.21.1a/0002-warn-on-all-TEXTRELs.patch
deleted file mode 100644
index 3be8fae..000
--- a/patches/binutils-2.21.1a/0002-warn-on-all-TEXTRELs.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: unknown author
-Date: Tue, 1 Nov 2011 16:44:50 +0100
-Subject: [PATCH] warn on all TEXTRELs
-
-textrels are bad for forcing copy-on-write (this affects everyone),
-and for security/runtime code generation, this affects security ppl.
-But in either case, it doesn't matter who needs textrels, it's
-the very fact that they're needed at all.
-
-2006-06-10 Ned Ludd , Mike Frysinger
-
- * bfd/elflink.c (bfd_elf_final_link): Check all objects for TEXTRELs.
- * ld/ldmain.c (main): Change textrel warning default to true.
- * ld/testsuite/lib/ld-lib.exp (default_ld_simple_link): Scrub TEXTREL
- warnings from ld output.
-
-Original patch from gentoo. Also used by crosstool-ng (binutils-2.20.1a).
- bfd/elflink.c |8 +++-
- ld/ldmain.c |1 +
- ld/testsuite/lib/ld-lib.exp |4
- 3 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/bfd/elflink.c b/bfd/elflink.c
-index 9e69ec6..0396659 100644
a/bfd/elflink.c
-+++ b/bfd/elflink.c
-@@ -4,14 +4,12 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info
*info)
- goto error_return;
-
- /* Check for DT_TEXTREL (late, in case the backend removes it). */
-- if (info->warn_shared_textrel && info->shared)
-+ o = bfd_get_section_by_name (dynobj, ".dynamic");
-+ if (info->warn_shared_textrel && o != NULL)
- {
- bfd_byte *dyncon, *dynconend;
-
- /* Fix up .dynamic entries. */
--o = bfd_get_section_by_name (dynobj, ".dynamic");
--BFD_ASSERT (o != NULL);
--
- dyncon = o->contents;
- dynconend = o->contents + o->size;
- for (; dyncon < dynconend; dyncon += bed->s->sizeof_dyn)
-@@ -11133,7 +11131,7 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info
*info)
- if (dyn.d_tag == DT_TEXTREL)
- {
-info->callbacks->einfo
-- (_("%P: warning: creating a DT_TEXTREL in a shared
object.\n"));
-+ (_("%P: warning: creating a DT_TEXTREL in object.\n"));
- break;
- }
- }
-diff --git a/ld/ldmain.c b/ld/ldmain.c
-index 96f3bda..9f88cc4 100644
a/ld/ldmain.c
-+++ b/ld/ldmain.c
-@@ -287,6 +287,7 @@ main (int argc, char **argv)
- emulation = get_emulation (argc, argv);
- ldemul_choose_mode (emulation);
- default_target = ldemul_choose_target (argc, argv);
-+ link_info.warn_shared_textrel = TRUE;
- config.maxpagesize = bfd_emul_get_maxpagesize (default_target);
- config.commonpagesize = bfd_emul_get_commonpagesize (default_target);
- lang_init ();
-diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
-index f444da7..f935f12 100644
a/ld/testsuite/lib/ld-lib.exp
-+++ b/ld/testsuite/lib/ld-lib.exp
-@@ -206,6 +206,10 @@ proc default_ld_simple_link { ld target objects } {
- # symbol, since the default linker script might use ENTRY.
- regsub -all "(^|\n)(\[^\n\]*: warning: cannot find entry
symbol\[^\n\]*\n?)" $exec_output "\\1" exec_output
-
-+# Gentoo tweak:
-+# We want to ignore TEXTREL
Re: [ptxdist] [PATCH 1/2] dropbear: Delete old patches
Am 2012-03-20 08:31, schrieb Bernhard Walle: > Seems to have been forgotten in the update > (d12c29b0e40e1d3affc0490d18599abaa48fca30). Sorry, I should have checked if there were patches for dropbear, before updating. :-/ Alex -- »With the first link, the chain is forged. The first speech censured, the first thought forbidden, the first freedom denied, chains us all irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie) *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] dropbear: Fix build on Darwin
On Tue, Mar 20, 2012 at 08:31:43AM +0100, Bernhard Walle wrote: > Signed-off-by: Bernhard Walle Thanks. Both patches applied. Michael > --- > .../0001-Fix-build-on-Darwin.patch | 44 > > patches/dropbear-2012.55/series|4 ++ > 2 files changed, 48 insertions(+) > create mode 100644 patches/dropbear-2012.55/0001-Fix-build-on-Darwin.patch > create mode 100644 patches/dropbear-2012.55/series > > diff --git a/patches/dropbear-2012.55/0001-Fix-build-on-Darwin.patch > b/patches/dropbear-2012.55/0001-Fix-build-on-Darwin.patch > new file mode 100644 > index 000..bc0d210 > --- /dev/null > +++ b/patches/dropbear-2012.55/0001-Fix-build-on-Darwin.patch > @@ -0,0 +1,44 @@ > +From e96df81ee2364f45724ef91389a567216214 Mon Sep 17 00:00:00 2001 > +From: Bernhard Walle > +Date: Tue, 20 Mar 2012 08:28:57 +0100 > +Subject: [PATCH] Fix build on Darwin > + > +From > +https://dev.openwrt.org/browser/trunk/package/dropbear/patches/200-lcrypt_bsdfix.patch?rev=25891. > + > +Signed-off-by: Bernhard Walle > +--- > + Makefile.in |6 +++--- > + 1 file changed, 3 insertions(+), 3 deletions(-) > + > +diff --git a/Makefile.in b/Makefile.in > +index cec35f1..0c288e4 100644 > +--- a/Makefile.in > b/Makefile.in > +@@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h packet.h algo.h ssh.h > buffer.h kex.h \ > + loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \ > + listener.h fake-rfc2553.h > + > +-dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ > ++dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) > + dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS) > + dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) > + dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) > +@@ -77,7 +77,7 @@ STRIP=@STRIP@ > + INSTALL=@INSTALL@ > + CPPFLAGS=@CPPFLAGS@ > + CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ > +-LIBS+=@LIBS@ > ++LIBS+=@LIBS@ @CRYPTLIB@ > + LDFLAGS=@LDFLAGS@ > + > + EXEEXT=@EXEEXT@ > +@@ -169,7 +169,7 @@ scp: $(SCPOBJS) $(HEADERS) Makefile > + # multi-binary compilation. > + MULTIOBJS= > + ifeq ($(MULTI),1) > +-MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), > $($(prog)objs))) @CRYPTLIB@ > ++MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) > + CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI > + endif > + > diff --git a/patches/dropbear-2012.55/series b/patches/dropbear-2012.55/series > new file mode 100644 > index 000..d9df7e0 > --- /dev/null > +++ b/patches/dropbear-2012.55/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-Fix-build-on-Darwin.patch > +# e4c948951d2fafee17a83f484c126a7e - git-ptx-patches magic > -- > 1.7.9.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
Re: [ptxdist] [PATCH] [flashbench] Fix syntax error in case FLASHBENCH_MAX_BUFSIZE not defined
Am 20.03.2012 09:43, schrieb Michael Olbrich: On Mon, Mar 19, 2012 at 08:57:50PM +0100, Remy Bohmer wrote: This error occurs in case PTXCONF_FLASHBENCH_MAX_BUFSIZE is not defined: $ ptxdist get expr: syntax error make: Nothing to be done for `get'. Change-Id: I1978d62b8781dbd5090b8a47b8fd8b944e6c79dc Signed-off-by: Remy Bohmer --- rules/flashbench.make |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/rules/flashbench.make b/rules/flashbench.make index fcb669e..b312979 100644 --- a/rules/flashbench.make +++ b/rules/flashbench.make @@ -31,8 +31,14 @@ FLASHBENCH_LICENSE := GPL v2 FLASHBENCH_CONF_TOOL := NO FLASHBENCH_MAKE_ENV:= $(CROSS_ENV) + +ifdef PTXCONF_FLASHBENCH_MAX_BUFSIZE +FLASHBENCH_MAX_BUFSIZE := $(PTXCONF_FLASHBENCH_MAX_BUFSIZE) +else +FLASHBENCH_MAX_BUFSIZE := 1 +endif I think we should report an error here: ifndef PTXCONF_FLASHBENCH_MAX_BUFSIZE $(error some error message here) endif I think the problem is here that flashbench is not selected, so the PTXCONF_FLASHBENCH_MAX_BUFSIZE option is unset. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [flashbench] Fix syntax error in case FLASHBENCH_MAX_BUFSIZE not defined
On Mon, Mar 19, 2012 at 08:57:50PM +0100, Remy Bohmer wrote: > This error occurs in case PTXCONF_FLASHBENCH_MAX_BUFSIZE is not defined: > $ ptxdist get > expr: syntax error > make: Nothing to be done for `get'. > > Change-Id: I1978d62b8781dbd5090b8a47b8fd8b944e6c79dc > Signed-off-by: Remy Bohmer > --- > rules/flashbench.make |8 +++- > 1 files changed, 7 insertions(+), 1 deletions(-) > > diff --git a/rules/flashbench.make b/rules/flashbench.make > index fcb669e..b312979 100644 > --- a/rules/flashbench.make > +++ b/rules/flashbench.make > @@ -31,8 +31,14 @@ FLASHBENCH_LICENSE := GPL v2 > > FLASHBENCH_CONF_TOOL := NO > FLASHBENCH_MAKE_ENV := $(CROSS_ENV) > + > +ifdef PTXCONF_FLASHBENCH_MAX_BUFSIZE > +FLASHBENCH_MAX_BUFSIZE := $(PTXCONF_FLASHBENCH_MAX_BUFSIZE) > +else > +FLASHBENCH_MAX_BUFSIZE := 1 > +endif I think we should report an error here: ifndef PTXCONF_FLASHBENCH_MAX_BUFSIZE $(error some error message here) endif Michael > FLASHBENCH_MAKE_OPT := CC=$(CROSS_CC) \ > - EXTRA_CFLAGS=-DMAX_BUFSIZE=$(shell expr 1024 \* 1024 \* > $(PTXCONF_FLASHBENCH_MAX_BUFSIZE)) > + EXTRA_CFLAGS=-DMAX_BUFSIZE=$(shell expr 1024 \* 1024 \* > $(FLASHBENCH_MAX_BUFSIZE)) > > # > > # Install > -- > 1.7.5.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
Re: [ptxdist] [PATCH 4/9] [x86_64, multilib] Make packages install their libraries at the right place
On Mon, Mar 19, 2012 at 08:07:26PM +0100, Remy Bohmer wrote:
> Hi,
>
> 2012/3/19 Michael Olbrich :
> >> +# Outputs 'lib' or 'lib64', derived from the ld-linux.so.2 from the
> >> compiler toolchain
> >> +CROSS_LIB_DIR := $(shell \
> >> + dl="$$(echo 'int main(void){return 0;}' | \
> >> + ${CROSS_CC} ${CROSS_CPPFLAGS} ${CROSS_CFLAGS} -x c -o /dev/null -v -
> >> 2>&1 | \
> >> + sed -n -e 's/.* -dynamic-linker \([^ ]*\).*/\1/p')"; \
> >> + lib_dir="$${dl%%/ld-linux*}"; \
> >> + echo "$${lib_dir\#/}" \
> >> +)
> >
> > This is the same as ptxd_get_lib_dir, right? This function should be
> > defined here:
>
> This is indeed the same function, but for some reason the
> ptxd_get_lib_dir was not available.
> I will look at it again.
>
> >> - local file="$(for dir in "${pkg_pkg_dir}/"{,usr/}lib; do
> >> + local file="$(for dir in "${pkg_pkg_dir}/"{,usr/}lib{,64}; do
> >
> > I don't like the explicit lib64 here. Next we'll get some debian like
> > multilib toolchain and it's lib/x86_64-linux-gnu oor so. Can't we get that
> > from ptxd_get_lib_dir?
>
> I think you are right and we can get it from ptxd_get_lib_dir, did not
> thought about that before. Good idea!
export -f ptxd_get_lib_dir
directly after the function.
Michael
--
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
Re: [ptxdist] [PATCH] configure.ac: Check for GNU ar
Dear Bernhard,
On 20.03.2012 08:43, Bernhard Walle wrote:
> To build the ipk packages, we need the 'f' flag which is a GNU extension:
>
> -{ ar(1)
> }--
>
>f Truncate names in the archive. GNU ar will normally permit file names
>of any length. This will cause it to create archives which are not
>compatible with the native ar program on some systems. If this is a
>concern, the f modifier may be used to truncate file names when putting
>them in the archive.
>
>
>
> Signed-off-by: Bernhard Walle
> ---
> Makefile.in |1 +
> configure.ac |1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/Makefile.in b/Makefile.in
> index 17a6ce6..11e71c3 100644
> --- a/Makefile.in
> +++ b/Makefile.in
> @@ -55,6 +55,7 @@ environment:
> @ln -sf @GNU_mknod@ "$(abs_srcdir)/bin/mknod"
> @ln -sf @GNU_tar@ "$(abs_srcdir)/bin/tar"
> @ln -sf @GNU_readlink@ "$(abs_srcdir)/bin/readlink"
> + @ln -sf @GNU_ar@ "$(abs_srcdir)/bin/ar"
this is annoying, it will require gnu binutils which is not available on
my mac by default.
Couldn't we use some approach like
http://thread.gmane.org/gmane.comp.embedded.ptxdist.devel/8533
(pachting ipkg to use toolchain provided ar, which should be GNU
binutils for linux targets).
Another way would be to stick at opkg to build the ipkg packages on mac.
What do you think about that?
regards
Andreas Bießmann
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] Curious message when working with current PTXdist
On 20.03.2012 09:21, Juergen Beisert wrote: > When working with the current master PTXdist (2012.03.0-00045-gbea40f0) at > least when running the 'go' and 'images' commands PTXdist outputs the > following text to stderr: > > expr: syntax error see http://thread.gmane.org/gmane.comp.embedded.ptxdist.devel/8906 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Curious message when working with current PTXdist
When working with the current master PTXdist (2012.03.0-00045-gbea40f0) at least when running the 'go' and 'images' commands PTXdist outputs the following text to stderr: expr: syntax error This does not happen when running the 'menuconfig' or 'platformconfig' commands. Regards, Juergen -- Pengutronix e.K. | Juergen Beisert | Linux Solutions for Science and Industry | http://www.pengutronix.de/ | -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] configure.ac: Check for GNU ar
To build the ipk packages, we need the 'f' flag which is a GNU extension:
-{ ar(1) }--
f Truncate names in the archive. GNU ar will normally permit file names
of any length. This will cause it to create archives which are not
compatible with the native ar program on some systems. If this is a
concern, the f modifier may be used to truncate file names when putting
them in the archive.
Signed-off-by: Bernhard Walle
---
Makefile.in |1 +
configure.ac |1 +
2 files changed, 2 insertions(+)
diff --git a/Makefile.in b/Makefile.in
index 17a6ce6..11e71c3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,6 +55,7 @@ environment:
@ln -sf @GNU_mknod@ "$(abs_srcdir)/bin/mknod"
@ln -sf @GNU_tar@ "$(abs_srcdir)/bin/tar"
@ln -sf @GNU_readlink@ "$(abs_srcdir)/bin/readlink"
+ @ln -sf @GNU_ar@ "$(abs_srcdir)/bin/ar"
@ln -sf @PYTHON@ "$(abs_srcdir)/bin/python"
@ln -sf @SED@ "$(abs_srcdir)/bin/sed"
@ln -sf @XARGS@ "$(abs_srcdir)/bin/xargs"
diff --git a/configure.ac b/configure.ac
index 78597cc..d51ae4c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,7 @@ GNU_TOOL(stat, coreutils)
GNU_TOOL(mknod, coreutils)
GNU_TOOL(readlink, coreutils)
GNU_TOOL(tar, tar)
+GNU_TOOL(ar, Binutils)
dnl Check for egrep
AC_PROG_EGREP
--
1.7.9.4
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] dropbear: Fix build on Darwin
Signed-off-by: Bernhard Walle --- .../0001-Fix-build-on-Darwin.patch | 44 patches/dropbear-2012.55/series|4 ++ 2 files changed, 48 insertions(+) create mode 100644 patches/dropbear-2012.55/0001-Fix-build-on-Darwin.patch create mode 100644 patches/dropbear-2012.55/series diff --git a/patches/dropbear-2012.55/0001-Fix-build-on-Darwin.patch b/patches/dropbear-2012.55/0001-Fix-build-on-Darwin.patch new file mode 100644 index 000..bc0d210 --- /dev/null +++ b/patches/dropbear-2012.55/0001-Fix-build-on-Darwin.patch @@ -0,0 +1,44 @@ +From e96df81ee2364f45724ef91389a567216214 Mon Sep 17 00:00:00 2001 +From: Bernhard Walle +Date: Tue, 20 Mar 2012 08:28:57 +0100 +Subject: [PATCH] Fix build on Darwin + +From +https://dev.openwrt.org/browser/trunk/package/dropbear/patches/200-lcrypt_bsdfix.patch?rev=25891. + +Signed-off-by: Bernhard Walle +--- + Makefile.in |6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index cec35f1..0c288e4 100644 +--- a/Makefile.in b/Makefile.in +@@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h packet.h algo.h ssh.h buffer.h kex.h \ + loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \ + listener.h fake-rfc2553.h + +-dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ ++dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) + dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS) + dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) + dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) +@@ -77,7 +77,7 @@ STRIP=@STRIP@ + INSTALL=@INSTALL@ + CPPFLAGS=@CPPFLAGS@ + CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ +-LIBS+=@LIBS@ ++LIBS+=@LIBS@ @CRYPTLIB@ + LDFLAGS=@LDFLAGS@ + + EXEEXT=@EXEEXT@ +@@ -169,7 +169,7 @@ scp: $(SCPOBJS) $(HEADERS) Makefile + # multi-binary compilation. + MULTIOBJS= + ifeq ($(MULTI),1) +- MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ ++ MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) + CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI + endif + diff --git a/patches/dropbear-2012.55/series b/patches/dropbear-2012.55/series new file mode 100644 index 000..d9df7e0 --- /dev/null +++ b/patches/dropbear-2012.55/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Fix-build-on-Darwin.patch +# e4c948951d2fafee17a83f484c126a7e - git-ptx-patches magic -- 1.7.9.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] dropbear: Delete old patches
Seems to have been forgotten in the update (d12c29b0e40e1d3affc0490d18599abaa48fca30). Signed-off-by: Bernhard Walle --- .../0001-libs-must-come-after-object-files.patch | 26 patches/dropbear-0.53.1/series |3 --- 2 files changed, 29 deletions(-) delete mode 100644 patches/dropbear-0.53.1/0001-libs-must-come-after-object-files.patch delete mode 100644 patches/dropbear-0.53.1/series diff --git a/patches/dropbear-0.53.1/0001-libs-must-come-after-object-files.patch b/patches/dropbear-0.53.1/0001-libs-must-come-after-object-files.patch deleted file mode 100644 index eb58d0f..000 --- a/patches/dropbear-0.53.1/0001-libs-must-come-after-object-files.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Michael Olbrich -Date: Mon, 20 Jun 2011 19:10:16 +0200 -Subject: [PATCH] libs must come after object files - -Signed-off-by: Michael Olbrich - Makefile.in |4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 8d81647..d72828b 100644 a/Makefile.in -+++ b/Makefile.in -@@ -28,10 +28,10 @@ COMMONOBJS=dbutil.o buffer.o \ - queue.o \ - atomicio.o compat.o fake-rfc2553.o - --SVROBJS=@CRYPTLIB@ svr-kex.o svr-algo.o svr-auth.o sshpty.o \ -+SVROBJS=svr-kex.o svr-algo.o svr-auth.o sshpty.o \ - svr-authpasswd.o svr-authpubkey.o svr-authpubkeyoptions.o svr-session.o svr-service.o \ - svr-chansession.o svr-runopts.o svr-agentfwd.o svr-main.o svr-x11fwd.o\ -- svr-tcpfwd.o svr-authpam.o -+ svr-tcpfwd.o svr-authpam.o @CRYPTLIB@ - - CLIOBJS=cli-algo.o cli-main.o cli-auth.o cli-authpasswd.o cli-kex.o \ - cli-session.o cli-service.o cli-runopts.o cli-chansession.o \ diff --git a/patches/dropbear-0.53.1/series b/patches/dropbear-0.53.1/series deleted file mode 100644 index 5c722bc..000 --- a/patches/dropbear-0.53.1/series +++ /dev/null @@ -1,3 +0,0 @@ -# generated by git-ptx-patches -0001-libs-must-come-after-object-files.patch -# cd06373c86be81f949a6cdf0f13f2b64 - git-ptx-patches magic -- 1.7.9.4 -- ptxdist mailing list ptxdist@pengutronix.de
