[ptxdist] [PATCH 2/2] host-mpfr: Add additional download source URL
Add additional download URL due to extended downtimes on original download site. Signed-off-by: Carsten Schlote --- rules/host-mpfr.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/host-mpfr.make b/rules/host-mpfr.make index 54221ae..a54a80a 100644 --- a/rules/host-mpfr.make +++ b/rules/host-mpfr.make @@ -24,7 +24,8 @@ HOST_MPFR_LICENSE := LGPL-3.0-or-later HOST_MPFR_URL := \ http://www.mpfr.org/mpfr-$(HOST_MPFR_VERSION)/$(HOST_MPFR).$(HOST_MPFR_SUFFIX) \ - http://cross-lfs.org/files/packages/svn/$(HOST_MPFR).$(HOST_MPFR_SUFFIX) + http://cross-lfs.org/files/packages/svn/$(HOST_MPFR).$(HOST_MPFR_SUFFIX) \ + https://ftp.gnu.org/gnu/mpfr/$(HOST_MPFR).$(HOST_MPFR_SUFFIX) # # Prepare -- 2.25.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 1/2] host-mpfr: version bump 4.0.2 -> 4.1.0
Signed-off-by: Carsten Schlote --- rules/host-mpfr.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-mpfr.make b/rules/host-mpfr.make index 24fba4d..54221ae 100644 --- a/rules/host-mpfr.make +++ b/rules/host-mpfr.make @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MPFR) += host-mpfr # # Paths and names # -HOST_MPFR_VERSION := 4.0.2 -HOST_MPFR_MD5 := 6d8a8bb46fe09ff44e21cdbf84f5cdac +HOST_MPFR_VERSION := 4.1.0 +HOST_MPFR_MD5 := 44b892bc5a45bafb4294d134e13aad1d HOST_MPFR := mpfr-$(HOST_MPFR_VERSION) HOST_MPFR_SUFFIX := tar.bz2 HOST_MPFR_SOURCE := $(SRCDIR)/$(HOST_MPFR).$(HOST_MPFR_SUFFIX) -- 2.25.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 0/2] Updates for OSELAS.Toolchain
- Updated MPFR lib to 4.1.0. - Added additional download URL because of excessive timeouts with existing urls. Carsten Schlote (2): host-mpfr: version bump 4.0.2 -> 4.1.0 host-mpfr: Add additional download source URL rules/host-mpfr.make | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.25.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 2/2] host-mpfr: Add additional download source URL
Add additional download URL due to extended downtimes on original download site. Signed-off-by: Carsten Schlote --- rules/host-mpfr.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/host-mpfr.make b/rules/host-mpfr.make index 54221ae..a54a80a 100644 --- a/rules/host-mpfr.make +++ b/rules/host-mpfr.make @@ -24,7 +24,8 @@ HOST_MPFR_LICENSE := LGPL-3.0-or-later HOST_MPFR_URL := \ http://www.mpfr.org/mpfr-$(HOST_MPFR_VERSION)/$(HOST_MPFR).$(HOST_MPFR_SUFFIX) \ - http://cross-lfs.org/files/packages/svn/$(HOST_MPFR).$(HOST_MPFR_SUFFIX) + http://cross-lfs.org/files/packages/svn/$(HOST_MPFR).$(HOST_MPFR_SUFFIX) \ + https://ftp.gnu.org/gnu/mpfr/$(HOST_MPFR).$(HOST_MPFR_SUFFIX) # # Prepare -- 2.25.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 1/2] host-mpfr: version bump 4.0.2 -> 4.1.0
Signed-off-by: Carsten Schlote --- rules/host-mpfr.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-mpfr.make b/rules/host-mpfr.make index 24fba4d..54221ae 100644 --- a/rules/host-mpfr.make +++ b/rules/host-mpfr.make @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MPFR) += host-mpfr # # Paths and names # -HOST_MPFR_VERSION := 4.0.2 -HOST_MPFR_MD5 := 6d8a8bb46fe09ff44e21cdbf84f5cdac +HOST_MPFR_VERSION := 4.1.0 +HOST_MPFR_MD5 := 44b892bc5a45bafb4294d134e13aad1d HOST_MPFR := mpfr-$(HOST_MPFR_VERSION) HOST_MPFR_SUFFIX := tar.bz2 HOST_MPFR_SOURCE := $(SRCDIR)/$(HOST_MPFR).$(HOST_MPFR_SUFFIX) -- 2.25.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 0/2] mpfr library update
Updated mpfr library version to 4.1.0 and added some extra download URL due to excessive downtimes of original download site. Carsten Schlote (2): host-mpfr: version bump 4.0.2 -> 4.1.0 host-mpfr: Add additional download source URL rules/host-mpfr.make | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.25.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] nfnl_osf not found when compiling iptables
Hi Wim, I played with the OSELAS Toolchain some weeks ago and tried newer versions of GCC and related libs. I ended up with the same problem on some architectures, but not all. I didn't track down the problem yet, but with the latest toolchain release I will need to check this problem again. Carsten On 23.06.2016 10:03, Wim Vinckier wrote: > Hi all, > > When I try to use the 'install tools'-option when enabling iptables, > the installer tells it can't find /usr/sbin/nfnl_osf. I think it is > related to the latest version bump since I could compile it with the > version included in ptxdist-2016.01.0 while the version included in > ptxdist-2016.05.0 fails. > > Is there anyone out there with the same issue? > > Kind regards, > > wimpunk. > > ___ > ptxdist mailing list > ptxdist@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Bug on ptxdist-2016.05.0
Hi Raimundo,
I tried that patch as it really looks like a typo. Anyway, with the patch
applied you get a problem when target-installing the
kernel modules. It tried to strip module.symbols and obviously fails.
So this fix might need further fixes.
Carsten
Von: ptxdist [mailto:ptxdist-boun...@pengutronix.de] Im Auftrag von Raimundo
Sagarzazu
Gesendet: Donnerstag, 9. Juni 2016 10:40
An: ptxdist@pengutronix.de
Betreff: [ptxdist] Bug on ptxdist-2016.05.0
Sorry, the patch:
diff -rup a/scripts/lib/ptxd_make_xpkg_pkg.sh
b/scripts/lib/ptxd_make_xpkg_pkg.sh
--- a/scripts/lib/ptxd_make_xpkg_pkg.sh 2016-05-30 16:41:31.0
+0200
+++ b/scripts/lib/ptxd_make_xpkg_pkg.sh 2016-06-09 09:23:50.372027049
+0200
@@ -314,7 +314,7 @@ install ${cmd}:
echo "using '$(ptxd_print_path "${src}")' instead"
fi &&
-if [ -z "${stip}" ]; then
+if [ -z "${strip}" ]; then
if readelf -h "${src}" &> /dev/null; then
strip="y"
else
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 2/3] host-autotools-automake: Updated source version to 1.15
From: Carsten Schlote <schl...@vahanus.net> Signed-off-by: Carsten Schlote <schl...@vahanus.net> --- rules/host-autotools-automake.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-autotools-automake.make b/rules/host-autotools-automake.make index 2236f2a..4e7b1ac 100644 --- a/rules/host-autotools-automake.make +++ b/rules/host-autotools-automake.make @@ -16,8 +16,8 @@ LAZY_PACKAGES-$(PTXCONF_HOST_AUTOTOOLS_AUTOMAKE) += host-autotools-automake # # Paths and names # -HOST_AUTOTOOLS_AUTOMAKE_VERSION:= 1.14.1 -HOST_AUTOTOOLS_AUTOMAKE_MD5:= 7fc29854c520f56b07aa232a0f880292 +HOST_AUTOTOOLS_AUTOMAKE_VERSION:= 1.15 +HOST_AUTOTOOLS_AUTOMAKE_MD5:= 9a1ddb0e053474d9d1105cfe39b0c48d HOST_AUTOTOOLS_AUTOMAKE:= automake-$(HOST_AUTOTOOLS_AUTOMAKE_VERSION) HOST_AUTOTOOLS_AUTOMAKE_SUFFIX := tar.xz HOST_AUTOTOOLS_AUTOMAKE_URL:= $(call ptx/mirror, GNU, automake/$(HOST_AUTOTOOLS_AUTOMAKE).$(HOST_AUTOTOOLS_AUTOMAKE_SUFFIX)) -- 2.7.4 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 3/3] host-autotools-libtool: Updated source version to 2.4.6
From: Carsten Schlote <schl...@vahanus.net> Signed-off-by: Carsten Schlote <schl...@vahanus.net> --- rules/host-autotools-libtool.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-autotools-libtool.make b/rules/host-autotools-libtool.make index 392ccfd..907c556 100644 --- a/rules/host-autotools-libtool.make +++ b/rules/host-autotools-libtool.make @@ -16,8 +16,8 @@ LAZY_PACKAGES-$(PTXCONF_HOST_AUTOTOOLS_LIBTOOL) += host-autotools-libtool # # Paths and names # -HOST_AUTOTOOLS_LIBTOOL_VERSION := 2.4.2 -HOST_AUTOTOOLS_LIBTOOL_MD5 := d2f3b7d4627e69e13514a40e72a24d50 +HOST_AUTOTOOLS_LIBTOOL_VERSION := 2.4.6 +HOST_AUTOTOOLS_LIBTOOL_MD5 := addf44b646ddb4e3919805aa88fa7c5e HOST_AUTOTOOLS_LIBTOOL := libtool-$(HOST_AUTOTOOLS_LIBTOOL_VERSION) HOST_AUTOTOOLS_LIBTOOL_SUFFIX := tar.gz HOST_AUTOTOOLS_LIBTOOL_URL := $(call ptx/mirror, GNU, libtool/$(HOST_AUTOTOOLS_LIBTOOL).$(HOST_AUTOTOOLS_LIBTOOL_SUFFIX)) -- 2.7.4 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/3] flex: Updated source version to 2.5.39
From: Carsten Schlote <schl...@vahanus.net> Signed-off-by: Carsten Schlote <schl...@vahanus.net> --- rules/flex.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/flex.make b/rules/flex.make index 251478e..c717df0 100644 --- a/rules/flex.make +++ b/rules/flex.make @@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_FLEX) += flex # # Paths and names # -FLEX_VERSION := 2.5.35 -FLEX_MD5 := 10714e50cea54dc7a227e3eddcd44d57 +FLEX_VERSION := 2.5.39 +FLEX_MD5 := 477679c37ff8b28248a9b05f1da29a82 FLEX := flex-$(FLEX_VERSION) -FLEX_SUFFIX:= tar.bz2 +FLEX_SUFFIX:= tar.xz FLEX_URL := $(call ptx/mirror, SF, flex/$(FLEX).$(FLEX_SUFFIX)) FLEX_SOURCE:= $(SRCDIR)/$(FLEX).$(FLEX_SUFFIX) FLEX_DIR := $(BUILDDIR)/$(FLEX) -- 2.7.4 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] (no subject)
I updated the proftpd and stunnel packages to newer version. Carsten [PATCH 1/2] proftpd: Bumped version to 1.3.5 [PATCH 2/2] stunnel: Version bump to 5.02 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] stunnel: Version bump to 5.02
From: Carsten Schlote schl...@vahanus.net Signed-off-by: Carsten Schlote schl...@vahanus.net --- rules/stunnel.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/stunnel.make b/rules/stunnel.make index e3b6f51..f793f04 100644 --- a/rules/stunnel.make +++ b/rules/stunnel.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_STUNNEL) += stunnel # # Paths and names # -STUNNEL_VERSION:= 5.01 -STUNNEL_MD5:= 7b63266b6fa05da696729e245100da65 +STUNNEL_VERSION:= 5.02 +STUNNEL_MD5:= bb48b1c18cfc0a42708ef996b1a26926 STUNNEL:= stunnel-$(STUNNEL_VERSION) STUNNEL_SUFFIX := tar.gz STUNNEL_URL:= \ -- 2.3.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] proftpd: Bumped version to 1.3.5
From: Carsten Schlote schl...@vahanus.net Signed-off-by: Carsten Schlote schl...@vahanus.net --- patches/proftpd-1.3.3g/proftpd-1.3.0rc1-ptx.diff | 37 patches/proftpd-1.3.3g/series| 1 - patches/proftpd-1.3.5/proftpd-1.3.0rc1-ptx.diff | 37 patches/proftpd-1.3.5/series | 1 + rules/proftpd.make | 4 +-- 5 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 patches/proftpd-1.3.3g/proftpd-1.3.0rc1-ptx.diff delete mode 100644 patches/proftpd-1.3.3g/series create mode 100644 patches/proftpd-1.3.5/proftpd-1.3.0rc1-ptx.diff create mode 100644 patches/proftpd-1.3.5/series diff --git a/patches/proftpd-1.3.3g/proftpd-1.3.0rc1-ptx.diff b/patches/proftpd-1.3.3g/proftpd-1.3.0rc1-ptx.diff deleted file mode 100644 index 9244f38..000 --- a/patches/proftpd-1.3.3g/proftpd-1.3.0rc1-ptx.diff +++ /dev/null @@ -1,37 +0,0 @@ -From: Robert Schwebel r...@pengutronix.de -Subject: Makefile is trying to compile host tool with cross compiler - -Signed-off-by: Marc Kleine-Budde m...@pengutronix.de - -# mkl: added standard patch header, quilt refresh'ed -# wsa: 20091227: OE uses BUILD_CC here, buildroot doesn't have such a patch (why?) -# How to solve for upstream? - - lib/libcap/Makefile |6 +- - 1 file changed, 5 insertions(+), 1 deletion(-) - -Index: proftpd-1.3.2/lib/libcap/Makefile -=== proftpd-1.3.2.orig/lib/libcap/Makefile -+++ proftpd-1.3.2/lib/libcap/Makefile -@@ -9,6 +9,10 @@ - # - topdir=$(shell pwd)/.. - include ../../Make.rules -+ifndef CC_FOR_BUILD -+CC_FOR_BUILD=$(CC) -+endif -+ - # - # Library version - # -@@ -26,7 +30,7 @@ OBJS=$(addsuffix .o, $(FILES)) - all: $(LIBNAME) - - _makenames: _makenames.c cap_names.sed -- $(CC) $(CFLAGS) $(LDFLAGS) $ -o $@ -+ $(CC_FOR_BUILD) $ -o $@ - - cap_names.h: _makenames - ./_makenames cap_names.h diff --git a/patches/proftpd-1.3.3g/series b/patches/proftpd-1.3.3g/series deleted file mode 100644 index f8bc8e1..000 --- a/patches/proftpd-1.3.3g/series +++ /dev/null @@ -1 +0,0 @@ -proftpd-1.3.0rc1-ptx.diff diff --git a/patches/proftpd-1.3.5/proftpd-1.3.0rc1-ptx.diff b/patches/proftpd-1.3.5/proftpd-1.3.0rc1-ptx.diff new file mode 100644 index 000..9244f38 --- /dev/null +++ b/patches/proftpd-1.3.5/proftpd-1.3.0rc1-ptx.diff @@ -0,0 +1,37 @@ +From: Robert Schwebel r...@pengutronix.de +Subject: Makefile is trying to compile host tool with cross compiler + +Signed-off-by: Marc Kleine-Budde m...@pengutronix.de + +--- +# mkl: added standard patch header, quilt refresh'ed +# wsa: 20091227: OE uses BUILD_CC here, buildroot doesn't have such a patch (why?) +# How to solve for upstream? + + lib/libcap/Makefile |6 +- + 1 file changed, 5 insertions(+), 1 deletion(-) + +Index: proftpd-1.3.2/lib/libcap/Makefile +=== +--- proftpd-1.3.2.orig/lib/libcap/Makefile proftpd-1.3.2/lib/libcap/Makefile +@@ -9,6 +9,10 @@ + # + topdir=$(shell pwd)/.. + include ../../Make.rules ++ifndef CC_FOR_BUILD ++CC_FOR_BUILD=$(CC) ++endif ++ + # + # Library version + # +@@ -26,7 +30,7 @@ OBJS=$(addsuffix .o, $(FILES)) + all: $(LIBNAME) + + _makenames: _makenames.c cap_names.sed +- $(CC) $(CFLAGS) $(LDFLAGS) $ -o $@ ++ $(CC_FOR_BUILD) $ -o $@ + + cap_names.h: _makenames + ./_makenames cap_names.h diff --git a/patches/proftpd-1.3.5/series b/patches/proftpd-1.3.5/series new file mode 100644 index 000..f8bc8e1 --- /dev/null +++ b/patches/proftpd-1.3.5/series @@ -0,0 +1 @@ +proftpd-1.3.0rc1-ptx.diff diff --git a/rules/proftpd.make b/rules/proftpd.make index 1c2332d..bd735da 100644 --- a/rules/proftpd.make +++ b/rules/proftpd.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_PROFTPD) += proftpd # # Paths and names # -PROFTPD_VERSION:= 1.3.3g -PROFTPD_MD5:= 8d7cb79cecfd81acec755c6130a8ddd5 +PROFTPD_VERSION:= 1.3.5 +PROFTPD_MD5:= aff1bff40e675244d72c4667f203e5bb PROFTPD:= proftpd-$(PROFTPD_VERSION) PROFTPD_SUFFIX := tar.gz PROFTPD_URL:= ftp://ftp.proftpd.org/distrib/source/$(PROFTPD).$(PROFTPD_SUFFIX) -- 2.3.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] bash: Renamed option to avoid problem with bash-completion package
From: Carsten Schlote schl...@vahanus.net This patch just changes the name of some bash config option, so that the bash-completion package won't conflict with the bash package anymore. Signed-off-by: Carsten Schlote schl...@vahanus.net --- rules/bash.in | 2 +- rules/bash.make | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/bash.in b/rules/bash.in index beb35c5..059bc9d 100644 --- a/rules/bash.in +++ b/rules/bash.in @@ -186,7 +186,7 @@ config BASH_PROCSUBST named pipes (FIFOs) or the '/dev/fd' method of naming open files. It takes the form of (list) or (list). -config BASH_COMPLETION +config BASH_BASHCOMPLETION bool prompt Enable programmable completion help diff --git a/rules/bash.make b/rules/bash.make index 238eb75..a29c9c6 100644 --- a/rules/bash.make +++ b/rules/bash.make @@ -63,7 +63,7 @@ BASH_AUTOCONF := \ --$(call ptx/endis, PTXCONF_BASH_MULTIBYTE)-multibyte \ --disable-net-redirections \ --$(call ptx/endis, PTXCONF_BASH_PROCSUBST)-process-substitution \ - --$(call ptx/endis, PTXCONF_BASH_COMPLETION)-progcomp \ + --$(call ptx/endis, PTXCONF_BASH_BASHCOMPLETION)-progcomp \ --$(call ptx/endis, PTXCONF_BASH_ESC)-prompt-string-decoding \ --$(call ptx/endis, PTXCONF_BASH_EDIT)-readline \ --$(call ptx/endis, PTXCONF_BASH_RESTRICTED)-restricted \ -- 2.3.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] bash: Updated the bash shell to release 4.3.30
From: Carsten Schlote schl...@vahanus.net systemd seems to use modern bash features like readarray, which is not provided by version 3.2.48 on current ptxdist. So I updated the bash package to a more recent bash version. The config fragment was updated with actual configure arguments, so that bash should be configurable similiar as for 3.2 version. Removed unneeded dependency statements and other tweaks like unconditionally selecting BASH_CONDITIONAL. The patches for version 3.2.48 are dropped as these patches are no longer needed for version 4.3. At least I got told so. Signed-off-by: Carsten Schlote schl...@vahanus.net --- rules/bash.in | 71 - rules/bash.make | 29 ++- 2 files changed, 88 insertions(+), 12 deletions(-) diff --git a/rules/bash.in b/rules/bash.in index 8295ad5..beb35c5 100644 --- a/rules/bash.in +++ b/rules/bash.in @@ -4,8 +4,6 @@ menuconfig BASH select LIBC_DL select GCCLIBS_GCC_S select NCURSES if BASH_CURSES - # disabling this is currently broken - select BASH_CONDITIONAL help The GNU Bourne Again SHell Bash is an sh-compatible command language interpreter that executes @@ -47,7 +45,6 @@ config BASH_ALIASES config BASH_ARITHMETIC_FOR bool prompt Enable arithmetic for command - depends on BASH help Include support for the alternate form of the for command that behaves like the C language for statement. @@ -76,11 +73,40 @@ config BASH_BRACE to pathname expansion, but the filenames generated need not exist. +config BASH_CASEMODATTR + bool + prompt include case-modifying variable attributes + +config BASH_CASEMODEXP + bool + prompt include case-modifying word expansions + +config BASH_CMDTIMING + bool + prompt enable the time reserved word and command timing + config BASH_CONDITIONAL bool default y prompt Enable the conditional command - depends on BASH + +config BASH_CONDITIONAL_REGEX + bool + prompt enable extended regular expression matching in conditional commands + depends on BASH_CONDITIONAL + +config BASH_COPROCESSES + bool + default y + prompt enable coprocess support and the coproc reserved word + +config BASH_DEBUGGER + bool + prompt enable support for bash debugger + +config BASH_DIREXPDEFLT + bool + prompt enable the direxpand shell option by default config BASH_DIRSTACK bool @@ -94,11 +120,29 @@ config BASH_DIRSTACK added to the list with the pushd command; the popd command removes entries from the list. +config BASH_DISABLED_BUILDINS + bool + prompt Allow disabled builtins to still be invoked + +config BASH_DPARAN_ARITH + bool + prompt include ((...)) command + default y + config BASH_EXTPATTERN bool -# default y prompt Include ksh-style extended pattern matching - depends on BASH + +config BASH_EXTPATTERN_DEFLT + bool + prompt force extended pattern matching to be enabled by default + +config BASH_GLOB_ASCIIRANGE_DEFLT + bool + prompt bracket range pattern matching uses C locale + help + force bracket range expressions in pattern matching to use the C + locale by default config BASH_HELP bool @@ -124,6 +168,13 @@ config BASH_JOBS This enables support for background jobs in bash. You can list the actual managed jobs by the jobs command. +config BASH_MULTIBYTE + bool + prompt Enable multibyte characters + default y + help + Enable multibyte characters if OS supports them. + config BASH_PROCSUBST bool prompt Enable process substitution @@ -179,6 +230,14 @@ config BASH_SELECT Include the select builtin, which allows the generation of simple menus. +config BASH_SEP_HELPFILES + bool + prompt use external files for help builtin documentation + +config BASH_SINGLE_HELPLINE + bool + prompt store help documentation as a single string to ease translation + endif config BASH_GPROF diff --git a/rules/bash.make b/rules/bash.make index 18d59ea..238eb75 100644 --- a/rules/bash.make +++ b/rules/bash.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BASH) += bash # # Paths and names # -BASH_VERSION := 3.2.48 -BASH_MD5 := 338dcf975a93640bb3eaa843ca42e3f8 +BASH_VERSION := 4.3.30 +BASH_MD5 := a27b3ee9be83bd3ba448c0ff52b28447 BASH := bash-$(BASH_VERSION) BASH_SUFFIX:= tar.gz BASH_URL := $(call ptx/mirror, GNU, bash/$(BASH).$(BASH_SUFFIX)) @@ -37,28 +37,45 @@ BASH_AUTOCONF := \ $(CROSS_AUTOCONF_ROOT) \ $(GLOBAL_LARGE_FILE_OPTION) \ --without-bash-malloc \ - --disable-net-redirections \ --$(call ptx/endis
Re: [ptxdist] [PATCH] bash: Updated bash to release 4.3.30
On 03.03.2015 11:29, Bruno Thomsen wrote: Not needed, as the whole block is enclosed in an if BASH...endif Otherwise looks good to me, however I'll let Michael look over this and pick it up after his holidays. Maybe Michael could also have a look on the old patches for bash 3.2. I don't know, if they are still needed or not. The patch series for Bash 3.2 was added by me to fix the Shellshock vulnerability. All the fixes are included in Bash 4.3.30, so just delete the old patch series in v2. /Bruno Hi Bruno, thanks for the feedback and info. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] bash: Updated bash to release 4.3.30
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 03.03.2015 10:34, Marc Kleine-Budde wrote: +depends on BASH ^^^ Not needed, as the whole block is enclosed in an if BASH...endif Otherwise looks good to me, however I'll let Michael look over this and pick it up after his holidays. Maybe Michael could also have a look on the old patches for bash 3.2. I don't know, if they are still needed or not. I already collected some similar patches for systemd while trying to get a full blown setup for some recent Atom platform with EFI firmware. It works pretty nice, as it boots within 7 seconds with a rootfs on NFS and the usual services running in the background. Carsten -BEGIN PGP SIGNATURE- Version: GnuPG v2 iEYEARECAAYFAlT1hkMACgkQapolUx0+VoE9IwCcDHCx2yCl6YkJ+3pkKjnttBK8 8JUAn3HHsoxD1s44TH7hklbGNIGM74PG =6ZGa -END PGP SIGNATURE- -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] PATCH: Updated bash shell from 3.2 to 4.3
commit cffc8f58066f0a96dbc9805fe6b0a8ca98255355 Author: Carsten Schlote schl...@vahanus.net Date: Wed Feb 25 11:05:06 2015 +0100 bash: Updated bash to release 4.3.30 systemd/kernel-install seems to use modern bash features like readarray, which is not provided by version 3.2.48, which is packaged with ptxdist. So I updated the bash package to a more recent bash version. Config fragment was updated with actual configure arguments, so that bash should be configurable similiar as for 3.2 version. Signed-off-by: Carsten Schlote schl...@vahanus.net diff --git a/rules/bash.in b/rules/bash.in index 8295ad5..11d5090 100644 --- a/rules/bash.in +++ b/rules/bash.in @@ -76,12 +76,54 @@ config BASH_BRACE to pathname expansion, but the filenames generated need not exist. +config BASH_CASEMODATTR + bool +# default y + prompt include case-modifying variable attributes + depends on BASH + +config BASH_CASEMODEXP + bool +# default y + prompt include case-modifying word expansions + depends on BASH + +config BASH_CMDTIMING + bool +# default y + prompt enable the time reserved word and command timing + depends on BASH + config BASH_CONDITIONAL bool default y prompt Enable the conditional command depends on BASH +config BASH_CONDITIONAL_REGEX + bool +# default y + prompt enable extended regular expression matching in conditional commands + depends on BASH BASH_CONDITIONAL + +config BASH_COPROCESSES + bool + default y + prompt enable coprocess support and the coproc reserved word + depends on BASH + +config BASH_DEBUGGER + bool +# default y + prompt enable support for bash debugger + depends on BASH + +config BASH_DIREXPDEFLT + bool +# default y + prompt enable the direxpand shell option by default + depends on BASH + config BASH_DIRSTACK bool prompt Enable builtins pushd/popd/dirs @@ -94,15 +136,40 @@ config BASH_DIRSTACK added to the list with the pushd command; the popd command removes entries from the list. +config BASH_DISABLED_BUILDINS + bool +# default y + prompt allow disabled builtins to still be invoked + depends on BASH + +config BASH_DPARAN_ARITH + bool + default y + prompt include ((...)) command + depends on BASH + config BASH_EXTPATTERN bool # default y prompt Include ksh-style extended pattern matching depends on BASH +config BASH_EXTPATTERN_DEFLT + bool +# default y + prompt force extended pattern matching to be enabled by default + depends on BASH + +config BASH_GLOB_ASCIIRANGE_DEFLT + bool +# default y + prompt force bracket range expressions in pattern matching to use the C locale by default + depends on BASH + config BASH_HELP bool prompt Include the help builtin + depends on BASH help This builtin supports minimal help features inside bash @@ -110,6 +177,7 @@ config BASH_CMDHISTORY bool prompt Turn on command history default y + depends on BASH help This enables command history features. The shell buffers commands in a ringbuffer, which can be listed, @@ -120,10 +188,16 @@ config BASH_JOBS bool prompt Enable job control features default y + depends on BASH help This enables support for background jobs in bash. You can list the actual managed jobs by the jobs command. +config BASH_MULTIBYTE + bool + prompt enable multibyte characters if OS supports them + default y + config BASH_PROCSUBST bool prompt Enable process substitution @@ -179,6 +253,14 @@ config BASH_SELECT Include the select builtin, which allows the generation of simple menus. +config BASH_SEP_HELPFILES + bool + prompt use external files for help builtin documentation + +config BASH_SINGLE_HELPLINE + bool + prompt store help documentation as a single string to ease translation + endif config BASH_GPROF diff --git a/rules/bash.make b/rules/bash.make index 18d59ea..238eb75 100644 --- a/rules/bash.make +++ b/rules/bash.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BASH) += bash # # Paths and names # -BASH_VERSION := 3.2.48 -BASH_MD5 := 338dcf975a93640bb3eaa843ca42e3f8 +BASH_VERSION := 4.3.30 +BASH_MD5 := a27b3ee9be83bd3ba448c0ff52b28447 BASH := bash-$(BASH_VERSION) BASH_SUFFIX:= tar.gz BASH_URL := $(call ptx/mirror, GNU, bash/$(BASH).$(BASH_SUFFIX)) @@ -37,28 +37,45 @@ BASH_AUTOCONF := \ $(CROSS_AUTOCONF_ROOT) \ $(GLOBAL_LARGE_FILE_OPTION) \ --without-bash-malloc \ - --disable-net-redirections \ --$(call ptx/endis, PTXCONF_BASH_SHLIKE
[ptxdist] request-pull: Updates for OSELAS Toolchain 2010.10.0
Hi,
this is the lastest version of our modified OSELAS Toolchain.
Current eglibc branch 2.11 is revision 11493.
Changes:
- Updated gmp, mpfr and mpc libraries to latest versions.
- Added GCC 4.5.1 support
- Added binutils 2.20 support
- Added EGLIBC 2.11 support
- Updated GCC 4.4.x toolchains to 4.4.4
- Updated to GDB 7.1
- Added GCC 4.5.1 toolchain configurations
- Use GIT submodule feature to checkout the correct ptxdist version
- Updated build_all_v2 script to support ptxdist as submodule
- Added configurations for Intel ATOM and AMD Geode optimized toolchains
- Some .gitignore additions to hide autogenerated files
Carsten
--
The following toolchains packages were build on 32 and 64 bit Ubuntu
10.10 LTS1 hosts successfully. Sucessfully compiled prtxdist projects
with 4.4.4. Verification for gcc 4.5.1 is WIP.
dist/oselas.toolchain-2010.10.0-armeb-xscale-linux-gnueabi-gcc-4.4.4-eglibc-2.11-binutils-2.20-kernel-2.6.31-sanitized_2010.10.0_{amd64|i386}.deb
dist/oselas.toolchain-2010.10.0-armeb-xscale-linux-gnueabi-gcc-4.5.1-eglibc-2.11-binutils-2.20-kernel-2.6.31-sanitized_2010.10.0_{amd64|i386}.deb
dist/oselas.toolchain-2010.10.0-i686-atom-linux-gnu-gcc-4.5.1-eglibc-2.11-binutils-2.20-kernel-2.6.31-sanitized_2010.10.0_{amd64|i386}.deb
dist/oselas.toolchain-2010.10.0-i686-geode-linux-gnu-gcc-4.5.1-eglibc-2.11-binutils-2.20-kernel-2.6.31-sanitized_2010.10.0_{amd64|i386}.deb
dist/oselas.toolchain-2010.10.0-i686-unknown-linux-gnu-gcc-4.4.4-eglibc-2.11-binutils-2.20-kernel-2.6.31-sanitized_2010.10.0_{amd64|i386}.deb
dist/oselas.toolchain-2010.10.0-i686-unknown-linux-gnu-gcc-4.5.1-eglibc-2.11-binutils-2.20-kernel-2.6.31-sanitized_2010.10.0_{amd64|i386}.deb
dist/oselas.toolchain-2010.10.0-m68k-linux-gnu-gcc-4.4.4-eglibc-2.11-binutils-2.20-kernel-2.6.31-sanitized_2010.10.0_amd64.deb
dist/oselas.toolchain-2010.10.0-powerpc-603e-linux-gnu-gcc-4.4.4-eglibc-2.11-binutils-2.20-kernel-2.6.31-sanitized_2010.10.0_{amd64|i386}.deb
dist/oselas.toolchain-2010.10.0-powerpc-603e-linux-gnu-gcc-4.5.1-eglibc-2.11-binutils-2.20-kernel-2.6.31-sanitized_2010.10.0_{amd64|i386}.deb
--
The following changes since commit
6b91d10341c41ce90722c7a1fe0f77a412d2d8ae:
* glibc-ports: fix version detection (2009-07-31 08:32:50 +)
are available in the git repository at:
git://git.vahanus.net/csc/oselas.toolchain.git/ for-upstream-2010.10.0
Carsten Schlote (24):
[git] Added ignore file for auto-generated files and directories
[git] Added git submodule to reference ptxdist version required
for build
[debian package] Added Section tag for created .deb packages
[build_all_v2] Added GIT submodule support, cleanups
[binutils] Added patch stack for binutils 2.20
[gcc] Updated to GCC series 4.4.4, removed older 4.4.x series
[gcc] Added 4.5.0 patch stack
[gcc-4.5.0] Added libmpc and handling code to build GCC 4.5.0
[eglibc] Added patch stack for release branch 2.11 of eglibc
[eglibc-ports] Added patch stack for release branch 2.11 of
eglibc-ports
[eglibc-support] Integrated eglibc support into framework
[glibc] Added patch to configure correctly binutils 2.20
[fixup_script] Changed subversion to GIT, added --info option
[fixup_script] Added m68k support
[fixup_script] Updated to gdb 7.1
[fixup_script] Added support for x86 atom and geode optimized
toolchains
[ptxconfigs] Deleted obsoleted 4.4.x GCC toolchains, updated to
4.4.4
[ptxconfigs] Added GCC 4.5.0 configs
[ptxconfigs] Used fixup script to update remaining ptxconfigs
[gcc] Bumped to version 4.5.1
[fixup] Updated configs with fixup script
[host-gmp] Updated to gmp version 5.0.1
[host-mpfr] Updated to mpfr version 3.0.0
[host-mpc] Updated to mpc version 0.8.2
.gitignore |8 +
.gitmodules|3 +
Kconfig|8 +
build_all_v2.mk| 48 ++-
fixup_ptxconfigs.sh| 59 ++-
p |1 +
.../03_all_binutils-2.15.92.0.2-ppc64-pie.patch| 22 +
.../04_all_binutils-2.15.92.0.2-place-orphan.patch | 22 +
.../gentoo/07_all_binutils-2.18-windres.patch | 18 +
.../08_all_binutils-RPATH_ENVVAR-smack.patch | 19 +
.../gentoo/09_all_binutils-ld-tests-CXXFLAGS.patch | 33 ++
.../generic/gentoo/12_all_sh-targets.patch | 56 ++
.../gentoo/18_all_binutils-makeinfo-version.patch | 38 ++
.../gentoo/25_all_binutils-for-build-flags.patch | 23 +
.../gentoo/30_all_binutils-multitarget-fixup.patch | 30 ++
.../gentoo/33_all_binutils-gnu-relro-fixups.patch | 536
.../gentoo/42_all_012_check_ldrunpath_length.patch | 52 ++
.../66_all_binutils-2.17.50.0.2-warn-textrel.patch | 75 +++
.../76_all_only-use-new-ld-dtags.patch.disabled
[ptxdist] request-pull: Updates for OSELAS Toolchain 2010.10.0
Hi, this is the lastest version of our modified OSELAS.Toolchain. The new patches are added to the existing patch stack. Toolchains packages were successfully build on Ubuntu 10.10.1 32/64 bit hosts. Changes: - Updated gmp, mpfr and mpc libraries to latest versions - Added GCC 4.5.x support and updated to GCC 4.5.1 - Added binutils 2.20 support - Added EGLIBC 2.11 support - Updated GCC 4.4.x toolchains to 4.4.4 - Updated to GDB 7.1 - Added GCC 4.5.1 toolchain configurations - Used GIT submodule feature to checkout the correct ptxdist version - Updated build_all_v2 script to support ptxdist as submodule - Added configurations for Intel ATOM and AMD Geode optimized toolchains - Some .gitignore additions to hide autogenerated files Carsten The following changes since commit 6b91d10341c41ce90722c7a1fe0f77a412d2d8ae: * glibc-ports: fix version detection (2009-07-31 08:32:50 +) are available in the git repository at: git://git.vahanus.net/csc/oselas.toolchain.git/ for-upstream-2010.10.0 Carsten Schlote (24): [git] Added ignore file for auto-generated files and directories [git] Added git submodule to reference ptxdist version required for build [debian package] Added Section tag for created .deb packages [build_all_v2] Added GIT submodule support, cleanups [binutils] Added patch stack for binutils 2.20 [gcc] Updated to GCC series 4.4.4, removed older 4.4.x series [gcc] Added 4.5.0 patch stack [gcc-4.5.0] Added libmpc and handling code to build GCC 4.5.0 [eglibc] Added patch stack for release branch 2.11 of eglibc [eglibc-ports] Added patch stack for release branch 2.11 of eglibc-ports [eglibc-support] Integrated eglibc support into framework [glibc] Added patch to configure correctly binutils 2.20 [fixup_script] Changed subversion to GIT, added --info option [fixup_script] Added m68k support [fixup_script] Updated to gdb 7.1 [fixup_script] Added support for x86 atom and geode optimized toolchains [ptxconfigs] Deleted obsoleted 4.4.x GCC toolchains, updated to 4.4.4 [ptxconfigs] Added GCC 4.5.0 configs [ptxconfigs] Used fixup script to update remaining ptxconfigs [gcc] Bumped to version 4.5.1 [fixup] Updated configs with fixup script [host-gmp] Updated to gmp version 5.0.1 [host-mpfr] Updated to mpfr version 3.0.0 [host-mpc] Updated to mpc version 0.8.2 .gitignore |8 + .gitmodules|3 + Kconfig|8 + build_all_v2.mk| 48 ++- fixup_ptxconfigs.sh| 59 ++- p |1 + .../03_all_binutils-2.15.92.0.2-ppc64-pie.patch| 22 + .../04_all_binutils-2.15.92.0.2-place-orphan.patch | 22 + .../gentoo/07_all_binutils-2.18-windres.patch | 18 + .../08_all_binutils-RPATH_ENVVAR-smack.patch | 19 + .../gentoo/09_all_binutils-ld-tests-CXXFLAGS.patch | 33 ++ .../generic/gentoo/12_all_sh-targets.patch | 56 ++ .../gentoo/18_all_binutils-makeinfo-version.patch | 38 ++ .../gentoo/25_all_binutils-for-build-flags.patch | 23 + .../gentoo/30_all_binutils-multitarget-fixup.patch | 30 ++ .../gentoo/33_all_binutils-gnu-relro-fixups.patch | 536 .../gentoo/42_all_012_check_ldrunpath_length.patch | 52 ++ .../66_all_binutils-2.17.50.0.2-warn-textrel.patch | 75 +++ .../76_all_only-use-new-ld-dtags.patch.disabled| 31 ++ .../generic/gentoo/91_all_libiberty-pic.patch} |8 +- ...3_all_binutils-2.18-pt-pax-flags-20070828.patch | 263 ++ patches/binutils-2.20/generic/series | 18 + .../generic/uclibc/110-arm-eabi-conf.patch | 31 ++ ..._FUTEX_OFFSET-Guard-sym-definition-with-i.patch | 33 ++ patches/eglibc-2.11/configure-sane_readelf.diff| 121 + patches/eglibc-2.11/configure_in-sane_readelf.diff | 35 ++ .../0030_all_glibc-respect-env-CPPFLAGS.patch | 32 ++ .../gentoo/0040_all_glibc-i586-chk.patch | 32 ++ ...70_all_glibc-i386-x86_64-revert-clone-cfi.patch | 55 ++ .../1010_all_glibc-queue-header-updates.patch | 89 .../gentoo/1030_all_glibc-manual-no-perl.patch | 29 + .../1040_all_2.3.3-localedef-fix-trampoline.patch | 74 +++ .../gentoo/1050_all_glibc-posix-awk.patch | 23 + .../gentoo/1055_all_glibc-resolv-dynamic.patch | 36 ++ .../gentoo/1075_all_glibc-section-comments.patch | 29 + .../gentoo/1080_all_glibc-no-inline-gmon.patch | 38 ++ .../gentoo/1090_all_glibc-2.3.6-fix-pr631.patch| 52 ++ .../gentoo/1100_all_glibc-2.3.3-china.patch| 35 ++ .../1103_all_glibc-new-valencian-locale.patch | 122 + .../1120_all_glibc-2.5-strict-aliasing.patch | 91
[ptxdist] [ptxdist/targetinfo] Bugfix for bash command line overflow, fix for giant deptree.ps
Hi,
Problem:
...
make: execvp: bash: Argument list too long
...
which happens in targetinfo macro.
Macros reworked. Output to depends.out limited to seriously
needed data and fixing the giant deptree.ps problem (200x_53_ pixel)
Carsten
--
commit d48cd3346d930f9f467dddf4e4f6c5a02dc07e88
Author: Carsten Schlote c.schl...@konzeptpark.de
Date: Mon Sep 6 13:18:50 2010 +0200
[ptxdist/targetinfo] Reworked targetinfo macro / bugfix
With the ability to track dependencies on ipkg contents the bash
command
line produced by targetinfo might exceed the allowed maximum length
of
app. 32kB.
On the other hand we won't need all the details for the resulting
deptree.ps anyway. By fact keeping all dependencies will result in
an unusable
deptree.ps file of several megabytes and insane dimensions.
So the macro is reworked to avoid command line overflows and also to
limit output to files located in the state dir.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
diff --git a/rules/post/function-targetinfo.make
b/rules/post/function-targetinfo.make
index f8bcebe..8fe74b0 100644
--- a/rules/post/function-targetinfo.make
+++ b/rules/post/function-targetinfo.make
@@ -18,14 +18,18 @@ ifdef PTXDIST_QUIET
_targetinfo_opt_output := echo started :
$(PTX_COLOR_BLUE)$${target}$(PTX_COLOR_OFF) $(PTXDIST_FD_STDOUT);
endif
-targetinfo = \
- target=$(strip $(@)); \
- target=$${target\#\#*/}; \
- dep=$(strip $^); \
- dep=$${dep\#\#*/};\
- echo $${target} : $${dep} $(DEP_OUTPUT); \
+define targetinfo_updatedeps
+ target=$(notdir $(strip $(@)));
\
+ dep=$(notdir $(filter /state%,$(subst $(PTXDIST_PLATFORMDIR),,$(strip
$^;\
+ echo $${target} : $${dep} $(DEP_OUTPUT);
+endef
+
+define targetinfo
+ $(targetinfo_updatedeps)
+ target=$(notdir $(strip $(@))); \
$(_targetinfo_opt_output) \
- target=target: $${target\#\#*/}; \
- echo -e \n$${target//?/-}\n$${target}\n$${target//?/-}\n; \
+ target=target: $${target};\
+ echo -e \n$${target//?/-}\n$${target}\n$${target//?/-}\n;
+endef
# vim: syntax=make
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] request-pull: Add eglibs and current GDB support to ptxdist (feature from OSELAS Toolchain 2010.10.0)
Hi, the previously posten patches for OSELAS.Toolchain add eglibc support and bumped version of GDB to 7.1. The patches add eglibc support as option to ptxdist and changes the GDB default version to 7.1. Carsten -- The following changes since commit 5e7ee8f939ceaecc44795b6d20f01800820aa3a9: [generic] add --localstatedir=/var to CROSS_AUTOCONF_SYSROOT_USR (2010-09-09 16:00:14 +0200) are available in the git repository at: git://git.vahanus.net/csc/ptxdist-kp.git/ fu-eglibc Carsten Schlote (2): [eglibc] Add support for OSELAS eglibc toolchains to ptxdist [gdb] Updated default value to 7.1 as in patched toolchains. bin/ptxdist |5 +- platforms/toolchain.in| 18 ++- rules/eglibc.in | 240 + rules/eglibc.make | 202 +++ rules/gdb-menu.in |2 +- rules/libc.in | 25 rules/locales.in |4 +- rules/post/install.make | 18 +++- rules/pre/Version.make|1 + rules/timezone.in |2 +- scripts/install_copy_toolchain.sh | 73 +++- 11 files changed, 576 insertions(+), 14 deletions(-) create mode 100644 rules/eglibc.in create mode 100644 rules/eglibc.make -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [ANNOUNCE] ptxdist-2010.07.0 Generic Reference Project released
Am Donnerstag, den 01.07.2010, 17:37 +0200 schrieb Juergen Beisert: PTXdist 2010.07.0 Generic Reference Project Release --- Is there a GIT repo for the reference projects? -- Carsten Schlote c.schl...@konzeptpark.de konzeptpark.de -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] pull-request; package additions, package updates
Hi Michael,
thanks for the review. I will rework all of your point as soon as find
time (this mail and the other two.)
I added three further patches to the end of for-upstream branch.
The new versions of busybox and autotools seem to work, at least
everything behaves correctly.
The PKG_CONF_FIXUP patch was added to easily support those projects,
who rely on embedded paths to shared objects. There might be other ways
to load such objects, but the autoconf framework provides the easy
automatic way.
If PKG_CONF_FIXUP=NO is defined, the fixup step is skipped. Otherwise
a default of YES is assumed for autoconf, or might be forced with a YES.
Carsten
--
The following changes since commit
864819408326825f58f8b0345e2ab58dcdfc7506:
Carsten Schlote (1):
[perl] Added version 5.10.1
are available in the git repository at:
git://git.vahanus.net/csc/ptxdist-kp.git/ for-upstream
Carsten Schlote (3):
[busybox] Updated to 1.16.2
[ptxd_make_workd_*] Added PKG_CONF_FIXUP make variable
[autotools] Updated to newer autoconf, automake and libtool
versions
.../0001-reactivate-check-for-tty.patch|0
.../0002-silence-errors-on-BE-platforms.patch |0
patches/{busybox-1.16.1 = busybox-1.16.2}/series |0
rules/busybox.make |2 +-
rules/host-autotools-autoconf.make |2 +-
rules/host-autotools-automake.make |2 +-
rules/host-autotools-libtool.make |6 +++---
rules/post/ptxd_make_world_common.make |1 +
scripts/lib/ptxd_make_world_common.sh | 16
scripts/lib/ptxd_make_world_patchin.sh |4 +++-
10 files changed, 26 insertions(+), 7 deletions(-)
rename patches/{busybox-1.16.1 =
busybox-1.16.2}/0001-reactivate-check-for-tty.patch (100%)
rename patches/{busybox-1.16.1 =
busybox-1.16.2}/0002-silence-errors-on-BE-platforms.patch (100%)
rename patches/{busybox-1.16.1 = busybox-1.16.2}/series (100%)
--
Carsten Schlote c.schl...@konzeptpark.de
konzeptpark.de
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] request-pull: Updates for OSELAS Toolchain
Hi Robert, Am Mittwoch, den 23.06.2010, 08:37 +0200 schrieb Robert Schwebel: Thanks for this great effort, I'll see that we manage to find some time to update the upstream. Thanks. As reference for review: The _for-upstream-next_ branch on my server contain all patches I applied over last 1-2 years. I condensed them yesterday into the for-upstream branch. Although I diffed and compared against the grown branch twice, I hope that I didn't break stuff in the process. But at least the patch series is now much more readable and obsoleted stuff and patches were stripped ;-) Maybe somebody is interested in testing the x86 Atom toolchain. Inspired by some chat on IRC I added it as some first attempt to provide something more suitable for 'low power Intel architecures'. It seems to create slightly different code than the a generic i686 compiler. Any further suggestions for additional GCC config options are appreciated. However, I'm very uncomfortable with putting in tons of underdocumented distro compiler patches. But I assume it isn't much better in the current state. I agree. Some of these patches seem to be useful, others might be less and distro-related. I had a short look on them and I presume that these patches shouldn't do any harm at least. But testing a toolchain is a sophisticated issue by itself ;-) For now GCC 4.5.0 and eglibc work fine. In the next days I need to unmess the related companion patches (eglibc mostly) for ptxdist itself as soon as I find some time. I also fixed some smaller bugs in the ipkg-push stuff - right now there is a bug in mainline, which prevents proper operation of the ipkg repositories after some update cycles. But more about that in some later pull-request. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] pull-request; package additions, package updates
Hi,
these patches provide new or updated packages.
As usual the package patches provide fixes for cross-compilation and
compiler issues.
Carsten
---
The following changes since commit
dee596b721d29d45d721866b38cba693a72eab3d:
Marc Kleine-Budde (1):
[lmbench] cleanups: remove unneeded prepare stage
are available in the git repository at:
git://git.vahanus.net/csc/ptxdist-kp.git/ for-upstream
Carsten Schlote (22):
[gdb] Updated default value to 7.1
[lshw] Fixed GCC 4.5.0 warning which causes build break (-Werror)
[6tunnel] Added package for 6tunnel, version 0.11rc2
[statserial] Added statserial 1.1 with Ubuntu patches
[zsync] Added version 0.6.1 as package to ptxdist
[midnight commander] Updated version to 4.7.0, adding more install
options
[udev] Updated to udev version 151
[ptxdist][v2] Updated ptxdist usage text for bash, make, removed
autobuild
[vpnc][v4] Added vpnc 0.5.3 package, a VPN client for Cisco
concentrators
[miredo][v5] Added miredo 1.2.2, a teredo IPV6 client
[ppp] Added plog and pppoe-discovery options and install
[ppp] Updated generic/{pon|poff} to maintainer version
[mtd-utils] Fixes LZO Compression and crashes
[nfsutils] Added dependancies when compiling NFSv4 support
[mtd-utils] Added config options and install
[mtd-utils] Workaround the -Werror problems
[dbench] Added dependency for libattr.so
[sysvinit] Added comments for busybox builtins used.
[acpid] Removed -Werror to allow compilation with GCC 4.4.1
[dhcp] Fixed GCC 4.4.1 compile error
[dhcp] Fixed problem with -Werror and GCC 4.5.0-snapshot
[perl] Added version 5.10.1
bin/ptxdist| 19 +-
generic/etc/init.d/miredo-server | 89 +
generic/etc/miredo/client-hook | 70 +
generic/etc/miredo/miredo-server.conf | 22 +
generic/etc/miredo/miredo.conf | 35 +
generic/etc/vpnc/default.conf |6 +
generic/etc/vpnc/vpnc-script | 529 ++
generic/usr/bin/poff | 102 +-
generic/usr/bin/pon| 38 +-
patches/6tunnel-0.11rc2/crosscompile-fixes.patch | 55 +
patches/6tunnel-0.11rc2/fix-compile-warnings.patch | 22 +
patches/6tunnel-0.11rc2/series |2 +
.../fix-gcc-4.4.1-error-warnings.patch | 25 +
patches/acpid-1.0.10/series|1 +
patches/{udev-150 = dhcp-4.1.1}/autogen.sh|0
.../dhcp-4.1.1/gcc4.4-fixup-error-warning.patch| 39 +
patches/dhcp-4.1.1/series |1 +
patches/lshw-B.02.14/0003-fix-gcc450-issues.patch | 22 +
patches/lshw-B.02.14/series|1 +
patches/{udev-150 = mc-4.7.0}/autogen.sh |0
.../debian/02_use_correct_smb_conf_path.patch | 19 +
patches/mc-4.7.0/debian/03_use_awk.patch | 19 +
.../11_unzip_needs_regex_update_lp397505.patch | 30 +
patches/mc-4.7.0/mc-install-fixes.patch| 57 +
patches/mc-4.7.0/series|4 +
patches/{udev-150 = miredo-1.2.2}/autogen.sh |0
patches/miredo-1.2.2/series|3 +
patches/mtd-utils-1.3.1/lzo-compr-fixes.patch | 59 +
patches/mtd-utils-1.3.1/series |2 +
patches/perl-5.10.0/100-static_uudmap.patch| 50 +
patches/perl-5.10.0/perl-cross-fixes.patch |
+++
patches/perl-5.10.0/series |3 +
.../perl-5.10.1/0001-use-static-dummy-uudmap.patch | 65 +
.../0002-provide-cross-configs-and-scripts.patch | 8994
patches/perl-5.10.1/series |3 +
.../statserial-1.1.orig/crosscompile-fixes.patch | 42 +
patches/statserial-1.1.orig/series |2 +
.../statserial-1.1.orig/statserial_1.1-22.diff.gz | Bin 0 - 3135
bytes
...e-utimensat-instead-of-utimes-and-lutimes.patch |3 +
patches/{udev-150 = udev-151}/autogen.sh |0
patches/{udev-150 = udev-151}/series |4 +
.../udev-150-fix-ppc-build.diff|2 +
.../udev-150-kernel-headers-dir.diff | 36 +-
.../udev-150-remove-le16toh.diff |2 +
.../udev-150-revert-SOCK_CLOEXEC.diff |3 +
.../udev-150-revert-bsg_h-removal.diff | 30 +-
.../udev-150-split-extras.diff | 50 +-
patches/udev-151/udev_151-10.diff.gz | Bin 0 - 132990
bytes
.../0001-Add-missing-options-to-manpage.patch | 38 +
...02-makeman.pl-make-it-cross-compile-aware.patch | 174 +
patches/vpnc-0.5.3/0003-posix-fixups.patch | 31 +
patches/vpnc-0.5.3/0004-update-todos.patch | 46 +
patches/vpnc
[ptxdist] [PATCH 7/8] [sudo][v2] Updated config options for visudo and install
From: Carsten Schlote c.schl...@konzeptpark.de - Added visudo and configuration options for default and ENV editor. - Added install_* for visudo - Fixed install rights - Removed __ from kconfig options and use better names for them. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/sudo.in | 24 ++-- rules/sudo.make | 25 +++-- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/rules/sudo.in b/rules/sudo.in index 1e9033c..4540dfa 100644 --- a/rules/sudo.in +++ b/rules/sudo.in @@ -11,16 +11,36 @@ menuconfig SUDO if SUDO -config SUDO__SENDMAIL +config SUDO_USE_SENDMAIL bool # FIXME: sendmail support is buggy and searches for # /sbin/sendmail on the host #prompt sendmail support -config SUDO__ETC_SUDOERS +config SUDO_INSTALL_ETC_SUDOERS bool Install sudoers file into /etc default y help Installs /etc/sudoers from a selectable source +config SUDO_INSTALL_VISUDO + bool Install visudo to edit /etc/sudoers + help + Installs visudo to edit /etc/sudoers. + +if SUDO_INSTALL_VISUDO + +config SUDO_DEFAULT_EDITOR + string visudo default editor + default /bin/vi + help + Default editor for visudo + +config SUDO_USE_ENV_EDITOR + bool Use EDITOR env for visudo + help + Uses editor from EDITOR env for visudo + +endif + endif diff --git a/rules/sudo.make b/rules/sudo.make index fe59d43..32e3a7f 100644 --- a/rules/sudo.make +++ b/rules/sudo.make @@ -61,12 +61,22 @@ SUDO_AUTOCONF = \ --with-ignore-dot \ --without-pam -ifdef PTXCONF_SUDO__SENDMAIL +ifdef PTXCONF_SUDO_USE_SENDMAIL SUDO_AUTOCONF += --with-sendmail else SUDO_AUTOCONF += --without-sendmail endif +ifdef PTXCONF_SUDO_DEFAULT_EDITOR +SUDO_AUTOCONF += --with-editor=$(PTXCONF_SUDO_DEFAULT_EDITOR) +endif + +ifdef PTXCONF_SUDO_USE_ENV_EDITOR +SUDO_AUTOCONF += --with-env-editor +else +SUDO_AUTOCONF += --without-env-editor +endif + # --disable-root-mailer Don't run the mailer as root, run as the user # --disable-setreuid Don't try to use the setreuid() function # --disable-setresuid Don't try to use the setresuid() function @@ -131,17 +141,20 @@ $(STATEDIR)/sudo.targetinstall: @$(call install_fixup, sudo,DEPENDS,) @$(call install_fixup, sudo,DESCRIPTION,missing) - @$(call install_copy, sudo, 0, 0, 7755, -, /usr/bin/sudo) + @$(call install_copy, sudo, 0, 0, 7711, -, /usr/bin/sudo) @$(call install_link, sudo, sudo, /usr/bin/sudoedit) - @$(call install_copy, sudo, 0, 0, 0755, -, \ - /usr/libexec/sudo_noexec.so) + @$(call install_copy, sudo, 0, 0, 0644, -, /usr/libexec/sudo_noexec.so) -ifdef PTXCONF_SUDO__ETC_SUDOERS +ifdef PTXCONF_SUDO_INSTALL_ETC_SUDOERS @$(call install_alternative, sudo, 0, 0, 0440, /etc/sudoers, n) endif - @$(call install_finish, sudo) +ifdef PTXCONF_SUDO_INSTALL_VISUDO + @$(call install_copy, sudo, 0, 0, 711, -, /usr/sbin/visudo) +endif + + @$(call install_finish, sudo) @$(call touch) # vim: syntax=make -- 1.6.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 8/8] [sudo] Update to 1.7.2p5
From: Carsten Schlote c.schl...@konzeptpark.de
- Updated to latest stable version. Fixepd URL.
- Copies patch to disable stripping
- patches for cross-compilation (unsetenv)
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
.../0001-install-sh-disable-stripping.patch| 29
patches/sudo-1.7.2p5/autogen.sh|3 ++
.../sudo-1.7.2p5/fix-problem-with-unsetenv.patch | 25 +
patches/sudo-1.7.2p5/series|2 +
rules/sudo.in |1 +
rules/sudo.make|4 +-
6 files changed, 62 insertions(+), 2 deletions(-)
create mode 100644 patches/sudo-1.7.2p5/0001-install-sh-disable-stripping.patch
create mode 100755 patches/sudo-1.7.2p5/autogen.sh
create mode 100644 patches/sudo-1.7.2p5/fix-problem-with-unsetenv.patch
create mode 100644 patches/sudo-1.7.2p5/series
diff --git a/patches/sudo-1.7.2p5/0001-install-sh-disable-stripping.patch
b/patches/sudo-1.7.2p5/0001-install-sh-disable-stripping.patch
new file mode 100644
index 000..c8421a5
--- /dev/null
+++ b/patches/sudo-1.7.2p5/0001-install-sh-disable-stripping.patch
@@ -0,0 +1,29 @@
+From 0c293e823cbe169ed09f1be263ff22e57b9d03ef Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde m...@pengutronix.de
+Date: Wed, 13 Jan 2010 09:29:27 +0100
+Subject: [PATCH] install-sh: disable stripping
+
+This patch disables stripping because the install-sh would use
+/usr/bin/strip which doesn't work during cross compilation.
+
+Signed-off-by: Marc Kleine-Budde m...@pengutronix.de
+---
+ install-sh |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/install-sh b/install-sh
+index 5a6d399..e9a70b5 100755
+--- a/install-sh
b/install-sh
+@@ -138,7 +138,7 @@ while ${MORETODO} ; do
+ fi
+ ;;
+ X-s)
+- STRIPIT=true
++ STRIPIT=false
+ ;;
+ X--)
+ shift
+--
+1.6.6
+
diff --git a/patches/sudo-1.7.2p5/autogen.sh b/patches/sudo-1.7.2p5/autogen.sh
new file mode 100755
index 000..84d1401
--- /dev/null
+++ b/patches/sudo-1.7.2p5/autogen.sh
@@ -0,0 +1,3 @@
+# Reconfigure configure script with patch .in file
+autoconf
+
diff --git a/patches/sudo-1.7.2p5/fix-problem-with-unsetenv.patch
b/patches/sudo-1.7.2p5/fix-problem-with-unsetenv.patch
new file mode 100644
index 000..f537fa2
--- /dev/null
+++ b/patches/sudo-1.7.2p5/fix-problem-with-unsetenv.patch
@@ -0,0 +1,25 @@
+From: Carsten Schlote c.schl...@konzeptpark.de
+Subject: Fix a problem with unsetenv and eglibc(?)
+
+The configuration for unsetenv() is detected wrong. The test has
+beend removed as a hotfix.
+
+Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
+---
+---
+ configure.in |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: sudo-1.7.2p5/configure.in
+===
+--- sudo-1.7.2p5.orig/configure.in 2010-03-01 12:15:55.0 +0100
sudo-1.7.2p5/configure.in 2010-03-04 15:03:33.0 +0100
+@@ -1842,7 +1842,7 @@
+ AC_CHECK_FUNCS(strchr strrchr memchr memcpy memset sysconf tzset \
+ strftime setrlimit initgroups getgroups fstat gettimeofday \
+ setlocale getaddrinfo setsid setenv setrlimit64)
+-AC_CHECK_FUNCS(unsetenv, SUDO_FUNC_UNSETENV_VOID)
++#AC_CHECK_FUNCS(unsetenv, SUDO_FUNC_UNSETENV_VOID)
+ SUDO_FUNC_PUTENV_CONST
+ if test -z $SKIP_SETRESUID; then
+ AC_CHECK_FUNCS(setresuid, [SKIP_SETREUID=yes])
diff --git a/patches/sudo-1.7.2p5/series b/patches/sudo-1.7.2p5/series
new file mode 100644
index 000..38ae162
--- /dev/null
+++ b/patches/sudo-1.7.2p5/series
@@ -0,0 +1,2 @@
+0001-install-sh-disable-stripping.patch
+fix-problem-with-unsetenv.patch
diff --git a/rules/sudo.in b/rules/sudo.in
index 4540dfa..7ad9a17 100644
--- a/rules/sudo.in
+++ b/rules/sudo.in
@@ -1,4 +1,5 @@
## SECTION=shell_and_console
+
menuconfig SUDO
tristate
prompt sudo
diff --git a/rules/sudo.make b/rules/sudo.make
index 32e3a7f..e3c4c04 100644
--- a/rules/sudo.make
+++ b/rules/sudo.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_SUDO) += sudo
#
# Paths and names
#
-SUDO_VERSION := 1.6.9
+SUDO_VERSION := 1.7.2p5
SUDO := sudo-$(SUDO_VERSION)
SUDO_SUFFIX:= tar.gz
-SUDO_URL := http://www.courtesan.com/sudo/dist/OLD/$(SUDO).$(SUDO_SUFFIX)
+SUDO_URL := http://www.sudo.ws/sudo/dist/$(SUDO).$(SUDO_SUFFIX)
SUDO_SOURCE:= $(SRCDIR)/$(SUDO).$(SUDO_SUFFIX)
SUDO_DIR := $(BUILDDIR)/$(SUDO)
--
1.6.6.1
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 1/8] [host-attr] Added DIST_ROOT definition in .make fragment
From: Carsten Schlote c.schl...@konzeptpark.de Added the missing definition for DIST_ROOT to install stage, otherwise it tries to install host binaries into the host filesystem instead to PKG_DIR. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-attr.make |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/rules/host-attr.make b/rules/host-attr.make index 9d4cafc..d0ad7b8 100644 --- a/rules/host-attr.make +++ b/rules/host-attr.make @@ -21,6 +21,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_ATTR) += host-attr HOST_ATTR_ENV := $(HOST_ENV) HOST_ATTR_INSTALL_OPT := \ + DIST_ROOT=$(ATTR_PKGDIR) \ install \ install-lib \ install-dev -- 1.6.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 6/8] [inetutils] Fixed typo preventing installation of rc.d link for syslogd
From: Carsten Schlote c.schl...@konzeptpark.de The /etc/rc.d link isn't created for the initmethod-upstart because of a typo. Fixed spelling. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/inetutils.in |2 +- rules/inetutils.make |2 +- rules/initmethod-bbinit.in |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/inetutils.in b/rules/inetutils.in index 5acf09e..d6637e3 100644 --- a/rules/inetutils.in +++ b/rules/inetutils.in @@ -94,7 +94,7 @@ config INETUTILS_SYSLOGD if INETUTILS_SYSLOGD -config INETUTILS_SYSLOGD_STARTSRCIPT +config INETUTILS_SYSLOGD_STARTSCRIPT bool prompt install /etc/init.d/syslogd default y diff --git a/rules/inetutils.make b/rules/inetutils.make index 96828b2..312ee3c 100644 --- a/rules/inetutils.make +++ b/rules/inetutils.make @@ -161,7 +161,7 @@ ifdef PTXCONF_INETUTILS_SYSLOGD @$(call install_copy, inetutils, 0, 0, 0755, \ $(INETUTILS_PKGDIR)/usr/sbin/syslogd, /sbin/syslogd) endif -ifdef PTXCONF_INETUTILS_SYSLOGD_STARTSRCIPT +ifdef PTXCONF_INETUTILS_SYSLOGD_STARTSCRIPT @$(call install_alternative, inetutils, 0, 0, 0755, \ /etc/init.d/syslogd, n) endif diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in index 92f610f..1b4d8f2 100644 --- a/rules/initmethod-bbinit.in +++ b/rules/initmethod-bbinit.in @@ -119,7 +119,7 @@ config INITMETHOD_BBINIT_LINK_INETD config INITMETHOD_BBINIT_LINK_SYSLOGD string - depends on BUSYBOX_SYSLOGD_STARTSCRIPT || INETUTILS_SYSLOGD_STARTSRCIPT + depends on BUSYBOX_SYSLOGD_STARTSCRIPT || INETUTILS_SYSLOGD_STARTSCRIPT prompt syslogd default S08syslogd -- 1.6.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 5/8] [microcom] Display comment in ptxconfig file, when microcom from busybox is selected.
From: Carsten Schlote c.schl...@konzeptpark.de Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/microcom.in |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/rules/microcom.in b/rules/microcom.in index 74134bc..ae4be8a 100644 --- a/rules/microcom.in +++ b/rules/microcom.in @@ -7,3 +7,10 @@ config MICROCOM minimalistic terminal program It doesn't work with modem though. + +if MICROCOM + +comment BusyBox' microcom is selected! + depends on BUSYBOX_MICROCOM + +endif -- 1.6.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] udev 0.6.5
Am Freitag, den 02.04.2010, 00:32 +0200 schrieb Tim Sander: Hi Attached are some files needed to get udev 0.6.5 with the needed libnih. Yes i know i shuld use git for that but well its just some rule files... I think the upstart.in is not changed from the version of the latest ptxdist 2010.03.0 release. Seems that we did the some jobs twice :-) The libnih stuff is also required for upstart and mountall executables. Maybe I should get our server up and running again and publish my patches again. -- Gruss Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] pull for review: Changes Ipkg-dist, images and kernelimage name. Added install option for oftree as ipkg. ...
Moin Marc
Carsten Schlote (15):
[ipkg-push] Create stage file for ipkg-push make target
[images] Creation of 'Packages', removed redirection to nil:
[host-localedef] Added missing get make target
[dtc] Added option to install oftree into /boot
[kernel] Fixed creation of boot directory using appropriate
rights
I think I've cherry-picked these ^^
So I won't touch them again. I tested the DTC and kernel stuff and
it works fine - I can update the whole system with ipkg update and on
next reboot the latest kernel and oftree are loaded from /boot.
BTW: Any plans to update the phytec-mpc5200b-{tiny|...} bootloader (also
and preferably u-boot-v2)? Or any started work on it, which I could pick
up and continue? I'd like to fetch the kernel and oftree from either
ext2/3/4 or jffs2 and get rid of the extra partitions on CF and the two
extra MTD parts
[images] Added option IMAGE_INSTALL_FROM_IPKG_REPOSITORY
[images] Fixup ipkg status file in worktmp for image creation
I'm testing the two modes of operation right now and check that
ipkg/status is matching the packages, which were used to create the
images.
[images] Reworked creation IPKG_FILES and
$(IMGDIR)/permissions
Here is one minor open issue: I currently collect the ipk files without
caring about the version. As long as no old ipk files are around and no
upstream update causes a new package version, this is fine. But with
multiple files (e.g. foo_1.0{0|1|...}_arch.ipk) the wrong file for image
creation might be collected (first hit is taken).
So I fear I have to add a ptxd library function to consistently convert
a PKG_VERSION into a IPKG_VERSION and use it at several place to change
the match patterns to include it as well.
For the IPKG_VERSION we need in addition to the '-_'-'.' conversion
some code to
replace letters by numbers, which can be parsed and compared correctly
and result into the right answer for the Which package is newer?
question.
[kernel] Use real imagename instead of linuximage, add legacy
link
I have to test if the link works in all cases. Think of someone
copying
the kernel image with cp -a
Right, there might be some issues. But it was intended as some kind of
legacy support - at least until we changed all our boxes to the 'new'
name. I really prefer to be able to distinguish between linux images by
their names. Instead of 'linuximage' you setup the correct name in
uboot/PXE/dhcp - no extra work, less ambigious.
The legacy link stuff definitivly breaks, if your /boot partition is FAT
and symbolic links can't be used. For TFTP/NFS setup the link should
work as long as ptxdist is used to update and create the kernel image
and the legacy link.
[vpnc][v4] Added vpnc 0.5.3 package, a VPN client for Cisco
concentrators
vpnc still does not work here
We compiled it on several Ubuntu machines last night. Some are matured,
others newly setup for development - no problems. So I'm a bit glueless,
why it doesn't compile on your box.
I attached the logfile for a vpnc package rebuild - I really can't see
any problems, the makeman.pl script correctly handles the
cross-compilation issue.
BTW: We have the host-perl (5.10.1) package enabled. It is required for
the target-perl build process. The perl binaries in sysroot-host overlay
our host machines' perl binaries - maybe this is the reason why it works
here?
Carsten
logfile
Description: logfile
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] pull for review: Changes Ipkg-dist, images and kernelimage name. Added install option for oftree as ipkg. ...
The following changes since commit
62802b345c177ee80e1fbea2724914df78c01736:
Luotao Fu (1):
[ptxdist] relocate setenv config file parsing code
are available in the git repository at:
git://www.vahanus.net/ptxdist-kp.git for-upstream
Carsten Schlote (15):
[ipkg-push] Create stage file for ipkg-push make target
[images] Creation of 'Packages', removed redirection to nil:
[images] Added option IMAGE_INSTALL_FROM_IPKG_REPOSITORY
[images] Fixup ipkg status file in worktmp for image creation
[images] Reworked creation IPKG_FILES and $(IMGDIR)/permissions
[host-localedef] Added missing get make target
[dtc] Added option to install oftree into /boot
[kernel] Fixed creation of boot directory using appropriate rights
[kernel] Use real imagename instead of linuximage, add legacy link
[ptxdist][v2] Updated ptxdist usage text for bash, make, removed
autobuild
[vpnc][v4] Added vpnc 0.5.3 package, a VPN client for Cisco
concentrators
[miredo][v5] Added miredo 1.2.2, a teredo IPV6 client
[ppp] Added plog and pppoe-discovery options and install
[ppp] Updated generic/{pon|poff} to maintainer version
[sudo][v2] Updated config options for visudo and install
bin/ptxdist| 19 +-
generic/etc/init.d/miredo-server | 89
generic/etc/miredo/client-hook | 70 +++
generic/etc/miredo/miredo-server.conf | 22 +
generic/etc/miredo/miredo.conf | 35 ++
generic/etc/vpnc/default.conf |6 +
generic/etc/vpnc/vpnc-script | 529
generic/usr/bin/poff | 102 -
generic/usr/bin/pon| 38 ++-
patches/miredo-1.2.2/autogen.sh|1 +
patches/miredo-1.2.2/series|3 +
.../0001-Add-missing-options-to-manpage.patch | 38 ++
...02-makeman.pl-make-it-cross-compile-aware.patch | 174 +++
patches/vpnc-0.5.3/0003-posix-fixups.patch | 31 ++
patches/vpnc-0.5.3/0004-update-todos.patch | 46 ++
patches/vpnc-0.5.3/series |4 +
platforms/dtc.in | 12 +-
platforms/image_ipkg.in| 12 +
rules/dtc.make | 18 +
rules/host-localedef.make |8 +
rules/kernel.make | 12 +-
rules/miredo.in| 19 +
rules/miredo.make | 96
rules/post/image_ipkg.make |5 +-
rules/post/images.make | 57 ++-
rules/ppp.in | 20 +-
rules/ppp.make | 14 +-
rules/sudo.in | 24 +-
rules/sudo.make| 25 +-
rules/vpnc.in | 47 ++
rules/vpnc.make| 89
31 files changed, 1630 insertions(+), 35 deletions(-)
create mode 100644 generic/etc/init.d/miredo-server
create mode 100644 generic/etc/miredo/client-hook
create mode 100644 generic/etc/miredo/miredo-server.conf
create mode 100644 generic/etc/miredo/miredo.conf
create mode 100644 generic/etc/vpnc/default.conf
create mode 100755 generic/etc/vpnc/vpnc-script
create mode 12 patches/miredo-1.2.2/autogen.sh
create mode 100644 patches/miredo-1.2.2/dummy.patch
create mode 100644 patches/miredo-1.2.2/series
create mode 100644
patches/vpnc-0.5.3/0001-Add-missing-options-to-manpage.patch
create mode 100644
patches/vpnc-0.5.3/0002-makeman.pl-make-it-cross-compile-aware.patch
create mode 100644 patches/vpnc-0.5.3/0003-posix-fixups.patch
create mode 100644 patches/vpnc-0.5.3/0004-update-todos.patch
create mode 100644 patches/vpnc-0.5.3/series
create mode 100644 rules/miredo.in
create mode 100644 rules/miredo.make
create mode 100644 rules/vpnc.in
create mode 100644 rules/vpnc.make
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 1/4] [ipkg-push] Create stage file for ipkg-push make target
From: Carsten Schlote c.schl...@konzeptpark.de ipkg-push depends on world.targetinstall. So I added a stage file to avoid calls to the push scripts, if nothing changed. To force an ipkg-push remove $STATEDIR/ipkg-push Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/post/image_ipkg.make |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make index 592c6ca..6222c22 100644 --- a/rules/post/image_ipkg.make +++ b/rules/post/image_ipkg.make @@ -26,6 +26,7 @@ endif --project $(call remove_quotes,$(PTXCONF_PROJECT)) \ --dist $(call remove_quotes,$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)) @echo ipkg-repository updated + @touch $@ SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_INDEX) += $(PKGDIR)/Packages -- 1.6.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/4] [images] Added option IMAGE_INSTALL_FROM_IPKG_REPOSITORY
From: Carsten Schlote c.schl...@konzeptpark.de When setting this option, the workdir is created from the ipkg files in the ipkg-repository. Setting this option will enforce an ipkg-push to ensure that the images are build with latest packages. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- platforms/image_ipkg.in | 12 rules/post/images.make |5 + 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/platforms/image_ipkg.in b/platforms/image_ipkg.in index ef36984..3ed224a 100644 --- a/platforms/image_ipkg.in +++ b/platforms/image_ipkg.in @@ -24,6 +24,18 @@ config IMAGE_IPKG_FORCED_PUSH If this option is checked, this is done by default. This is most useful for development purposes. +config IMAGE_INSTALL_FROM_IPKG_REPOSITORY + bool + select IMAGE_IPKG_PUSH_TO_REPOSITORY + select IMAGE_IPKG_FORCED_PUSH + prompt make images: install packets from ipkg-repository + help + If this option is checked the packet files from the + ipkg-repository are used to create the images + + Please note, that the ipkg-repository is currently a + local directory on your machine. + config IMAGE_IPKG_INDEX bool generate ipkg.index default y diff --git a/rules/post/images.make b/rules/post/images.make index bcf6df7..aa53645 100644 --- a/rules/post/images.make +++ b/rules/post/images.make @@ -43,7 +43,12 @@ endif # list of all ipkgs being selected for the root image # UGLY: Just these files have '_' substituted to '-'; the permission files above have NOT. # Consistency would be nicer, but when fixing, change for side-effects carefully! +ifdef PTXCONF_IMAGE_INSTALL_FROM_IPKG_REPOSITORY +IPKG_REPO_DISTDIR := $(PTXCONF_SETUP_IPKG_REPOSITORY)/$(call remove_quotes,$(PTXCONF_PROJECT))/dists/$(call remove_quotes,$(PTXCONF_PROJECT))$(call remove_quotes,$(PTXCONF_PROJECT_VERSION)) +IPKG_FILES := $(foreach pkg, $(PACKAGES), $(wildcard $(IPKG_REPO_DISTDIR)/$(subst _,-,$(pkg))*.ipk)) +else IPKG_FILES := $(foreach pkg, $(PACKAGES), $(wildcard $(PKGDIR)/$(subst _,-,$(pkg))*.ipk)) +endif ifdef PTXDIST_PROD_PLATFORMDIR IPKG_FILES += $(wildcard $(PTXDIST_PROD_PLATFORMDIR)/packages/*.ipk) -- 1.6.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Ipkg and image build related fixes and changes
There are several issues with the ipkg and image build process: - IPKG_FILES and permissions are created with make's $(wildcard). Unfortunately these files might not yet be available or might change later in the build process. A 'ptxdist images' from scratch will fail to install nothing. - permissions were unconditionaly collected and cause outputs from DOPERMISSIONS, when a package isn't installed in the image, but a .perms file exists - Created images for flash devices should use either the same ipkg files as your current public ipkg-repository provides or start with a -1 version postfix as a newly created ipkg-repository would provide later. This avoids unneeded ipkg remote updates. - ipkg-push only needs to happen, when something has changed. The patches try to adress these issues. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 4/4] [images] Reworked creation IPKG_FILES and $(IMGDIR)/permissions
From: Carsten Schlote c.schl...@konzeptpark.de It isn't possible to use make's $(wildcard ...) here as files might not be created yet or change later in the build process. The ipkg files and permissions must be collected from the $(PACKAGES) variable after world.targetinstall to allow a continous build from scratch. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/kernel.make |4 rules/post/images.make | 47 --- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/rules/kernel.make b/rules/kernel.make index 0e022fc..01bf778 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -14,6 +14,10 @@ # PACKAGES-$(PTXCONF_KERNEL) += kernel +# FIXME: How do we pass this extra package to images.make:66 ??? +ifdef PTXCONF_KERNEL_MODULES_INSTALL +IMAGE_IPKG_FILES_EXTRA += kernel-modules +endif # # when using a production release, diff --git a/rules/post/images.make b/rules/post/images.make index f73d5d1..f4f9d0f 100644 --- a/rules/post/images.make +++ b/rules/post/images.make @@ -34,9 +34,9 @@ endif # # generate the list of source permission files # -PERMISSION_FILES := $(foreach pkg, $(PACKAGES), $(wildcard $(STATEDIR)/$(pkg)*.perms)) +PERMISSION_FILE_DIRS := $(STATEDIR) ifdef PTXDIST_PROD_PLATFORMDIR -PERMISSION_FILES += $(wildcard $(PTXDIST_PROD_PLATFORMDIR)/state/*.perms) +PERMISSION_FILE_DIRS += $(PTXDIST_PROD_PLATFORMDIR)/state/ endif # @@ -44,22 +44,47 @@ endif # UGLY: Just these files have '_' substituted to '-'; the permission files above have NOT. # Consistency would be nicer, but when fixing, change for side-effects carefully! ifdef PTXCONF_IMAGE_INSTALL_FROM_IPKG_REPOSITORY -IPKG_REPO_DISTDIR := $(PTXCONF_SETUP_IPKG_REPOSITORY)/$(call remove_quotes,$(PTXCONF_PROJECT))/dists/$(call remove_quotes,$(PTXCONF_PROJECT))$(call remove_quotes,$(PTXCONF_PROJECT_VERSION)) -IPKG_FILES := $(foreach pkg, $(PACKAGES), $(wildcard $(IPKG_REPO_DISTDIR)/$(subst _,-,$(pkg))*.ipk)) +IPKG_REPO_DISTDIRS := $(PTXCONF_SETUP_IPKG_REPOSITORY)/$(call remove_quotes,$(PTXCONF_PROJECT))/dists/$(call remove_quotes,$(PTXCONF_PROJECT))$(call remove_quotes,$(PTXCONF_PROJECT_VERSION)) else -IPKG_FILES := $(foreach pkg, $(PACKAGES), $(wildcard $(PKGDIR)/$(subst _,-,$(pkg))*.ipk)) +IPKG_REPO_DISTDIRS := $(PKGDIR) endif - ifdef PTXDIST_PROD_PLATFORMDIR -IPKG_FILES += $(wildcard $(PTXDIST_PROD_PLATFORMDIR)/packages/*.ipk) +IPKG_REPO_DISTDIRS += $(PTXDIST_PROD_PLATFORMDIR)/packages/ endif # +# create one file with all selected ipkg files +# +PHONY += $(IMAGEDIR)/sel-ipkg-files +$(IMAGEDIR)/sel-ipkg-files: $(STATEDIR)/world.targetinstall + @echo collecting ipkg files from ... + @(for sdir in $(IPKG_REPO_DISTDIRS); do \ + echo -e \t$$sdir 12; \ + for pkg in $(PACKAGES) $(IMAGE_IPKG_FILES_EXTRA); do \ + i=$$sdir/$$(echo $$pkg | sed -e 's/_/-/g')_*.ipk; \ + if [ -e $$i ]; then echo $$i; \ + else echo -e \tWarning: Can't find $$i 12; fi;\ + done; \ + done) | sort -u $@ + @echo Collected `wc -l $@ | cut -d ' ' -f 1` ipkg file(s). + @echo done + +# # create one file with all permissions from all permission source files # PHONY += $(IMAGEDIR)/permissions -$(IMAGEDIR)/permissions: $(PERMISSION_FILES) - @cat $^ $@ +$(IMAGEDIR)/permissions: $(STATEDIR)/world.targetinstall + @echo collecting ipkg file permissions from ... + @(for sdir in $(PERMISSION_FILE_DIRS); do \ + echo -e \t$$sdir 12; \ + for pkg in $(PACKAGES) $(IMAGE_IPKG_FILES_EXTRA); do \ + i=$$sdir/$$pkg.perms; \ + if [ -n $$i -a -e $$i ]; then cat $$i; \ + else echo -e \tWarning: Can't find $$i 12; fi;\ + done; \ + done) $@ + @echo Collected `wc -l $@ | cut -d ' ' -f 1` permission lines. + @echo done # # to extract the ipkgs we need a dummy config file @@ -89,11 +114,11 @@ SEL_ROOTFS-$(PTXCONF_IMAGE_SQUASHFS) += $(IMAGEDIR)/root.squashfs # extract all current ipkgs into the working directory # PHONY += $(STATEDIR)/image_working_dir -$(STATEDIR)/image_working_dir: $(IPKG_FILES) $(IMAGEDIR)/permissions $(IMAGEDIR)/ipkg.conf +$(STATEDIR)/image_working_dir: $(IMAGEDIR)/sel-ipkg-files $(IMAGEDIR)/permissions $(IMAGEDIR)/ipkg.conf @rm -rf $(WORKDIR) @mkdir $(WORKDIR) @echo -n Extracting ipkg packages into working directory... - @DESTDIR=$(WORKDIR) $(FAKEROOT) -- $(PTXCONF_SYSROOT_HOST)/bin/ipkg-cl -f $(IMAGEDIR)/ipkg.conf -o $(WORKDIR) install $(IPKG_FILES) 21 /dev/null + @DESTDIR=$(WORKDIR) $(FAKEROOT) -- $(PTXCONF_SYSROOT_HOST)/bin/ipkg-cl -f $(IMAGEDIR)/ipkg.conf -o $(WORKDIR) install `cat $(IMAGEDIR)/sel-ipkg-files` /dev/null @echo done ifndef PTXCONF_IMAGE_INSTALL_FROM_IPKG_REPOSITORY @echo -n Fixup /usr
[ptxdist] [PATCH 3/4] [images] Fixup ipkg status file in worktmp for image creation
From: Carsten Schlote c.schl...@konzeptpark.de When creating images from PKGDIR, the ipkg file version do not contain a -1..n version suffix. When using such images with ipkg update and upgrade, all packages will be upgraded whenever a -1..n suffix is found. ipkg-push adds such postfixes starting with -1. This patch adds a default -1 postfix to the version number, so that no upgrades happens. The status file isn't modified when PTXCONF_IMAGE_INSTALL_FROM_IPKG_REPOSITORY is enabled. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/post/images.make |9 + 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/rules/post/images.make b/rules/post/images.make index aa53645..f73d5d1 100644 --- a/rules/post/images.make +++ b/rules/post/images.make @@ -94,6 +94,15 @@ $(STATEDIR)/image_working_dir: $(IPKG_FILES) $(IMAGEDIR)/permissions $(IMAGEDIR) @mkdir $(WORKDIR) @echo -n Extracting ipkg packages into working directory... @DESTDIR=$(WORKDIR) $(FAKEROOT) -- $(PTXCONF_SYSROOT_HOST)/bin/ipkg-cl -f $(IMAGEDIR)/ipkg.conf -o $(WORKDIR) install $(IPKG_FILES) 21 /dev/null + @echo done +ifndef PTXCONF_IMAGE_INSTALL_FROM_IPKG_REPOSITORY + @echo -n Fixup /usr/lib/ipkg/status version postfix... + @mv $(WORKDIR)/usr/lib/ipkg/status $(WORKDIR)/usr/lib/ipkg/status.orig + @cat $(WORKDIR)/usr/lib/ipkg/status.orig | \ + sed -e 's/Version:\(.*\)/Version: \1-1/g' $(WORKDIR)/usr/lib/ipkg/status + @rm $(WORKDIR)/usr/lib/ipkg/status.orig + @echo done +endif @$(call touch, $@) # -- 1.6.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Current build breaks: host-util-linux-ng 2.17 and fallocate tool
Hi while setting up a VM machine from scratch for ptxdist development, we found then following problem: fallocate.o: In function `main': /home/cschlote/src/ptx/ptxdist-projects.git/ptxdist-kp-prj/platform-kp-mcb2-32/build-host/util-linux-ng-2.17/sys-utils/fallocate.c:162: undefined reference to `fallocate64' collect2: ld returned 1 exit status make[3]: *** [fallocate] Error 1 make[3]: *** Waiting for unfinished jobs make[3]: Leaving directory `/home/cschlote/src/ptx/ptxdist-projects.git/ptxdist-kp-prj/platform-kp-mcb2-32/build-host/util-linux-ng-2.17/sys-utils' make[2]: Leaving directory `/home/cschlote/src/ptx/ptxdist-projects.git/ptxdist-kp-prj/platform-kp-mcb2-32/build-host/util-linux-ng-2.17' make[2]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/cschlote/src/ptx/ptxdist-projects.git/ptxdist-kp-prj/platform-kp-mcb2-32/build-host/util-linux-ng-2.17' make[1]: *** [all] Error 2 make: *** [/home/cschlote/src/ptx/ptxdist-projects.git/ptxdist-kp-prj/platform-kp-mcb2-32/state/host-util-linux-ng.compile] Error 2 This problem was already reported by Mike Frysinger: http://groups.google.com/group/linux.kernel/browse_thread/thread/f8ec94b7f4eddfdb There seem to be also some other problems with util-linux-ng/libblkid: https://bugs.launchpad.net/ubuntu/lucid/+source/util-linux/+bug/426027 I think the problem started with the update from 2.16.1 to 2.17 some days ago. The usual workaround is to omit 'fallocate' from the build right now - at least regarding other postings on the net. Patch for that is WIP. As an immediate workaround you can touch/create the resulting fallocate tool by hand. The tool isn't required anyway right now. -- Carsten Schlote c.schl...@konzeptpark.de konzeptpark.de -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Current build breaks: host-util-linux-ng 2.17 and fallocate tool
Hi The problem can be avoided with the attached patch. It configures the host built to omit fallocate from the build. Carsten commit-2c422d1 Description: commit-2c422d1 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Current build breaks: host-util-linux-ng 2.17and fallocate tool
Hi, Or configure with --disable-fallocate. I pushed patches to do this and update to 2.17.1 (released today :-)). Just figured it out myself ;-) Worked with my local change. I will merge with upstream again and test again with your fix. Please test if it works now. It should. At least, if you added --disable-fallocate to AUTOCONF stuff as I did. If it shouldn't, I will report back. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Current build breaks: host-util-linux-ng 2.17and fallocate tool
too late :-). I just pushed the same patch... ;-) Doesn't matter. If other problems could be fixed that easy... ;-) Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Set of mostly trivial patches for ptxdist
Hi The following patches were collected while testing the resulting binaries. Mostly trivial and simple. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 01/11] [ipkg-push] Added make target for ipkg-push
From: Carsten Schlote c.schl...@konzeptpark.de
Added helper target to call ipkg-push with
ptxdist make ipkg-push
This turns out to be useful, when you're going to update your
targets with ipkg {update|upgrade} and a full image build for
your project isn't required and can be omitted.
Also some good example, how ptxdist make target can be used.
As I can't imagine any use-case, where you push an incomplete set
of ipkg files, the $(STATEDIR)/ipkg-push stage now also depends
on world.targetinstall. This avoids mistakes and the call to
'ptxdist go' before 'ptxdist make ipkg-push'.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
rules/post/image_ipkg.make |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make
index 6744fcd..aa019f7 100644
--- a/rules/post/image_ipkg.make
+++ b/rules/post/image_ipkg.make
@@ -11,7 +11,9 @@
SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_PUSH_TO_REPOSITORY) += $(STATEDIR)/ipkg-push
-$(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install.post
+ipkg-push : $(STATEDIR)/ipkg-push
+
+$(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install.post
$(STATEDIR)/world.targetinstall
@$(call targetinfo)
ifdef PTXCONF_IMAGE_IPKG_FORCED_PUSH
rm -rf
$(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)
--
1.6.6.1
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 03/11] [openvpn] Updated package to version 2.1.1
From: Carsten Schlote c.schl...@konzeptpark.de Updated to latest stable version. Compiles without problem and binaries worked as expected on our targets. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/openvpn.make |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/openvpn.make b/rules/openvpn.make index a9eb39c..7356b18 100644 --- a/rules/openvpn.make +++ b/rules/openvpn.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_OPENVPN) += openvpn # # Paths and names # -OPENVPN_VERSION:= 2.0.9 +OPENVPN_VERSION:= 2.1.1 OPENVPN:= openvpn-$(OPENVPN_VERSION) OPENVPN_SUFFIX := tar.gz OPENVPN_URL:= http://openvpn.net/release/$(OPENVPN).$(OPENVPN_SUFFIX) -- 1.6.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 07/11] [ppp] Added plog and pppoe-discovery options and install
From: Carsten Schlote c.schl...@konzeptpark.de - Added the plog and pppoe-discovery tools as install option. - Added install_copy for plog. - Updated install_copy for pppoe-discovery Note: pppoe-discovery install code was already there, but no kconfig entry to select it. Also the install location was wrong. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/ppp.in | 20 rules/ppp.make | 14 ++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/rules/ppp.in b/rules/ppp.in index 827d500..209bc2d 100644 --- a/rules/ppp.in +++ b/rules/ppp.in @@ -144,10 +144,8 @@ config PPP_RADREALMS config PPP_OE bool - default y prompt ppp over ethernet help - Enable this if you are using a DSL modem connected via ethernet to your host (so called 'PPP over Ethernet' = PPPoE). @@ -202,9 +200,23 @@ config PPP_INST_PPPSTATS intervals for a specified PPP interface. config PPP_INST_PONOFF - bool install pon/poff + bool Install pon, poff scripts + help + Install pon and poff utils to start and stop a PPP connection + +config PPP_INST_PLOG + bool Install plog script help - FIXME + Install plog util to monitor PPP logs + +config PPP_INST_OE_DISCOVERY + bool Install pppoe-discovery + select PPP_PLUGINS + select PPP_OE + help + Added pppoe-discovery tools to use PPP e.g. with DSL + +comment startup options config PPP_STARTSCRIPT bool diff --git a/rules/ppp.make b/rules/ppp.make index 046175f..eb4f56a 100644 --- a/rules/ppp.make +++ b/rules/ppp.make @@ -200,6 +200,16 @@ ifdef PTXCONF_PPP_INST_PONOFF @$(call install_alternative, ppp, 0, 0, 0755, /usr/bin/poff) endif +ifdef PTXCONF_PPP_INST_PLOG + @$(call install_copy, ppp, 0, 0, 0755, \ + $(PPP_DIR)/scripts/plog, /usr/sbin/plog) +endif + +ifdef PTXCONF_PPP_INST_OE_DISCOVERY + @$(call install_copy, ppp, 0, 0, 0755, -, \ + /usr/sbin/pppoe-discovery) +endif + ifdef PTXCONF_PPP_PLUGINS @$(call install_copy, ppp, 0, 0, 0755, $(PPP_SHARED_INST_PATH)) endif @@ -224,10 +234,6 @@ ifdef PTXCONF_PPP_OE @$(call install_copy, ppp, 0, 0, 0644, -, \ $(PPP_SHARED_INST_PATH)/rp-pppoe.so) endif -ifdef PTXCONF_PPP_PLUGIN_RP_PPPOE_DISCOVERY - @$(call install_copy, ppp, 0, 0, 0755, -, \ - $(PPP_SHARED_INST_PATH)/pppoe-discovery) -endif ifdef PTXCONF_PPP_MINCONN @$(call install_copy, ppp, 0, 0, 0644, -, \ $(PPP_SHARED_INST_PATH)/minconn.so) -- 1.6.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 09/11] [sudo][v2] Updated config options for visudo and install
From: Carsten Schlote c.schl...@konzeptpark.de - Added visudo and configuration options for default and ENV editor. - Added install_* for visudo - Fixed install rights - Removed __ from kconfig options and use better names for it. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/sudo.in | 24 ++-- rules/sudo.make | 25 +++-- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/rules/sudo.in b/rules/sudo.in index 1e9033c..4540dfa 100644 --- a/rules/sudo.in +++ b/rules/sudo.in @@ -11,16 +11,36 @@ menuconfig SUDO if SUDO -config SUDO__SENDMAIL +config SUDO_USE_SENDMAIL bool # FIXME: sendmail support is buggy and searches for # /sbin/sendmail on the host #prompt sendmail support -config SUDO__ETC_SUDOERS +config SUDO_INSTALL_ETC_SUDOERS bool Install sudoers file into /etc default y help Installs /etc/sudoers from a selectable source +config SUDO_INSTALL_VISUDO + bool Install visudo to edit /etc/sudoers + help + Installs visudo to edit /etc/sudoers. + +if SUDO_INSTALL_VISUDO + +config SUDO_DEFAULT_EDITOR + string visudo default editor + default /bin/vi + help + Default editor for visudo + +config SUDO_USE_ENV_EDITOR + bool Use EDITOR env for visudo + help + Uses editor from EDITOR env for visudo + +endif + endif diff --git a/rules/sudo.make b/rules/sudo.make index fe59d43..32e3a7f 100644 --- a/rules/sudo.make +++ b/rules/sudo.make @@ -61,12 +61,22 @@ SUDO_AUTOCONF = \ --with-ignore-dot \ --without-pam -ifdef PTXCONF_SUDO__SENDMAIL +ifdef PTXCONF_SUDO_USE_SENDMAIL SUDO_AUTOCONF += --with-sendmail else SUDO_AUTOCONF += --without-sendmail endif +ifdef PTXCONF_SUDO_DEFAULT_EDITOR +SUDO_AUTOCONF += --with-editor=$(PTXCONF_SUDO_DEFAULT_EDITOR) +endif + +ifdef PTXCONF_SUDO_USE_ENV_EDITOR +SUDO_AUTOCONF += --with-env-editor +else +SUDO_AUTOCONF += --without-env-editor +endif + # --disable-root-mailer Don't run the mailer as root, run as the user # --disable-setreuid Don't try to use the setreuid() function # --disable-setresuid Don't try to use the setresuid() function @@ -131,17 +141,20 @@ $(STATEDIR)/sudo.targetinstall: @$(call install_fixup, sudo,DEPENDS,) @$(call install_fixup, sudo,DESCRIPTION,missing) - @$(call install_copy, sudo, 0, 0, 7755, -, /usr/bin/sudo) + @$(call install_copy, sudo, 0, 0, 7711, -, /usr/bin/sudo) @$(call install_link, sudo, sudo, /usr/bin/sudoedit) - @$(call install_copy, sudo, 0, 0, 0755, -, \ - /usr/libexec/sudo_noexec.so) + @$(call install_copy, sudo, 0, 0, 0644, -, /usr/libexec/sudo_noexec.so) -ifdef PTXCONF_SUDO__ETC_SUDOERS +ifdef PTXCONF_SUDO_INSTALL_ETC_SUDOERS @$(call install_alternative, sudo, 0, 0, 0440, /etc/sudoers, n) endif - @$(call install_finish, sudo) +ifdef PTXCONF_SUDO_INSTALL_VISUDO + @$(call install_copy, sudo, 0, 0, 711, -, /usr/sbin/visudo) +endif + + @$(call install_finish, sudo) @$(call touch) # vim: syntax=make -- 1.6.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 11/11] [nfsutils] Added dependancies when compiling NFSv4 support
From: Carsten Schlote c.schl...@konzeptpark.de - Added dep to LIBEVENT - Added commented dep to IDMAPD or libnfsidmap.so. Just a dummy until required packages are ported to ptxdist. - NFSv4 support still not compiling. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/nfsutils.in |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/rules/nfsutils.in b/rules/nfsutils.in index b24c1b3..34405a2 100644 --- a/rules/nfsutils.in +++ b/rules/nfsutils.in @@ -4,6 +4,8 @@ menuconfig NFSUTILS # we need libblkid select LIBBLKID select TCPWRAPPER if NFSUTILS_WITH_TCPWRAPPERS + select LIBEVENT if NFSUTILS_V4 +# #select IDMAPD if NFSUTILS_V4 prompt nfsutils help The Sun Network Filesystem (NFS) protocol provides transparent remote -- 1.6.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 02/11] Updated ptxdist usage text for bash, make, removed autobuild
From: Carsten Schlote c.schl...@konzeptpark.de
- Removed documentation for obsolete autobuild functionality
- Added help for bash and make comands
- Added list of whitelisted ENV vars
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
bin/ptxdist | 20 +++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/bin/ptxdist b/bin/ptxdist
index 165028f..377cdb3 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -782,7 +782,6 @@ Build Actions:
install packageinstall host side components into sysroot/
targetinstall package install files for target into root/
clean package cleanup package
- autobuildsearch for autobuild scripts and run them
drop package.stage mark a stage of a package as unbuilt
tags package try to build tags for the package
@@ -797,6 +796,10 @@ Clean Actions:
Misc:
version print out ptxdist version
+ bash commands run command within sysroot-host environment
+ useful for calling host cross-tools
+ make ctarget call make target for ptxdist make tree
+ e.g. ptxdist make ipkg-push
test testname run tests
newpackage typecreate a new package Makefile in a rules dir
use 'newpackage help' for a longer description
@@ -804,6 +807,7 @@ Misc:
it is known by make
export_src target dir export all source archives needed for this
project to target dir
+
Overwrite defaults:
--ptxconfig=config use specified ptxconfig
@@ -826,6 +830,20 @@ Options:
-k keep going. Continue as much as possible
after an error.
+Whitelisted ENV variables:
+
+PTX_AUTOBUILD_DESTDIR Provide a directory for a dist build.
+ Formerly used by autobuild command.
+ (Depricated)
+${PTXCONF_SETUP_ENV_WHITELIST} Anything you added to the whitelist.
+ Configured by 'ptxdist setup'
+CCACHE_.* For ccache configuration.
+ Configured by 'ptxdist setup'
+http_proxy|ftp_proxy Proxy settings for downloads.
+ Configured by 'ptxdist setup'
+PWD HOME USER PATH TERMThese ENV variables are retained as
+COLUMNS LINES DISPLAYrequired minimum for a shell.
+
EOF
}
--
1.6.6.1
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 06/11] [miredo][v5] Added miredo 1.2.2, a teredo IPV6 client
From: Carsten Schlote c.schl...@konzeptpark.de
This packet provides IPV6 networking with the teredo protocol. The
protocol allows for instant IPV6 networking without any kind
of registration or setup.
Default generic files are taken from miredo sources.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
generic/etc/init.d/miredo-server | 89 ++
generic/etc/miredo/client-hook| 70
generic/etc/miredo/miredo-server.conf | 22
generic/etc/miredo/miredo.conf| 35
patches/miredo-1.2.2/autogen.sh |1 +
patches/miredo-1.2.2/series |3 +
rules/miredo.in | 19 +++
rules/miredo.make | 96 +
8 files changed, 335 insertions(+), 0 deletions(-)
create mode 100644 generic/etc/init.d/miredo-server
create mode 100644 generic/etc/miredo/client-hook
create mode 100644 generic/etc/miredo/miredo-server.conf
create mode 100644 generic/etc/miredo/miredo.conf
create mode 12 patches/miredo-1.2.2/autogen.sh
create mode 100644 patches/miredo-1.2.2/dummy.patch
create mode 100644 patches/miredo-1.2.2/series
create mode 100644 rules/miredo.in
create mode 100644 rules/miredo.make
diff --git a/generic/etc/init.d/miredo-server b/generic/etc/init.d/miredo-server
new file mode 100644
index 000..271d173
--- /dev/null
+++ b/generic/etc/init.d/miredo-server
@@ -0,0 +1,89 @@
+#! /bin/sh
+# $Id: miredo-server.init 1754 2006-09-18 14:25:04Z remi $
+#
+# miredo-server start/stop script for Debian GNU/Linux
+# Author: Rémi Denis-Courmont rdenis (at) simphalempin (dot) com
+#
+# chkconfig: 345 17 83
+# description: Starts and stops the miredo-server daemon \
+# used to provide a Teredo server.
+#
+### BEGIN INIT INFO
+# Provides:
+# Required-Start:$local_fs $remote_fs $network $syslog $time
+# Required-Stop: $local_fs $remote_fs $syslog
+# Short-Description: Teredo server
+# Description: miredo-server daemon to provide a Teredo server
+# Default-Start: 3 4 5
+# Default-Stop: 0 1 2 6
+### END INIT INFO
+
+
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+DESC=Teredo server daemon
+NAME=miredo-server
+DAEMON=/usr/sbin/$NAME
+DAEMON_ARGS=
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+[ -x $DAEMON ] || exit 0
+
+# Source defaults.
+[ -r /etc/default/$NAME ] . /etc/default/$NAME
+
+# Ensure configuration is readable.
+[ -r /etc/$NAME.conf ] || exit 0
+
+. /lib/lsb/init-functions
+
+check_start() {
+if [ x$START_MIREDO_SERVER != xtrue ]; then
+echo START_MIREDO_SERVER is set to false in
/etc/default/$NAME
+echo $DAEMON not starting
+exit 0
+fi
+}
+
+check_chroot_dir() {
+if [ -d /var/run/$NAME ]; then
+mkdir -p /var/run/$NAME
+chmod 0755 /var/run/$NAME
+fi
+}
+
+
+case $1 in
+ start)
+check_start
+check_chroot_dir
+log_daemon_msg Starting $DESC $NAME
+start-stop-daemon --start --quiet --pidfile $PIDFILE \
+--exec $DAEMON --oknodo -- $DAEMON_ARGS
+log_end_msg $?
+;;
+ stop)
+log_daemon_msg Stopping $DESC $NAME
+start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+--retry 1 --oknodo
+log_end_msg $?
+;;
+ reload|force-reload)
+log_daemon_msg Reloading $DESC $NAME
+start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE \
+--exec $DAEMON
+log_end_msg $?
+;;
+ restart)
+check_start # avoid stopping if would not restart
+$0 stop
+sleep 1
+$0 start
+;;
+ *)
+echo Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload} 2
+exit 1
+;;
+esac
+
+exit $?
diff --git a/generic/etc/miredo/client-hook b/generic/etc/miredo/client-hook
new file mode 100644
index 000..87ae405
--- /dev/null
+++ b/generic/etc/miredo/client-hook
@@ -0,0 +1,70 @@
+#! /bin/sh
+#
+# Miredo client hook script for Linux/iproute2
+# Copyright © 2007 Rémi Denis-Courmont.
+# Distributed under the terms of the GNU General Public License version 2.
+
+# Linux iproute2 path:
+IP=/sbin/ip
+
+# Linux default route default metric is 1024
+# (we put 1029 so that Teredo is used as a last resort):
+METRIC=1029
+
+# Linux routing table ID
+# (possible values: 1-252 from /etc/iproute/rt_tables):
+TABLE=teredo
+
+# Linux routing rule priority
+# (possible values: 1-32765, lowest number is highest priority):
+PRIO=32765
+
+# MTU for the tunnel interface
+# (default: specified by the Teredo server, or 1280)
+#MTU=1400
+
+if ! test -x $IP; then
+ echo $0: iproute2 is required! Please install it. 2
+ exit 1
+fi
+
+# Nothing to do with destroy event
+if test $STATE = destroy; then exit 0; fi
+
+# If the source routing table is not configured, ignore it.
+if ! $IP route show
[ptxdist] [PATCH 04/11] [vpnc][v4] Added vpnc 0.5.3 package, a VPN client for Cisco concentrators
From: Carsten Schlote c.schl...@konzeptpark.de This is a client for cisco VPN concentrators. See http://www.unix-ag.uni-kl.de/~massar/vpnc/ for details. There are ptx/generics provided. These are taken from the PKGDIR. There is a new install_alternatve macro in work, which also searches the PKGDIR for installed defaults. When available these generics are obsolete. Updated with patches from Wolfram Sang to fix cross- compile issues. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- generic/etc/vpnc/default.conf |6 + generic/etc/vpnc/vpnc-script | 529 .../0001-Add-missing-options-to-manpage.patch | 38 ++ ...02-makeman.pl-make-it-cross-compile-aware.patch | 174 +++ patches/vpnc-0.5.3/0003-posix-fixups.patch | 31 ++ patches/vpnc-0.5.3/0004-update-todos.patch | 46 ++ patches/vpnc-0.5.3/series |4 + rules/vpnc.in | 47 ++ rules/vpnc.make| 89 9 files changed, 964 insertions(+), 0 deletions(-) create mode 100644 generic/etc/vpnc/default.conf create mode 100755 generic/etc/vpnc/vpnc-script create mode 100644 patches/vpnc-0.5.3/0001-Add-missing-options-to-manpage.patch create mode 100644 patches/vpnc-0.5.3/0002-makeman.pl-make-it-cross-compile-aware.patch create mode 100644 patches/vpnc-0.5.3/0003-posix-fixups.patch create mode 100644 patches/vpnc-0.5.3/0004-update-todos.patch create mode 100644 patches/vpnc-0.5.3/series create mode 100644 rules/vpnc.in create mode 100644 rules/vpnc.make diff --git a/generic/etc/vpnc/default.conf b/generic/etc/vpnc/default.conf new file mode 100644 index 000..2959626 --- /dev/null +++ b/generic/etc/vpnc/default.conf @@ -0,0 +1,6 @@ +IPSec gateway gateway +IPSec ID group-id +IPSec secret group-psk +IKE Authmode hybrid +Xauth username username +Xauth password password diff --git a/generic/etc/vpnc/vpnc-script b/generic/etc/vpnc/vpnc-script new file mode 100755 index 000..4c8dce4 --- /dev/null +++ b/generic/etc/vpnc/vpnc-script @@ -0,0 +1,529 @@ +#!/bin/sh +#* reason -- why this script was called, one of: pre-init connect disconnect +#* VPNGATEWAY -- vpn gateway address (always present) +#* TUNDEV -- tunnel device (always present) +#* INTERNAL_IP4_ADDRESS -- address (always present) +#* INTERNAL_IP4_NETMASK -- netmask (often unset) +#* INTERNAL_IP4_NETMASKLEN -- netmask length (often unset) +#* INTERNAL_IP4_NETADDR -- address of network (only present if netmask is set) +#* INTERNAL_IP4_DNS -- list of dns serverss +#* INTERNAL_IP4_NBNS-- list of wins servers +#* CISCO_DEF_DOMAIN -- default domain name +#* CISCO_BANNER -- banner from server +#* CISCO_SPLIT_INC -- number of networks in split-network-list +#* CISCO_SPLIT_INC_%d_ADDR -- network address +#* CISCO_SPLIT_INC_%d_MASK -- subnet mask (for example: 255.255.255.0) +#* CISCO_SPLIT_INC_%d_MASKLEN -- subnet masklen (for example: 24) +#* CISCO_SPLIT_INC_%d_PROTOCOL -- protocol (often just 0) +#* CISCO_SPLIT_INC_%d_SPORT -- source port (often just 0) +#* CISCO_SPLIT_INC_%d_DPORT -- destination port (often just 0) + +# FIXMEs: + +# Section A: route handling + +# 1) The 3 values CISCO_SPLIT_INC_%d_PROTOCOL/SPORT/DPORT are currently being ignored +# In order to use them, we'll probably need os specific solutions +# * Linux: iptables -t mangle -I PREROUTING conditions -j ROUTE --oif $TUNDEV +# This would be an *alternative* to changing the routes (and thus 2) and 3) +# shouldn't be relevant at all) +# 2) There are two different functions to set routes: generic routes and the +# default route. Why isn't the defaultroute handled via the generic route case? +# 3) In the split tunnel case, all routes but the default route might get replaced +# without getting restored later. We should explicitely check and save them just +# like the defaultroute +# 4) Replies to a dhcp-server should never be sent into the tunnel + +# Section B: Split DNS handling + +# 1) Maybe dnsmasq can do something like that +# 2) Parse dns packets going out via tunnel and redirect them to original dns-server + +#env | sort +#set -x + +# === script (variable) setup + +PATH=/sbin:/usr/sbin:$PATH + +OS=`uname -s` + +DEFAULT_ROUTE_FILE=/var/run/vpnc/defaultroute +RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup +FULL_SCRIPTNAME=/usr/sbin/vpnc +SCRIPTNAME=`basename $FULL_SCRIPTNAME` + +# some systems, eg. Darwin FreeBSD, prune /var/run on boot +if [ ! -d /var/run/vpnc ]; then + mkdir -p /var/run/vpnc +fi + +# stupid SunOS: no blubber in /usr/local/bin ... (on stdout) +IPROUTE=`which ip | grep '^/' 2 /dev/null` + +if [ $OS = Linux ]; then + ifconfig_syntax_ptp
[ptxdist] [PATCH 10/11] [mtd-utils] Fixes LZO Compression and crashes
From: Carsten Schlote c.schl...@konzeptpark.de
The following issues are addressed by this patch.
- Check for compressed data to be smaller than the original size. This
a clear fail and break assumtions at other places (-t option)
- Set the destlen to the expected maximum size, before calling lzo
decompression routine. It's used a max size value by this code (and
holds the real decompression size after the call.)
- Calls lzo_init(). Although more or less an empty stub for now, it'S
added for coding style reasons.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
patches/mtd-utils-1.3.1/lzo-compr-fixes.patch | 59 +
patches/mtd-utils-1.3.1/series|2 +
2 files changed, 61 insertions(+), 0 deletions(-)
create mode 100644 patches/mtd-utils-1.3.1/lzo-compr-fixes.patch
diff --git a/patches/mtd-utils-1.3.1/lzo-compr-fixes.patch
b/patches/mtd-utils-1.3.1/lzo-compr-fixes.patch
new file mode 100644
index 000..132d304
--- /dev/null
+++ b/patches/mtd-utils-1.3.1/lzo-compr-fixes.patch
@@ -0,0 +1,59 @@
+From: Carsten Schlote c.schl...@konzeptpark.de
+Date: Fri, 20 Mar 2009 12:43:32 +0100
+Subject: [PATCH 1/1] [lzo compressor] Fixed lzo compression tests and crash
caused by unset variable.
+
+The following issues are addressed by this patch.
+
+- Check for compressed data to be smaller than the original size. This
+ a clear fail and break assumtions at other places (-t option)
+
+- Set the destlen to the expected maximum size, before calling lzo
+ decompression routine. It's used a max size value by this code (and
+ holds the real decompression size after the call.)
+
+- Calls lzo_init().
+
+Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
+---
+ compr_lzo.c | 14 +++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+Index: compr_lzo.c
+===
+--- compr_lzo.c.orig 2009-07-03 11:31:41.0 +0200
compr_lzo.c2009-07-22 11:47:04.0 +0200
+@@ -56,6 +56,9 @@
+ if (ret != LZO_E_OK)
+ return -1;
+
++ if (compress_size *sourcelen)
++ return -1;
++
+ if (compress_size *dstlen)
+ return -1;
+
+@@ -71,6 +74,7 @@
+ int ret;
+ lzo_uint dl;
+
++ dl = destlen;
+ ret = lzo1x_decompress_safe(data_in,srclen,cpage_out,dl,NULL);
+
+ if (ret != LZO_E_OK || dl != destlen)
+@@ -92,11 +96,15 @@
+ {
+ int ret;
+
++ lzo_init();
++
+ lzo_mem = malloc(LZO1X_999_MEM_COMPRESS);
+ if (!lzo_mem)
+ return -1;
+
+- /* Worse case LZO compression size from their FAQ */
++ /* Worse case LZO compression size from their FAQ -
++ see http://www.oberhumer.com/opensource/lzo/lzofaq.php */
++
+ lzo_compress_buf = malloc(page_size + (page_size / 16) + 64 + 3);
+ if (!lzo_compress_buf) {
+ free(lzo_mem);
diff --git a/patches/mtd-utils-1.3.1/series b/patches/mtd-utils-1.3.1/series
index 32f7cf1..9e54fab 100644
--- a/patches/mtd-utils-1.3.1/series
+++ b/patches/mtd-utils-1.3.1/series
@@ -1 +1,3 @@
make-liblzo-optional.patch
+lzo-compr-fixes.patch -p0
+
--
1.6.6.1
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [OSELAS.Toolchain] Updated eglibc to use 2.11 branch, updated to GDB 7.0.1, added experimental GCC 4.5.0-snapshot build
Hi I updated my patchstack for the toolchain again. It now - uses the 2.11 subversion branch of eglibc - uses GDB 7.0.1 (required for upcoming GCC 4.5.0+ Dwarf changes) - adds mpc library (multiprecision complex) - initial port for GCC 4.5.0 using a current snapshot The powerpc and i686 toolchains with GCC 4.4.3, EGLIBC 2.11, BINUTIL 2.20 were tested and found to be completely functional. To test GCC 4.5.0 (BETA snapshot - not for production!) you must download the latest snapshot and repack the tarball to match the expected directory structure. GCC 4.5.0 is BETA - I was able to compile a powerpc project, but also noted some problems and segfaults on the target. Carsten -- The following changes since commit 6b91d10341c41ce90722c7a1fe0f77a412d2d8ae: Robert Schwebel (1): * glibc-ports: fix version detection are available in the git repository at: git://www.vahanus.net/OSELAS.Toolchain.git for-upstream Carsten Schlote (26): [GIT] Added .gitignore file to hide temporary files [fixup-script] Added kernel version 2.6.31+ to known headers [fixup-script] Re-added M68k target [fixup-script] Removed subversion remains [fixup-script] Updated to new ptxdist version scheme [ptxconfigs] Run fixup scripts on existing configs [build_all_v2] Added sort for output from help target [build_all_v2] Fixed call to nice [glibc-2.9] Added version fix for binutils 2.20 [binutils-2.20] Updates patchstack from 2.19.x to 2.20 [gcc-4.4.3] Upgraded to GCC 4.4.3 [ptxconfigs] Upgraded ptxconfigs from GCC 4.4.x to 4.4.3 [ptxconfigs] Added ptxconfigs for GCC 4.4.3 and kernelheaders 2.6.31 [eglibc] Migrated glibc makefiles to eglibc [eglibc] Migrated glibc patchstack to eglibc [ptxconfigs] Fixed-up configs for eglibc support [ptxconfigs] Added ptxconfigs for GCC 4.4.3 and eglibc [toolchain] Added debian packages to devel section [toolchain] Added make options to bang line [gdb] Updated configs to 7.0.1 (released 22.12.2009) [mpc] Added multiprecision complex support library, version 0.8.1 [gcc] Added support framework for release 4.5.0 [gcc] Added GCC 4.5.0 configuration and patchstack [ptxconfigs] Added GCC 4.5.0 configuration for powerpc [eglibc] Updated to branch 2.11 [ptxconfigs] Updated eglibc component from 2.10 to 2.11 .gitignore |8 + Kconfig|8 + build_all_v2.mk|8 +- fixup_ptxconfigs.sh| 41 ++- .../03_all_binutils-2.15.92.0.2-ppc64-pie.patch| 22 + .../04_all_binutils-2.15.92.0.2-place-orphan.patch | 22 + .../gentoo/07_all_binutils-2.18-windres.patch | 18 + .../08_all_binutils-RPATH_ENVVAR-smack.patch | 19 + .../gentoo/09_all_binutils-ld-tests-CXXFLAGS.patch | 33 ++ .../generic/gentoo/12_all_sh-targets.patch | 56 ++ .../gentoo/18_all_binutils-makeinfo-version.patch | 38 ++ .../gentoo/25_all_binutils-for-build-flags.patch | 23 + .../gentoo/30_all_binutils-multitarget-fixup.patch | 30 ++ .../gentoo/33_all_binutils-gnu-relro-fixups.patch | 536 .../gentoo/42_all_012_check_ldrunpath_length.patch | 52 ++ .../66_all_binutils-2.17.50.0.2-warn-textrel.patch | 75 +++ .../76_all_only-use-new-ld-dtags.patch.disabled| 31 ++ .../generic/gentoo/91_all_libiberty-pic.patch} |8 +- ...3_all_binutils-2.18-pt-pax-flags-20070828.patch | 263 ++ patches/binutils-2.20/generic/series | 18 + .../generic/uclibc/110-arm-eabi-conf.patch | 31 ++ ..._FUTEX_OFFSET-Guard-sym-definition-with-i.patch | 33 ++ patches/eglibc-2.10/configure-sane_readelf.diff| 119 + patches/eglibc-2.10/configure_in-sane_readelf.diff | 35 ++ .../0030_all_glibc-respect-env-CPPFLAGS.patch | 32 ++ .../gentoo/0040_all_glibc-i586-chk.patch | 32 ++ ...70_all_glibc-i386-x86_64-revert-clone-cfi.patch | 55 ++ .../1010_all_glibc-queue-header-updates.patch | 89 .../gentoo/1030_all_glibc-manual-no-perl.patch | 29 + .../1040_all_2.3.3-localedef-fix-trampoline.patch | 74 +++ .../gentoo/1050_all_glibc-posix-awk.patch | 23 + .../gentoo/1055_all_glibc-resolv-dynamic.patch | 44 ++ .../gentoo/1075_all_glibc-section-comments.patch | 29 + .../gentoo/1080_all_glibc-no-inline-gmon.patch | 38 ++ .../gentoo/1090_all_glibc-2.3.6-fix-pr631.patch| 52 ++ .../gentoo/1100_all_glibc-2.3.3-china.patch| 35 ++ .../1103_all_glibc-new-valencian-locale.patch | 122 + .../1120_all_glibc-2.5-strict-aliasing.patch | 91 .../1130_all_glibc-2.4-undefine-__i686.patch | 49 ++ .../3000_all_2.3.6-dl_execstack-PaX-support.patch | 73 +++ .../gentoo/3010_all_2.3.3_pre20040117-pt_pax.patch | 35
[ptxdist] [Patches][V2] Updates for OSELAS.Toolchain
Hi, This is the V2 series of my previously posted patches for OSELAS.Toolchain. It's rebased and reordered for easier review. I also dropped the obsolete GCC 4.4.x patches and configs as proposed by Ladislav. Topics: [GIT] Added .gitignore file to hide temporary files [fixup-script] Added kernel version 2.6.31+ to known headers [fixup-script] Re-added M68k target [fixup-script] Removed subversion remains [fixup-script] Updated to new ptxdist version scheme [ptxconfigs] Run fixup scripts on existing configs [build_all_v2] Added sort for output from help target [build_all_v2] Fixed call to nice [glibc-2.9] Added version fix for binutils 2.20 [binutils-2.20] Updates patchstack from 2.19.x to 2.20 [gcc-4.4.3] Upgraded to GCC 4.4.3 [ptxconfigs] Upgraded ptxconfigs from GCC 4.4.x to 4.4.3 [ptxconfigs] Added ptxconfigs for GCC 4.4.3 and kernelheaders 2.6.31 [eglibc] Migrated glibc makefiles to eglibc [eglibc] Migrated glibc patchstack to eglibc [ptxconfigs] Fixed-up configs for eglibc support [ptxconfigs] Added ptxconfigs for GCC 4.4.3 and eglibc [toolchain] Added debian packages to devel section [toolchain] Added make options to bang line Available as temporary GIT branch for review: for-upstream-n...@git://www.vahanus.net/OSELAS.Toolchain.git Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [vpnc-0.5.3] Added vpnc packet to ptxdist
Hi, updated patch. Available as GIT topic branch for review: vpnc-0@git://www.vahanus.net/ptxdist-kp.git Carsten 0001-vpnc-v2-Added-vpnc-0.5.3-packet-to-ptxdist.patch Description: 0001-vpnc-v2-Added-vpnc-0.5.3-packet-to-ptxdist.patch -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [vpnc-0.5.3] Added vpnc packet to ptxdist
Available as GIT topic branch for review: vpnc-0@git://www.vahanus.net/ptxdist-kp.git The GIT branch also includes a removal for a double blank line, which isn't in the exported patch yet. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] [vpnc-0.5.3] Added vpnc packet to ptxdist
No need for -p0 patches. I will clean that up. I had to cutpaste these patches from some web pages. Please add a big fat note to the VPNC_USE_CERTS option, about the OPENSSL_GPL_VIOLATION. I don't want Harald Welte to sue us :) Ay. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [BUG] scripts/ipkg-push broken
Hi The commit: script/ipkg: 5a4bf8f4 (Uwe Kleine-König 2010-02-03 09:52:18 +0100 110) IPKG_REV_PACKAGE=`ptxd_ipkg_rev_package $package_split` broke the ipkg-push script: ... /.../scripts/ipkg-push: line 110: ptxd_ipkg_rev_package: command not found ... Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Renamed ptxd_ipkg_rev_packet to ptxd_ipkg_rev_package (was: AW: [BUG] scripts/ipkg-push broken)
The commit: script/ipkg: 5a4bf8f4 (Uwe Kleine-König 2010-02-03 09:52:18 +0100 110) IPKG_REV_PACKAGE=`ptxd_ipkg_rev_package $package_split` broke the ipkg-push script: ... /.../scripts/ipkg-push: line 110: ptxd_ipkg_rev_package: command not found The attached patch fixes this issue by renaming ptxd_ipkg_rev_packet to ptxd_ipkg_rev_package in scripts/libptxdist. Carsten commit-9c5e640 Description: commit-9c5e640 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Added vpnc 0.5.3 packet to ptxdist
Hi This is a VPN client for Cisco concentrators. Packet was rebased and updated for current ptxdist release and features. Used with ipkg remote update and ipkg successfully downloaded and installed dependancies as well: # ipkg install vpnc Installing vpnc (0.5.3-1) to root... Downloading http://192.168.4.11/ptxdist/kp-mcb2/dists/kp-mcb2-v2010.01/vpnc_0.5.3-1_ppc.ipk Installing libgcrypt (1.4.5-1) to root... Downloading http://192.168.4.11/ptxdist/kp-mcb2/dists/kp-mcb2-v2010.01/libgcrypt_1.4.5-1_ppc.ipk Installing libgpg-error (1.7-1) to root... Downloading http://192.168.4.11/ptxdist/kp-mcb2/dists/kp-mcb2-v2010.01/libgpg-error_1.7-1_ppc.ipk Configuring libgcrypt Configuring libgpg-error Configuring vpnc Successfully terminated. So ipkg packet deps and updates seem to work as expected. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] OSELAS.Toolchain: eglic 2.10, gcc 4.4.1, bintuils 2.20
Am Donnerstag, den 03.12.2009, 10:52 +0100 schrieb Marc Kleine-Budde: Carsten Schlote wrote: Hi I updated the 'for-upstream' branch on my GIT repository. The branch adds support for eglic 2.10, gcc 4.4.1, bintuils 2.20. Meanwhile I added GCC 4.4.3 - tested and working. I compiled and uploaded some debian packages for Ubuntu 9.10: ARM Xscale, powerpc-603e and i363. I successfully compiled a powerpc and i686 ptxdist project with the resulting toolchains. See http://www.vahanus.net/~csc/wiki/index.php/OSELAS_Toolchain for more information and the GIT and binary download links. Any feedback is welcomed. wow, quite some work. I'll look at it as soom as my time permits. Just beacuase the ptxdist changes for eglibc somehow depend on an eglibc based toolchain - did you have any further look on the toolchain patches? Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 03/20] [fixup-script] Re-added M68k target
From: Carsten Schlote c.schl...@konzeptpark.de Defaults to m68030 and no 882 now. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- fixup_ptxconfigs.sh | 10 +- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/fixup_ptxconfigs.sh b/fixup_ptxconfigs.sh index 1644afa..4e6d396 100755 --- a/fixup_ptxconfigs.sh +++ b/fixup_ptxconfigs.sh @@ -111,6 +111,9 @@ fixup() i?86*) PTXCONF_ARCH_I386=y ;; + m68k*) + PTXCONF_ARCH_M68K=y + ;; mips*) PTXCONF_ARCH_MIPS=y ;; @@ -179,7 +182,6 @@ fixup() PTXCONF_CROSS_GCC_CONFIG_EXTRA=--with-float=soft --with-fpu=vfp --with-cpu=cortex-m3--with-mode=thumb ;; - i586-unknown-linux-gnu) PTXCONF_CROSS_GCC_CONFIG_EXTRA=--with-arch=i586 ;; @@ -187,10 +189,16 @@ fixup() PTXCONF_CROSS_GCC_CONFIG_EXTRA=--with-arch=i686 ;; + m68k-linux-gnu) + PTXCONF_CROSS_GCC_CONFIG_EXTRA=--with-cpu=m68030 + PTXCONF_GLIBC_CONFIG_EXTRA=--without-fp + ;; + mipsel-softfloat-linux-gnu) PTXCONF_CROSS_GCC_CONFIG_EXTRA=--with-float=soft PTXCONF_GLIBC_CONFIG_EXTRA=--without-fp ;; + powerpc-603e-linux-gnu) PTXCONF_CROSS_GCC_CONFIG_EXTRA=--with-cpu=603e --disable-altivec ;; -- 1.6.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 05/20] [fixup-script] Updated to new ptxdist version scheme
From: Carsten Schlote c.schl...@konzeptpark.de
ptxdist changed to temporal versions. Adapted fixup
script.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
fixup_ptxconfigs.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fixup_ptxconfigs.sh b/fixup_ptxconfigs.sh
index a4b8af8..9142483 100755
--- a/fixup_ptxconfigs.sh
+++ b/fixup_ptxconfigs.sh
@@ -19,7 +19,7 @@ fixup()
local config=${1}
# version
-PTXCONF_CONFIGFILE_VERSION=1.99.svn
+PTXCONF_CONFIGFILE_VERSION=2010.01.0
PTXCONF_PROJECT=${PWD}
PTXCONF_PROJECT=${PTXCONF_PROJECT##*/}
--
1.6.6.1
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 02/20] [fixup-script] Added kernel version 2.6.31+ to known headers
From: Carsten Schlote c.schl...@konzeptpark.de Added 2.6.31 and beyond to use headers for kernel 2.6.31 or newer. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- fixup_ptxconfigs.sh |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/fixup_ptxconfigs.sh b/fixup_ptxconfigs.sh index df4fc80..1644afa 100755 --- a/fixup_ptxconfigs.sh +++ b/fixup_ptxconfigs.sh @@ -220,9 +220,12 @@ fixup() 2.6.18) PTXCONF_GLIBC_ENABLE_KERNEL=2.6.16 ;; - 2.6.2[6789]) + 2.6.2[456789]) PTXCONF_GLIBC_ENABLE_KERNEL=2.6.23 ;; + 2.6.3[123456789]) + PTXCONF_GLIBC_ENABLE_KERNEL=2.6.31 + ;; ) ;; *) -- 1.6.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 08/20] [glibc-2.9] Added version fix for binutils 2.20
From: Carsten Schlote c.schl...@konzeptpark.de Added fix for version check to work with 2.20 (or higher) version correctly. Gentoo Patch. Crosstool-NG Patch. See URLs. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- .../generic/glibc-configure-bintuil-2.20.patch | 60 patches/glibc-2.9/generic/series |1 + 2 files changed, 61 insertions(+), 0 deletions(-) create mode 100644 patches/glibc-2.9/generic/glibc-configure-bintuil-2.20.patch diff --git a/patches/glibc-2.9/generic/glibc-configure-bintuil-2.20.patch b/patches/glibc-2.9/generic/glibc-configure-bintuil-2.20.patch new file mode 100644 index 000..da49d96 --- /dev/null +++ b/patches/glibc-2.9/generic/glibc-configure-bintuil-2.20.patch @@ -0,0 +1,60 @@ +See http://bugs.gentoo.org/284393 +See http://old.nabble.com/-crosstool-ng---patch--glibc-2.9-patch-for-%22undefined-reference-to-%09%60_begin%27-td22751673.html +--- + configure|4 ++-- + configure.in |4 ++-- + elf/Makefile |2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +Index: glibc-2.9/configure +=== +--- glibc-2.9.orig/configure 2009-11-19 14:22:48.0 +0100 glibc-2.9/configure2009-11-19 14:26:10.0 +0100 +@@ -4531,7 +4531,7 @@ + ac_prog_version=`$AS -v /dev/null 21 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version=v. ?.??, bad; ac_verc_fail=yes;; +-2.1[3-9]*) ++2.1[3-9]*|[2-9].[2-9]*) +ac_prog_version=$ac_prog_version, ok; ac_verc_fail=no;; + *) ac_prog_version=$ac_prog_version, bad; ac_verc_fail=yes;; + +@@ -4594,7 +4594,7 @@ + ac_prog_version=`$LD --version 21 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version=v. ?.??, bad; ac_verc_fail=yes;; +-2.1[3-9]*) ++2.1[3-9]*|[2-9].[2-9]*) +ac_prog_version=$ac_prog_version, ok; ac_verc_fail=no;; + *) ac_prog_version=$ac_prog_version, bad; ac_verc_fail=yes;; + +Index: glibc-2.9/configure.in +=== +--- glibc-2.9.orig/configure.in2009-11-19 14:22:48.0 +0100 glibc-2.9/configure.in 2009-11-19 14:25:18.0 +0100 +@@ -844,10 +844,10 @@ + # Accept binutils 2.13 or newer. + AC_CHECK_PROG_VER(AS, $AS, --version, + [GNU assembler.* \([0-9]*\.[0-9.]*\)], +-[2.1[3-9]*], AS=: critic_missing=$critic_missing as) ++[2.1[3-9]*|[2-9].[2-9]*], AS=: critic_missing=$critic_missing as) + AC_CHECK_PROG_VER(LD, $LD, --version, + [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], +-[2.1[3-9]*], LD=: critic_missing=$critic_missing ld) ++[2.1[3-9]*|[2-9].[2-9]*], LD=: critic_missing=$critic_missing ld) + + # We need the physical current working directory. We cannot use the + # pwd -P shell builtin since that's not portable. Instead we try to +Index: glibc-2.9/elf/Makefile +=== +--- glibc-2.9.orig/elf/Makefile2009-11-19 14:39:53.0 +0100 glibc-2.9/elf/Makefile 2009-11-19 14:40:52.0 +0100 +@@ -311,7 +311,7 @@ + $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 21 | \ + LC_ALL=C \ + sed -e '/^=/,/^=/!d;/^=/d'\ +--e 's/\. = 0 + SIZEOF_HEADERS;/ _begin = . - SIZEOF_HEADERS;/' \ ++-e 's/\. = .* + SIZEOF_HEADERS;/ _begin = . - SIZEOF_HEADERS;/' \ + $...@.lds + $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ + $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \ diff --git a/patches/glibc-2.9/generic/series b/patches/glibc-2.9/generic/series index bd319d5..5d0280b 100644 --- a/patches/glibc-2.9/generic/series +++ b/patches/glibc-2.9/generic/series @@ -28,3 +28,4 @@ gentoo/6400_all_sh-glibc-2.3.2-fpscr_values.patch gentoo/6415_all_sh-glibc-2.5-no-asm-user-header.patch gentoo/6416_all_sh-glibc-2.5-no-asm-elf-header.patch gentoo/6645_all_glibc-mips_shn_undef-hack.patch +glibc-configure-bintuil-2.20.patch -- 1.6.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 04/20] [fixup-script] Removed subversion remains
From: Carsten Schlote c.schl...@konzeptpark.de
The script was changed to use git instead of svn to
move configurations.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
fixup_ptxconfigs.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fixup_ptxconfigs.sh b/fixup_ptxconfigs.sh
index 4e6d396..a4b8af8 100755
--- a/fixup_ptxconfigs.sh
+++ b/fixup_ptxconfigs.sh
@@ -302,7 +302,7 @@ update()
local config_new=${config/${component}-${from}/${component}-${to}}
if [ ${config} != ${config_new} ]; then
- svn mv ${config} ${config_new} || return $?
+ git mv ${config} ${config_new} || return $?
fixup ${config_new}
fi
}
--
1.6.6.1
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 09/20] [binutils-2.20] Updates patchstack from 2.19.x to 2.20
From: Carsten Schlote c.schl...@konzeptpark.de
Refreshed patchstack. Fixed trivial rejects. Removed obsolete files
from patch directory.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
.../03_all_binutils-2.15.92.0.2-ppc64-pie.patch|8 ++--
.../04_all_binutils-2.15.92.0.2-place-orphan.patch |0
.../gentoo/07_all_binutils-2.18-windres.patch |0
.../08_all_binutils-RPATH_ENVVAR-smack.patch |8 ++--
.../gentoo/09_all_binutils-ld-tests-CXXFLAGS.patch | 12 ++--
.../generic/gentoo/12_all_sh-targets.patch | 20
.../gentoo/18_all_binutils-makeinfo-version.patch |0
.../gentoo/25_all_binutils-for-build-flags.patch |0
.../gentoo/30_all_binutils-multitarget-fixup.patch |8 ++--
.../gentoo/33_all_binutils-gnu-relro-fixups.patch |0
.../gentoo/42_all_012_check_ldrunpath_length.patch | 10 ++--
.../66_all_binutils-2.17.50.0.2-warn-textrel.patch | 50 ++--
.../76_all_only-use-new-ld-dtags.patch.disabled|8 ++--
.../generic/gentoo/91_all_libiberty-pic.patch |8 ++--
...3_all_binutils-2.18-pt-pax-flags-20070828.patch |0
.../generic/series |2 +-
.../generic/uclibc/110-arm-eabi-conf.patch | 16 +++---
17 files changed, 75 insertions(+), 75 deletions(-)
copy patches/{binutils-2.19.1 =
binutils-2.20}/generic/gentoo/03_all_binutils-2.15.92.0.2-ppc64-pie.patch (74%)
copy patches/{binutils-2.18 =
binutils-2.20}/generic/gentoo/04_all_binutils-2.15.92.0.2-place-orphan.patch
(100%)
copy patches/{binutils-2.19.1 =
binutils-2.20}/generic/gentoo/07_all_binutils-2.18-windres.patch (100%)
copy patches/{binutils-2.19.1 =
binutils-2.20}/generic/gentoo/08_all_binutils-RPATH_ENVVAR-smack.patch (67%)
copy patches/{binutils-2.19.1 =
binutils-2.20}/generic/gentoo/09_all_binutils-ld-tests-CXXFLAGS.patch (72%)
copy patches/{binutils-2.19.1 =
binutils-2.20}/generic/gentoo/12_all_sh-targets.patch (80%)
copy patches/{binutils-2.18 =
binutils-2.20}/generic/gentoo/18_all_binutils-makeinfo-version.patch (100%)
copy patches/{binutils-2.18 =
binutils-2.20}/generic/gentoo/25_all_binutils-for-build-flags.patch (100%)
copy patches/{binutils-2.19.1 =
binutils-2.20}/generic/gentoo/30_all_binutils-multitarget-fixup.patch (80%)
copy patches/{binutils-2.18 =
binutils-2.20}/generic/gentoo/33_all_binutils-gnu-relro-fixups.patch (100%)
copy patches/{binutils-2.19.1 =
binutils-2.20}/generic/gentoo/42_all_012_check_ldrunpath_length.patch (85%)
copy patches/{binutils-2.18 =
binutils-2.20}/generic/gentoo/66_all_binutils-2.17.50.0.2-warn-textrel.patch
(62%)
copy patches/{binutils-2.18 =
binutils-2.20}/generic/gentoo/76_all_only-use-new-ld-dtags.patch.disabled (80%)
copy patches/{binutils-2.19.1 =
binutils-2.20}/generic/gentoo/91_all_libiberty-pic.patch (59%)
copy patches/{binutils-2.18 =
binutils-2.20}/generic/gentoo/no_63_all_binutils-2.18-pt-pax-flags-20070828.patch
(100%)
copy patches/{binutils-2.19.1 = binutils-2.20}/generic/series (91%)
copy patches/{binutils-2.19.1 =
binutils-2.20}/generic/uclibc/110-arm-eabi-conf.patch (69%)
diff --git
a/patches/binutils-2.19.1/generic/gentoo/03_all_binutils-2.15.92.0.2-ppc64-pie.patch
b/patches/binutils-2.20/generic/gentoo/03_all_binutils-2.15.92.0.2-ppc64-pie.patch
similarity index 74%
copy from
patches/binutils-2.19.1/generic/gentoo/03_all_binutils-2.15.92.0.2-ppc64-pie.patch
copy to
patches/binutils-2.20/generic/gentoo/03_all_binutils-2.15.92.0.2-ppc64-pie.patch
index 1e16139..9c1f621 100644
---
a/patches/binutils-2.19.1/generic/gentoo/03_all_binutils-2.15.92.0.2-ppc64-pie.patch
+++
b/patches/binutils-2.20/generic/gentoo/03_all_binutils-2.15.92.0.2-ppc64-pie.patch
@@ -2,11 +2,11 @@
bfd/elf64-ppc.c |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
-Index: binutils-2.19.1/bfd/elf64-ppc.c
+Index: binutils-2.20/bfd/elf64-ppc.c
===
binutils-2.19.1.orig/bfd/elf64-ppc.c
-+++ binutils-2.19.1/bfd/elf64-ppc.c
-@@ -11294,7 +11294,12 @@ ppc64_elf_relocate_section (bfd *output_
+--- binutils-2.20.orig/bfd/elf64-ppc.c 2009-11-19 13:16:06.0 +0100
binutils-2.20/bfd/elf64-ppc.c 2009-11-19 13:16:11.0 +0100
+@@ -11990,7 +11990,12 @@
else if (!SYMBOL_REFERENCES_LOCAL (info, h-elf)
!is_opd
r_type != R_PPC64_TOC)
diff --git
a/patches/binutils-2.18/generic/gentoo/04_all_binutils-2.15.92.0.2-place-orphan.patch
b/patches/binutils-2.20/generic/gentoo/04_all_binutils-2.15.92.0.2-place-orphan.patch
similarity index 100%
copy from
patches/binutils-2.18/generic/gentoo/04_all_binutils-2.15.92.0.2-place-orphan.patch
copy to
patches/binutils-2.20/generic/gentoo/04_all_binutils-2.15.92.0.2-place-orphan.patch
diff --git
a/patches/binutils-2.19.1/generic/gentoo/07_all_binutils-2.18-windres.patch
b/patches/binutils-2.20/generic/gentoo/07_all_binutils-2.18
[ptxdist] [PATCH 10/20] [gcc-4.4.1] Added GCC 4.4.1 patchstack
From: Carsten Schlote c.schl...@konzeptpark.de
Refreshed gcc-4.4.0 patchstack. Trivial.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
.../generic/arm-softfloat.diff | 14 ++--
.../00_all_gcc-4.1-alpha-mieee-default.patch | 16 +++---
.../generic/gentoo/00_all_gcc-trampolinewarn.patch | 16 +++---
.../generic/gentoo/03_all_gcc43-java-nomulti.patch |0
.../gentoo/11_all_gcc-netbsd-symbolic.patch|8 +-
.../generic/gentoo/14_all_gcc-sparc64-bsd.patch|8 +-
.../gentoo/18_all_904-flatten-switch-stmt-00.patch | 10 ++--
.../gentoo/51_all_gcc-3.4-libiberty-pic.patch} |6 +-
.../53_all_gcc4-superh-default-multilib.patch |8 +-
.../generic/gentoo/54_all_300-libstdc++-pic.patch | 20 +++---
.../gentoo/61_all_gcc4-ia64-noteGNUstack.patch | 52 +-
.../generic/gentoo/61_all_gcc43-pr24170.patch |0
.../generic/gentoo/62_all_gcc4-noteGNUstack.patch | 60 ++--
.../generic/gentoo/64_all_gcc43-pr34571.patch |8 +-
.../generic/gentoo/66_all_gcc43-pr25343.patch |0
.../generic/gentoo/74_all_sh-pr24836.patch | 16 +++---
.../generic/no-host-includes.diff |8 +-
patches/{gcc-4.4.0 = gcc-4.4.1}/generic/series|1 +
.../generic/uclibc/100-uclibc-conf.patch | 18 +++---
.../generic/uclibc/104-gnuhurd-uclibc-conf.patch |0
.../generic/uclibc/301-missing-execinfo_h.patch|8 +-
.../generic/uclibc/302-c99-snprintf.patch |8 +-
.../uclibc/305-libmudflap-susv3-legacy.patch | 16 +++---
.../993-arm_insn-opinit-RTX_CODE-fixup.patch | 16 +++---
.../generic/uclibc/995-short-enums.diff| 16 +++---
.../uclibc/998-gcc-4.3.0-fix-header.00.patch |0
26 files changed, 167 insertions(+), 166 deletions(-)
copy patches/{gcc-4.4.0 = gcc-4.4.1}/generic/arm-softfloat.diff (75%)
copy patches/{gcc-4.4.0 =
gcc-4.4.1}/generic/gentoo/00_all_gcc-4.1-alpha-mieee-default.patch (68%)
copy patches/{gcc-4.4.0 =
gcc-4.4.1}/generic/gentoo/00_all_gcc-trampolinewarn.patch (75%)
copy patches/{gcc-4.3.2 =
gcc-4.4.1}/generic/gentoo/03_all_gcc43-java-nomulti.patch (100%)
copy patches/{gcc-4.3.2 =
gcc-4.4.1}/generic/gentoo/11_all_gcc-netbsd-symbolic.patch (61%)
copy patches/{gcc-4.3.2 =
gcc-4.4.1}/generic/gentoo/14_all_gcc-sparc64-bsd.patch (85%)
copy patches/{gcc-4.4.0 =
gcc-4.4.1}/generic/gentoo/18_all_904-flatten-switch-stmt-00.patch (93%)
copy patches/{binutils-2.20/generic/gentoo/91_all_libiberty-pic.patch =
gcc-4.4.1/generic/gentoo/51_all_gcc-3.4-libiberty-pic.patch} (62%)
copy patches/{gcc-4.2.4 =
gcc-4.4.1}/generic/gentoo/53_all_gcc4-superh-default-multilib.patch (85%)
copy patches/{gcc-4.4.0 =
gcc-4.4.1}/generic/gentoo/54_all_300-libstdc++-pic.patch (78%)
copy patches/{gcc-4.4.0 =
gcc-4.4.1}/generic/gentoo/61_all_gcc4-ia64-noteGNUstack.patch (60%)
copy patches/{gcc-4.3.2 =
gcc-4.4.1}/generic/gentoo/61_all_gcc43-pr24170.patch (100%)
copy patches/{gcc-4.4.0 =
gcc-4.4.1}/generic/gentoo/62_all_gcc4-noteGNUstack.patch (65%)
copy patches/{gcc-4.4.0 =
gcc-4.4.1}/generic/gentoo/64_all_gcc43-pr34571.patch (75%)
copy patches/{gcc-4.3.2 =
gcc-4.4.1}/generic/gentoo/66_all_gcc43-pr25343.patch (100%)
copy patches/{gcc-4.4.0 = gcc-4.4.1}/generic/gentoo/74_all_sh-pr24836.patch
(65%)
copy patches/{gcc-4.4.0 = gcc-4.4.1}/generic/no-host-includes.diff (87%)
copy patches/{gcc-4.4.0 = gcc-4.4.1}/generic/series (99%)
copy patches/{gcc-4.3.2 = gcc-4.4.1}/generic/uclibc/100-uclibc-conf.patch
(67%)
copy patches/{gcc-4.3.2 =
gcc-4.4.1}/generic/uclibc/104-gnuhurd-uclibc-conf.patch (100%)
copy patches/{gcc-4.4.0 =
gcc-4.4.1}/generic/uclibc/301-missing-execinfo_h.patch (68%)
copy patches/{gcc-4.3.2 = gcc-4.4.1}/generic/uclibc/302-c99-snprintf.patch
(54%)
copy patches/{gcc-4.2.4 =
gcc-4.4.1}/generic/uclibc/305-libmudflap-susv3-legacy.patch (74%)
copy patches/{gcc-4.4.0 =
gcc-4.4.1}/generic/uclibc/993-arm_insn-opinit-RTX_CODE-fixup.patch (73%)
copy patches/{gcc-4.4.0 = gcc-4.4.1}/generic/uclibc/995-short-enums.diff (71%)
copy patches/{gcc-4.3.2 =
gcc-4.4.1}/generic/uclibc/998-gcc-4.3.0-fix-header.00.patch (100%)
diff --git a/patches/gcc-4.4.0/generic/arm-softfloat.diff
b/patches/gcc-4.4.1/generic/arm-softfloat.diff
similarity index 75%
copy from patches/gcc-4.4.0/generic/arm-softfloat.diff
copy to patches/gcc-4.4.1/generic/arm-softfloat.diff
index 48d666f..fb8e852 100644
--- a/patches/gcc-4.4.0/generic/arm-softfloat.diff
+++ b/patches/gcc-4.4.1/generic/arm-softfloat.diff
@@ -21,10 +21,10 @@
gcc/config/arm/t-linux |5 -
2 files changed, 5 insertions(+), 2 deletions(-)
-Index: gcc-4.4.0/gcc/config/arm/linux-elf.h
+Index: gcc-4.4.1/gcc/config/arm/linux-elf.h
===
gcc-4.4.0.orig/gcc/config/arm/linux-elf.h
-+++ gcc-4.4.0/gcc/config/arm/linux-elf.h
+--- gcc-4.4.1.orig/gcc/config/arm/linux
[ptxdist] [PATCH 15/20] [eglibc] Cloned standard glibc configs for eglibc
From: Carsten Schlote c.schl...@konzeptpark.de
- Updated Kconfig for eglibc
- Updated fixup-script for eglibc
- Copied glibc rules as templates for eglibc rules
and modified as needed
- Added env 'install-bootstrap-headers' define to disables some
unwanted compilation in sunrpc submodule.
- Changed way to checkout a given subversion revision for eglibc
There are no release tarballs for eglibc. So I hacked the get stages
to use subversion to checkout a branch and revision. The code can
be moved to an external script and simplyfied/improved.
Functionality could be moved to usual make_get script in ptxdist, so
that other packages might profit from this feature.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
Kconfig |7 +
fixup_ptxconfigs.sh | 14 ++
rules/{glibc-crt.make = eglibc-crt.make} | 43 +++--
rules/{glibc-first.make = eglibc-first.make} | 52 +++---
rules/{glibc-headers.make = eglibc-headers.make} | 61 +++---
rules/eglibc-linuxthreads.in |7 +
rules/eglibc-linuxthreads.make| 116
rules/eglibc-ports.in | 19 ++
rules/eglibc-ports.make | 127 +
rules/eglibc.in | 111 +++
rules/eglibc.make | 202 +
rules/libc.in |8 +-
12 files changed, 690 insertions(+), 77 deletions(-)
copy rules/{glibc-crt.make = eglibc-crt.make} (71%)
copy rules/{glibc-first.make = eglibc-first.make} (65%)
copy rules/{glibc-headers.make = eglibc-headers.make} (66%)
create mode 100644 rules/eglibc-linuxthreads.in
create mode 100644 rules/eglibc-linuxthreads.make
create mode 100644 rules/eglibc-ports.in
create mode 100644 rules/eglibc-ports.make
create mode 100644 rules/eglibc.in
create mode 100644 rules/eglibc.make
diff --git a/Kconfig b/Kconfig
index 47647a3..c3f414f 100644
--- a/Kconfig
+++ b/Kconfig
@@ -34,6 +34,12 @@ comment --
source workspace/rules/libc.in
+if LIBC_EGLIBC
+source workspace/rules/eglibc.in
+source workspace/rules/eglibc-ports.in
+source workspace/rules/eglibc-linuxthreads.in
+endif
+
if LIBC_GLIBC
source workspace/rules/glibc.in
source workspace/rules/glibc-ports.in
@@ -93,6 +99,7 @@ config PREFIX_JAVA
config PREFIX_TCID
string
+ default
gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-eglibc-${PTXCONF_EGLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}
if LIBC_EGLIBC
default
gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}
if LIBC_GLIBC
default
gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-uclibc-${PTXCONF_UCLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}
if LIBC_UCLIBC
default
gcc-${PTXCONF_CROSS_GCC_VERSION}-newlib-${PTXCONF_NEWLIB_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}
if LIBC_NEWLIB
diff --git a/fixup_ptxconfigs.sh b/fixup_ptxconfigs.sh
index 9142483..a6c2462 100755
--- a/fixup_ptxconfigs.sh
+++ b/fixup_ptxconfigs.sh
@@ -26,7 +26,9 @@ fixup()
# defaults
PTXCONF_PREFIX=/opt
PTXCONF_GLIBC_CONFIG_EXTRA=
+PTXCONF_EGLIBC_CONFIG_EXTRA=
PTXCONF_GLIBC_TIMESTAMP=
+PTXCONF_EGLIBC_SVNREV=HEAD
PTXCONF_CROSS_GCC_LANG_JAVA=n
PTXCONF_KERNEL_HEADERS_SANITIZED=n
# FIXME: nptl vs. linuxthreads
@@ -47,6 +49,9 @@ fixup()
gcc*)
PTXCONF_CROSS_GCC_VERSION=${part##gcc-}
;;
+ eglibc*)
+ PTXCONF_EGLIBC_VERSION=${part##eglibc-}
+ ;;
glibc*)
PTXCONF_GLIBC_VERSION=${part##glibc-}
;;
@@ -96,9 +101,11 @@ fixup()
case ${PTXCONF_GNU_TARGET} in
arm*gnueabi)
PTXCONF_GLIBC_HEADERS_FAKE_CROSS=-D__ARM_EABI__
+ PTXCONF_EGLIBC_HEADERS_FAKE_CROSS=-D__ARM_EABI__
;;
mips*)
PTXCONF_GLIBC_HEADERS_FAKE_CROSS=-DBOOTSTRAP_GCC
+ PTXCONF_EGLIBC_HEADERS_FAKE_CROSS=-DBOOTSTRAP_GCC
;;
*)
;;
@@ -132,6 +139,7 @@ fixup()
#
# PTXCONF_CROSS_GCC_CONFIG_EXTRA
# PTXCONF_GLIBC_CONFIG_EXTRA
+# PTXCONF_EGLIBC_CONFIG_EXTRA
#
case ${PTXCONF_GNU_TARGET} in
# hard, fpa
@@ -221,18 +229,24 @@ fixup()
;;
esac
+ PTXCONF_EGLIBC_CONFIG_EXTRA=${PTXCONF_GLIBC_CONFIG_EXTRA}
+
#
# PTXCONF_GLIBC_ENABLE_KERNEL
+# PTXCONF_EGLIBC_ENABLE_KERNEL
#
case ${PTXCONF_KERNEL_HEADERS_VERSION} in
2.6.18
[ptxdist] [PATCH 19/20] [toolchain] Added make options to bang line
From: Carsten Schlote c.schl...@konzeptpark.de Disables internal rules and defines. Unconditionally rebuild given targets. No usable to rebuild existing chains: ./build_all_v2.mk dist/*.deb Useful in cron scripts. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- build_all_v2.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build_all_v2.mk b/build_all_v2.mk index 7c185cf..efa79c8 100755 --- a/build_all_v2.mk +++ b/build_all_v2.mk @@ -1,4 +1,4 @@ -#!/usr/bin/make -f +#!/usr/bin/make -rRBf # # Makefile to build all ptxconfigs -- 1.6.6.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Updates for OSELAS.Toolchain
- binutil 2.20 - GCC 4.4.1 and 4.4.3 - eglibc 2.10-subversion HEAD Also available as GIT branch: for-upstream-n...@git://www.vahanus.net/OSELAS.Toolchain.git Carsten 01/20 - [GIT] Added .gitignore file to hide temporary files 02/20 - [fixup-script] Added kernel version 2.6.31+ to known headers 03/20 - [fixup-script] Re-added M68k target 04/20 - [fixup-script] Removed subversion remains 05/20 - [fixup-script] Updated to new ptxdist version scheme 06/20 - [build_all_v2] Added sort for output from help target 07/20 - [build_all_v2] Fixed call to nice 08/20 - [glibc-2.9] Added version fix for binutils 2.20 09/20 - [binutils-2.20] Updates patchstack from 2.19.x to 2.20 10/20 - [gcc-4.4.1] Added GCC 4.4.1 patchstack 11/20 - [ptxconfigs] Added configs for gcc 4.4.1 and binutil 2.20 12/20 - [gcc-4.4.3] Added GCC 4.4.3 patch-stack 13/20 - [ptxconfigs] Added ptxconfigs for GCC 4.4.3 14/20 - [ptxconfigs] Added ptxconfigs for GCC 4.4.3 (eglibc) 15/20 - [eglibc] Cloned standard glibc configs for eglibc 16/20 - [eglibc] Migrated glibc patchstack to eglibc 17/20 - [ptxconfigs] eglibc fixup and configs 18/20 - [toolchain] Added debian packages to devel section 19/20 - [toolchain] Added make options to bang line 20/20 - [fixup] Fixed up configurations -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 08/10] (2/4) Switch to newer versions of libuuid and libblkid
Hi Marc +ifdef PTXCONF_UTIL_LINUX_NG_INSTALL_BLKID + @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /sbin/blkid) ^^^ Hmm, forgot to change that. Obviously some kind of invisible test as nobody spotted it before... ;-) - commit 51fbeab147df9ff62122f52cfc4770f5c55bc841 Author: Carsten Schlote c.schl...@konzeptpark.de Date: Mon Feb 1 19:36:20 2010 +0100 [util-linux-ng] Fixed stupid type form CCP I forgot to change the packet name after CCP from e2fstools. Now uuidgen and blkid get installed correctly. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index 4f1a2b6..5cdc79b 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -153,7 +153,7 @@ ifdef PTXCONF_UTIL_LINUX_NG_LIBBLKID endif ifdef PTXCONF_UTIL_LINUX_NG_INSTALL_BLKID - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /sbin/blkid) + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/blkid) endif ifdef PTXCONF_UTIL_LINUX_NG_LIBUUID @@ -163,7 +163,7 @@ ifdef PTXCONF_UTIL_LINUX_NG_LIBUUID endif ifdef PTXCONF_UTIL_LINUX_NG_INSTALL_UUIDGEN - @$(call install_copy, e2fsprogs, 0, 0, 0755, -, /usr/bin/uuidgen) + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/uuidgen) endif @$(call install_finish, util-linux-ng) --- I will check that moving these links back to /lib on my targets and check what happens and were. I'' report back. Works as expected, when moved back to lib. diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index 5cdc79b..12aa444 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -149,7 +149,7 @@ endif ifdef PTXCONF_UTIL_LINUX_NG_LIBBLKID @$(call install_copy, util-linux-ng, 0, 0, 0644, -, /lib/libblkid.so.1.1.0) @$(call install_link, util-linux-ng, libblkid.so.1.1.0, /lib/libblkid.so.1) - @$(call install_link, util-linux-ng, ../../lib/libblkid.so.1.1.0, /usr/lib/libblkid.so) + @$(call install_link, util-linux-ng, libblkid.so.1.1.0, /lib/libblkid.so) endif ifdef PTXCONF_UTIL_LINUX_NG_INSTALL_BLKID @@ -159,7 +159,7 @@ endif ifdef PTXCONF_UTIL_LINUX_NG_LIBUUID @$(call install_copy, util-linux-ng, 0, 0, 0644, -, /lib/libuuid.so.1.3.0) @$(call install_link, util-linux-ng, libuuid.so.1.3.0, /lib/libuuid.so.1) - @$(call install_link, util-linux-ng, ../../lib/libuuid.so.1.3.0, /usr/lib/libuuid.so) + @$(call install_link, util-linux-ng, libuuid.so.1.3.0, /lib/libuuid.so) endif ifdef PTXCONF_UTIL_LINUX_NG_INSTALL_UUIDGEN --- Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 08/10] (2/4) Switch to newer versions of libuuid and libblkid
Am Montag, den 01.02.2010, 22:09 +0100 schrieb Marc Kleine-Budde: Carsten Schlote wrote: Hi Marc +ifdef PTXCONF_UTIL_LINUX_NG_INSTALL_BLKID +@$(call install_copy, e2fsprogs, 0, 0, 0755, -, /sbin/blkid) ^^^ Hmm, forgot to change that. Obviously some kind of invisible test as nobody spotted it before... ;-) doh. can you push a upgraded clean patch series in your server. It'll merged ad soon as the dependency generator is in good shape Just updated the branch 'for-upstream' and 'for-upstream-next' on my repo. It's rebased against latest ptxdist master HEAD. Carsten signature.asc Description: Dies ist ein digital signierter Nachrichtenteil -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Proposal: macro 'install_auto'
Hi,
for all packets, which do install properly into PKGDIR using the
default install rule, it would be desireable to have an 'install_auto'
macro which,
- scans the the PKGDIR and creates appropriate control data for ipkg
to replicate this content.
- by default filters paths like /usr/share/man or similiar
- allows as option to add additional filterpaths
- allows as option to turn off the default filter to install all in
PKDIR
- a ptxdist config option should be available to disable/change the
default exclude pattern, e.g. to get a full installation with man pages.
This could look like
@$(call install_auto, pkgname {, extrafilter {, deffilter_disable
}} )
Examples:
# Install all except man and info files
@$(call install_auto, foobar)
# Exclude some more dirs
@$(call install_auto, foobar,
/usr/share/html-docs/*.html:/usr/useless/dir)
# Install all and everything
@$(call install_auto, foobar, , n)
# Install all and everything, except /usr/useless/dir
@$(call install_auto, foobar, /usr/useless/dir, n)
This should work for most packages. For others you could use a
combination and save
some work for targetinstall stage:
# Exclude /usr/bin
@$(call install_auto, foobar, /usr/bin/*:/lib/foobar/testsuite)
# Cherry pick files, leaving other (test) binaries out
@$(call install_copy, foobar, 0, 0, 755, -, /usr/bin/foobar)
Several packets already use similiar code for their install stage, e.g.
our PERL
packet.
Maybe it should be also possible to add some alternate PKGDIR, e.g. to
grab files from the toolchain's sysroot directory.
Any further ideas?
Carsten
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] Macro 'patchin' and fixup of configure /ltmain.sh, autogen.sh without patches.
Hi, I got some problem with a packet that stores it libraries in /usr/lib/pkgname/libfoo*. This requires rpath-link options for the linker and autoconf correctly creates the right options. The patchin macro fixes up the configure and libtool config to not use rpath-links. This helps with relocating libs to /lib or /usr/lib, but also screws up some packets. Possible workaround: - use ldconfig to work around this problem on the target. - use a .prepare stage without a call to patchin (my current workaround). - add some option to the patchin macro to stop fixups. I tend to do the last. Any comments? --- BUG: The patchin macro dislikes lonely autogen.sh scripts without any quilt patch. Workaround: Provide an empty dummy patch and series file. Maybe this could be fixed together with the first problem. A stand-alone autogen.sh script without any patches could be useful to do more specific fix-ups after disabling the 'fixup' feature of patchin. Any comments? Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Problem with IPKG update and generated images
Hi For the 'ptxdist images' run, ipkg files from PKGDIR are used, which do not have a -1 suffix attached. The ipkg-repository created by ipkg-push creates a dist of the same files and attaches a -1..n suffix to the version part of the ipkg filename for each file. When booting from a flash image and after an update with ipkg this looks like packet updates and 'ipkg upgrade' would download and (re-)install the same files again. So we need to - either reintroduce IMAGE_FROM_IPKG_REPOSITORY, which means to use the configured ipkg-repostory instead of PKGDIR after a ipkg-push to construct the other images (tgz, jffs2, ...). Now, after ipkg-push is fully functional (just tested), this would be a viable option. Unfortunately ipkg-push is really slow and a bit useless within a dev environment. But fine for updating selftest and burn-in software on our hard with a cron job as needed. - or, create a dist/... directory tree within PKGDIR with a simple script, so that all ipkg files have at least a -1 attached to their version and create the Packages.* file at the expected place within the /dist/... tree. This would be much faster, but lacks versioning and requires some --force flags to 'ipkg install', if you created a new package. This would be acceptable within a dev environment to update stand-alone non-nfs boxes and test the changes before ipkg-push is used to create an incremental release in your ipkg-repository, e.g. release a new burn-in test packet to all boxes in the lab. So probably both options would be a good idea and I can imaging many nice use-cases. For nfs-mounted systems this issue is of course a 'don't care'. Any comments? Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] IPKG and ipkg-repository fixes
Hi, the following patch-stack fixes some aspects of the image_ipkg.make behaviour. It's now possible to push ipkg packets to an ipkg-repository and use ipkg on the target to download from this repository. The version numbering for the ipkg packets has been fixed, so that later pushes to the ipkg-repostory will correctly update the index and the ipkg file version postfix (-1, -2, -3, ...). Packet dependancies seem to work, at least for our webmin package. An attempt to install this packet resulted in Perl being downloaded and installed as well. There might be still more issues, but for now ipkg updates over the network seems to be usable. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
From: Carsten Schlote c.schl...@konzeptpark.de
The ipkg-push script doesn't like '-1' or
similiar postfixes at the end of an ipkg version.
Packets like hackbench, mbw or zlib violate this
rule.
Added $(subst) to ptxd_make_install.sh to convert
a version info containing '-' to a ipkg compatible
format.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
scripts/lib/ptxd_make_install.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/lib/ptxd_make_install.sh b/scripts/lib/ptxd_make_install.sh
index afed5b0..0d60263 100644
--- a/scripts/lib/ptxd_make_install.sh
+++ b/scripts/lib/ptxd_make_install.sh
@@ -158,7 +158,7 @@ EOF
;;
VERSION)
- replace_to=${replace_to}${PTXCONF_PROJECT_BUILD}
+ replace_to=`echo ${replace_to} | sed -e
's/-/./'`${PTXCONF_PROJECT_BUILD}
;;
DEPENDS)
return
--
1.6.5.6.gb3118
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 2/6] [ipkg] Updated ipkg.conf config options
From: Carsten Schlote c.schl...@konzeptpark.de
Updated default source line for ipkg.conf. It
uses the same sub-directory structure as
ipkg-push would create in the ipkg-repository
for this project.
Added new config option to configure an
ipkg update host. This config can be changed
easily and is used as part of the new default
ipkg.conf entry.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
rules/ipkg.in | 11 ++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/rules/ipkg.in b/rules/ipkg.in
index 0787b41..a62459b 100644
--- a/rules/ipkg.in
+++ b/rules/ipkg.in
@@ -41,11 +41,20 @@ config IPKG_GENERIC_IPKG_CONF
help
Installs a generic /etc/ipkg.conf file.
+ config IPKG_GENERIC_IPKG_CONF_HOST
+ depends on IPKG_GENERIC_IPKG_CONF
+ prompt IPKG Update Site Host
+ default www.example.org
+ string
+ help
+ Enter the hostname of your update site here. You can
+ use it as part of the ipkg.conf URL below.
+
config IPKG_GENERIC_IPKG_CONF_URL
depends on IPKG_GENERIC_IPKG_CONF
string
prompt IPKG Update Site URL
- default src http://some/path;
+ default src ptxdist
http://${PTXCONF_IPKG_GENERIC_IPKG_CONF_HOST}/ptxdist/${PTXCONF_PROJECT}/dists/${PTXCONF_PROJECT}${PTXCONF_PROJECT_VERSION};
help
This path is put into the /etc/ipkg.conf file and specifies
where to find an IPKG packet feed.
--
1.6.5.6.gb3118
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 6/6] [image_ipkg] Added forced ipkg-push option
From: Carsten Schlote c.schl...@konzeptpark.de While testing the ipkg-push stuff again I found it a bit nagging to remove the previous dist directory from the ipkg-repository over and over again. I added an option to force this behaviour by default. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- platforms/image_ipkg.in| 12 rules/post/image_ipkg.make |3 +++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/platforms/image_ipkg.in b/platforms/image_ipkg.in index 8d9076c..8ba87b0 100644 --- a/platforms/image_ipkg.in +++ b/platforms/image_ipkg.in @@ -13,6 +13,18 @@ config IMAGE_IPKG_PUSH_TO_REPOSITORY Please note, that the ipkg-repository is currently a local directory on your machine. +config IMAGE_IPKG_FORCED_PUSH + depends on IMAGE_IPKG_PUSH_TO_REPOSITORY + bool + prompt force ipkg-push + help + Usually the script checks for some previous ipkg-push to + a 'dist' release and requires you to delete a previous + dist directory + + If this option is checked, this is done by default. This + is most useful for development purposes. + config IMAGE_IPKG_INDEX bool generate ipkg.index default y diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make index b18d409..6829b03 100644 --- a/rules/post/image_ipkg.make +++ b/rules/post/image_ipkg.make @@ -13,6 +13,9 @@ SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_PUSH_TO_REPOSITORY) += $(STATEDIR)/ipkg-push $(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install.post @$(call targetinfo) +ifdef PTXCONF_IMAGE_IPKG_FORCED_PUSH + rm -rf $(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION) +endif @echo pushing ipkg pakets to ipkg-repository... @$(HOST_ENV) $(PTXDIST_TOPDIR)/scripts/ipkg-push \ --ipkgdir $(call remove_quotes,$(PKGDIR)) \ -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
;;
VERSION)
- replace_to=${replace_to}${PTXCONF_PROJECT_BUILD}
+ replace_to=`echo ${replace_to} | sed -e 's/-
/./'`${PTXCONF_PROJECT_BUILD}
please use bash magic for this: ${replace_to//-/.}
(this actually is: s/-/./g, what about _ in the version string?
Not yet covered, because this wasn't an issue yet. But of course '_'
will mess
up the ipkg-push script as well.
I will add some handling for it as well.
Is the conversion from '-' to '.' ok? Or should it be some other
character?
Carsten
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 5/6] [image-ipkg] Added IMAGE_BROKEN option for image builds
Carsten Schlote wrote: From: Carsten Schlote schl...@vahanus.net Added an IMAGE_BROKEN option to platform kconfig to enable 'broken' image builds. is it still broken, after these patches? I hope it's working, so remove it please. I tested the stuff and at least a ipkg-repository is generated. Also download of index files and packages work. I'm currently testing the ipkg downloads from a non-NFS target - so I'm not sure if it's now really unbroken again ;-) Maybe somebody wants to test stuff as well? Some feedback could help... Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
If ipkg is fine with the versions, IMHO we should fix the script. Or better said: ipkg should limit us here, not the ipkg-push script. Sorry, the script is in ipkg-utils and is called from ipkg-push. The python scripts is the problem here, it simply expects all ipkg files to follow a given name convention. This convention disallows '-' or '_' for the VERSION tags provided. So it's the job of ptxdist to ensure that all ipkg files follow the name conventions for the python script. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [v2] IPKG and ipkg-repository fixes
Updated patch-stack V2. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
From: Carsten Schlote c.schl...@konzeptpark.de
The ipkg-push script doesn't like '-1' or
similiar postfixes at the end of an ipkg version.
Packets like hackbench, mbw or zlib violate this
rule.
Added bash-magic to ptxd_make_install.sh to convert
a version info containing '-' or '_' to a ipkg compatible
format.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
scripts/lib/ptxd_make_install.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/lib/ptxd_make_install.sh b/scripts/lib/ptxd_make_install.sh
index afed5b0..0de166c 100644
--- a/scripts/lib/ptxd_make_install.sh
+++ b/scripts/lib/ptxd_make_install.sh
@@ -158,7 +158,7 @@ EOF
;;
VERSION)
- replace_to=${replace_to}${PTXCONF_PROJECT_BUILD}
+ replace_to=${replace_to//[-_]/.}${PTXCONF_PROJECT_BUILD}
;;
DEPENDS)
return
--
1.6.5.6.gb3118
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
Added bash-magic to ptxd_make_install.sh to convert a version info
containing '-' or '_' to a ipkg compatible format.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
what about project_build? should we fix that up, too? Just in case?
+
replace_to=${replace_to//[-_]/.}${PTXCONF_PROJECT_BUILD//[-_]/.}
Not yet idiot-proof, but filters the most common cases. Can be extended
to
other critical chars later when/if needed.
If you agree to the change, then you can pull the branch
'tmp-ipkg-stuff' at
git://www.vahanus.net/ptxdist-kp.git with all ACK lines added.
The 'for-marc' branch holds the current set of ACKed pending patches
for upstream.
The 'for-upstream-next' holds the rest of the patch-stack.
Carsten
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/6] [ipkg] Fixed ipg versions for ipkg-push
The 'for-marc' branch holds the current set of ACKed pending patches for upstream. michael is working on device kit and is using the libuuid/libblkid patches with the virtual packages. at least for now. Yes, the empty .make 'virtual packet' stubs are not more than a hotfix. Ugly but working. It would be better to get rid of the make fragments, or at least get rid of the empty do-nothing rules. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] [image_ipkg] Added forced ipkg-push option
From: Carsten Schlote c.schl...@konzeptpark.de
While testing the ipkg-push stuff again, I
found it a bit nagging to remove the previous
dist directory from the ipkg-repository.
So I added an option to force this behaviour
by default.
I also updated the kconfig help texts.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
platforms/image_ipkg.in| 23 ++-
rules/post/image_ipkg.make |3 +++
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/platforms/image_ipkg.in b/platforms/image_ipkg.in
index 93b3362..5466218 100644
--- a/platforms/image_ipkg.in
+++ b/platforms/image_ipkg.in
@@ -5,12 +5,25 @@ menu ipkg options
config IMAGE_IPKG_IMAGE_FROM_REPOSITORY
depends on BROKEN
bool
- prompt make images: use packets from repository
+ prompt make images: push packets to ipkg-repository
help
- Usually 'make images' packages the files from ${IMAGEDIR}
- into ${IMAGEDIR}/root.[filesystem]. If this option is checked the
- packet files from the IPKG update site (to be specified in
- .ptxdistrc) are taken instead.
+ If this option is checked the packet files are pushed to
+ the ipkg-repository (to be specified in .ptxdistrc).
+
+ Please note, that the ipkg-repository is currently a
+ local directory on your machine.
+
+config IMAGE_IPKG_FORCED_PUSH
+ depends on IMAGE_IPKG_IMAGE_FROM_REPOSITORY
+ bool
+ prompt force ipkg-push
+ help
+ Usually the script checks for some previous ipkg-push to
+ a 'dist' release and requires you to delete a previous
+ dist directory
+
+ If this option is checked, this is done by default. This
+ is most useful for development purposes.
config IMAGE_IPKG_INDEX
bool generate ipkg.index
diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make
index f6f03ff..8fd1c86 100644
--- a/rules/post/image_ipkg.make
+++ b/rules/post/image_ipkg.make
@@ -13,6 +13,9 @@ SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_IMAGE_FROM_REPOSITORY) +=
$(STATEDIR)/ipkg-push
$(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install.post
@$(call targetinfo)
+ifdef PTXCONF_IMAGE_IPKG_FORCED_PUSH
+ rm -rf
$(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION)
+endif
$(PTXDIST_TOPDIR)/scripts/ipkg-push \
--ipkgdir $(call remove_quotes,$(PKGDIR)) \
--repodir $(call
remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)) \
--
1.6.5.6.gb3118
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] [image_ipkg] Added $(HOST_ENV) to ipkg-push
From: Carsten Schlote c.schl...@konzeptpark.de Simply works better this way. Required to setup PYTHON paths. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/post/image_ipkg.make |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make index 8fd1c86..dac0d36 100644 --- a/rules/post/image_ipkg.make +++ b/rules/post/image_ipkg.make @@ -16,6 +16,7 @@ $(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install.post ifdef PTXCONF_IMAGE_IPKG_FORCED_PUSH rm -rf $(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION) endif + $(HOST_ENV) \ $(PTXDIST_TOPDIR)/scripts/ipkg-push \ --ipkgdir $(call remove_quotes,$(PKGDIR)) \ --repodir $(call remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)) \ -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [image_ipkg] [v2] Small fixes and enhancements for ipkg images
Hi, I reworked my previous patches and cleaned up some things. Patches are tested to create and update an ipkg-repository. However, the ipkg-repository is not yet tested as a remote for ipkg. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/3] [image_ipkg] Added $(HOST_ENV) to ipkg-push
From: Carsten Schlote c.schl...@konzeptpark.de Required to setup PYTHON paths. Calls ipkg-make-index internally. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/post/image_ipkg.make |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make index f6f03ff..6c1065d 100644 --- a/rules/post/image_ipkg.make +++ b/rules/post/image_ipkg.make @@ -13,6 +13,7 @@ SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_IMAGE_FROM_REPOSITORY) += $(STATEDIR)/ipkg-push $(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install.post @$(call targetinfo) + $(HOST_ENV) \ $(PTXDIST_TOPDIR)/scripts/ipkg-push \ --ipkgdir $(call remove_quotes,$(PKGDIR)) \ --repodir $(call remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)) \ -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/3] [image-ipkg] Added IMAGE_BROKEN option for image builds
From: Carsten Schlote c.schl...@konzeptpark.de
Added an IMAGE_BROKEN option to platform kconfig to
enable 'broken' image builds.
Also renamed IMAGE_IPKG_IMAGE_FROM_REPOSITORY to
IMAGE_IPKG_PUSH_TO_REPOSITORY.
Updated help text.
Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de
---
platforms/Kconfig |5 +
platforms/image_ipkg.in| 15 ---
rules/post/image_ipkg.make |2 +-
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/platforms/Kconfig b/platforms/Kconfig
index e1ee5f8..c92713c 100644
--- a/platforms/Kconfig
+++ b/platforms/Kconfig
@@ -45,6 +45,11 @@ endmenu
source platforms/flash.in
menu image creation options
+config IMAGE_BROKEN
+ bool support image-build methods known to be broken
+ help
+ If this option is checked, install methods are available which
+ are known to be broken.
source generated/image.in
endmenu
diff --git a/platforms/image_ipkg.in b/platforms/image_ipkg.in
index 93b3362..8d9076c 100644
--- a/platforms/image_ipkg.in
+++ b/platforms/image_ipkg.in
@@ -2,15 +2,16 @@
menu ipkg options
-config IMAGE_IPKG_IMAGE_FROM_REPOSITORY
- depends on BROKEN
+config IMAGE_IPKG_PUSH_TO_REPOSITORY
+ depends on IMAGE_BROKEN
bool
- prompt make images: use packets from repository
+ prompt make images: push packets to ipkg-repository
help
- Usually 'make images' packages the files from ${IMAGEDIR}
- into ${IMAGEDIR}/root.[filesystem]. If this option is checked the
- packet files from the IPKG update site (to be specified in
- .ptxdistrc) are taken instead.
+ If this option is checked the packet files are pushed to
+ the ipkg-repository (to be specified in .ptxdistrc).
+
+ Please note, that the ipkg-repository is currently a
+ local directory on your machine.
config IMAGE_IPKG_INDEX
bool generate ipkg.index
diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make
index 6c1065d..4f8d61b 100644
--- a/rules/post/image_ipkg.make
+++ b/rules/post/image_ipkg.make
@@ -9,7 +9,7 @@
# see the README file.
#
-SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_IMAGE_FROM_REPOSITORY) += $(STATEDIR)/ipkg-push
+SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_PUSH_TO_REPOSITORY) += $(STATEDIR)/ipkg-push
$(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install.post
@$(call targetinfo)
--
1.6.5.6.gb3118
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 3/3] [image_ipkg] Added forced ipkg-push option
From: Carsten Schlote c.schl...@konzeptpark.de While testing the ipkg-push stuff again, I found it a bit nagging to remove the previous dist directory from the ipkg-repository over and over again. So I added an option to force this behaviour by default. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- platforms/image_ipkg.in| 12 rules/post/image_ipkg.make |3 +++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/platforms/image_ipkg.in b/platforms/image_ipkg.in index 8d9076c..2752263 100644 --- a/platforms/image_ipkg.in +++ b/platforms/image_ipkg.in @@ -13,6 +13,18 @@ config IMAGE_IPKG_PUSH_TO_REPOSITORY Please note, that the ipkg-repository is currently a local directory on your machine. +config IMAGE_IPKG_FORCED_PUSH + depends on IMAGE_IPKG_IMAGE_FROM_REPOSITORY + bool + prompt force ipkg-push + help + Usually the script checks for some previous ipkg-push to + a 'dist' release and requires you to delete a previous + dist directory + + If this option is checked, this is done by default. This + is most useful for development purposes. + config IMAGE_IPKG_INDEX bool generate ipkg.index default y diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make index 4f8d61b..517dd03 100644 --- a/rules/post/image_ipkg.make +++ b/rules/post/image_ipkg.make @@ -14,6 +14,9 @@ SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_PUSH_TO_REPOSITORY) += $(STATEDIR)/ipkg-push $(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install.post @$(call targetinfo) $(HOST_ENV) \ +ifdef PTXCONF_IMAGE_IPKG_FORCED_PUSH + rm -rf $(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION) +endif $(PTXDIST_TOPDIR)/scripts/ipkg-push \ --ipkgdir $(call remove_quotes,$(PKGDIR)) \ --repodir $(call remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)) \ -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] multi platform BSPs and devtmpfs
Hi, - Add an option to be smart - add a platformconfig to replace or overwrite ROOTFS_DEV_INITIAL Any other options? I tried the kernel 2.6.32 and devtmpfs approach together with upstart. I install no devnodes at all. Works fine. And what about BSP specific device nodes (for applications that start before udev, etc.)? udev allows for early custom devnodes. The nodes must be stored somewhere in /lib/udev/... or wherever. I have to lookup this location in the sources. I didn't yet because my setups work fine without any custom nodes at all. But this should solve the problem. Just provide some additional options to install custom devnodes where udev expects them. Maybe as part of ptxdist or a BSP package. I let time-out the sudo request at the end of the 'go' run to get no devnodes. Just the dev directory is needed. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [virtual-packages] Fix for missing dependancy handling
Hi, --- /dev/null +++ b/rules/libblkid.make +HOST_PACKAGES-$(PTXCONF_LIBBLKID) += libblkid Oops, cut copy paste bug. This must be of course +PACKAGES-$(PTXCONF_LIBBLKID) += libblkid Same for libuuid. Just another good reason to have either a rules/template file for virtual packages or some magic from the dgen script. Carsten -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 01/10] [host-libuuid] Added virtual package
From: Carsten Schlote c.schl...@konzeptpark.de Currently HOST_E2FSPROGS is selected for those host tools, who need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual host package 'host-libuuid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-libuuid.in | 12 1 files changed, 12 insertions(+), 0 deletions(-) create mode 100644 rules/host-libuuid.in diff --git a/rules/host-libuuid.in b/rules/host-libuuid.in new file mode 100644 index 000..53731b0 --- /dev/null +++ b/rules/host-libuuid.in @@ -0,0 +1,12 @@ +## SECTION=hosttools_noprompt + +config HOST_LIBUUID + tristate + select HOST_E2FSPROGS + help + Helper to select the host packet containing a recent libuuid.so + library and its header. + + The following packages provide libuuid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 02/10] [host-libblkid] Added virtual package
From: Carsten Schlote c.schl...@konzeptpark.de Currently HOST_E2FSPROGS is selected for those host tools, who need libuuid.so or libblkid.so. The util-linux-ng package contains newer versions of these libraries. So I added a virtual host package 'host-libblkid', which selects the appropriate source package. Later this can easily changed to a real package or redirected to some other package. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-libblkid.in | 12 1 files changed, 12 insertions(+), 0 deletions(-) create mode 100644 rules/host-libblkid.in diff --git a/rules/host-libblkid.in b/rules/host-libblkid.in new file mode 100644 index 000..62c463b --- /dev/null +++ b/rules/host-libblkid.in @@ -0,0 +1,12 @@ +## SECTION=hosttools_noprompt + +config HOST_LIBBLKID + tristate + select HOST_E2FSPROGS + help + Helper to select the host packet containing a recent libblkid.so + library and its header. + + The following packages provide libblkid: + - e2fsprogs (older version) + - utils-linux-ng (more recent version) -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 03/10] [host-mtd-utils] Fixup dep to libuuid
From: Carsten Schlote c.schl...@konzeptpark.de Selects virtual package for libuuid.so, which is required for the ubifs tools. Signed-off-by: Carsten Schlote c.schl...@konzeptpark.de --- rules/host-mtd-utils.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rules/host-mtd-utils.in b/rules/host-mtd-utils.in index 2e501c0..9636aea 100644 --- a/rules/host-mtd-utils.in +++ b/rules/host-mtd-utils.in @@ -4,4 +4,4 @@ config HOST_MTD_UTILS tristate select HOST_LIBLZO select HOST_ZLIB - select HOST_E2FSPROGS + select HOST_LIBUUID -- 1.6.5.6.gb3118 -- ptxdist mailing list ptxdist@pengutronix.de
