[ptxdist] [PATCH] host-perl: add modules JSON and Locale::PO
Signed-off-by: Alexander Dahl --- rules/host-system-perl.in |7 +++ rules/host-system-perl.make | 16 2 files changed, 23 insertions(+) diff --git a/rules/host-system-perl.in b/rules/host-system-perl.in index fc487ce..c02eb08 100644 --- a/rules/host-system-perl.in +++ b/rules/host-system-perl.in @@ -5,8 +5,15 @@ config HOST_SYSTEM_PERL if HOST_SYSTEM_PERL +config HOST_SYSTEM_PERL_JSON + bool + +config HOST_SYSTEM_PERL_LOCALE_PO + bool + config HOST_SYSTEM_PERL_XMLPARSER bool endif +# vim: ft=kconfig noet tw=72 diff --git a/rules/host-system-perl.make b/rules/host-system-perl.make index 8a7b33c..1d9e2ef 100644 --- a/rules/host-system-perl.make +++ b/rules/host-system-perl.make @@ -22,12 +22,28 @@ $(STATEDIR)/host-system-perl.prepare: @echo "Checking for Perl ..." @perl -v >/dev/null 2>&1 || \ ptxd_bailout "'perl' not found! Please install."; + +ifdef PTXCONF_HOST_SYSTEM_PERL_LOCALE_PO + @echo "Checking for Perl: Locale::PO" + @perl -e "require Locale::PO" 2>/dev/null || \ + ptxd_bailout "Locale::PO perl module is required. \ + Please install liblocale-po-perl (debian)." +endif + +ifdef PTXCONF_HOST_SYSTEM_PERL_JSON + @echo "Checking for Perl: JSON" + @perl -e "require JSON" 2>/dev/null || \ + ptxd_bailout "JSON perl module is required. \ + Please install libjson-perl (debian)." +endif + ifdef PTXCONF_HOST_SYSTEM_PERL_XMLPARSER @echo "Checking for Perl: XML::Parser" @perl -e "require XML::Parser" 2>/dev/null || \ ptxd_bailout "XML::Parser perl module is required. \ Please install libxml-parser-perl (debian)." endif + @echo @$(call touch) -- 1.7.10.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Fix some packages in regard to PTXdist's pre-build archive feature
Attached some patches to make the use of pre-build archives to speed up builds possible again. I'm sure I do not catch all broken packages yet. If someone founds a package where the targetinstall stage grabs files from the source tree instead of the install tree, please drop me a note or send a patch similar to mine. Juergen -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 4/4] PTXdist: be more helpful using the pre-build archive feature
To make use of this helpful PTXdist feature, help a new user to understand
how to configure her/his project.
Signed-off-by: Juergen Beisert
---
rules/project-name.in | 18 +++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/rules/project-name.in b/rules/project-name.in
index f546458..ce57364 100644
--- a/rules/project-name.in
+++ b/rules/project-name.in
@@ -164,20 +164,32 @@ config PROJECT_USE_LOCAL_PLATFORM_NAME
The name of the platform to use. This is the directory name of
the platform in the ptxdist workspace e.g. ``platform-i586''.
+comment ""
+comment "pre-build package handling"
+comment ""
config PROJECT_CREATE_DEVPKGS
bool
- prompt "create dev packages"
+ prompt "create pre-build archives"
+ help
+ Enable the creation of pre-build package archives. Read the
+ "How to become a PTXdist Guru" for further details.
config PROJECT_USE_DEVPKGS
bool
select HOST_CHRPATH
- prompt "use dev packages"
+ prompt "use pre-build archives"
+ help
+ Use pre-build package archives to build or re-build the project if
+ corresponding package archives with the same configuration are found.
config PROJECT_DEVPKGDIR
string
- prompt "dev package dir"
+ prompt "pre-build archive directory"
depends on PROJECT_USE_DEVPKGS
default
"/opt/OSELAS.BSP/${PTXCONF_PROJECT_VENDOR}/OSELAS.BSP-${PTXCONF_PROJECT_VENDOR}-${PTXCONF_PROJECT}${PTXCONF_PROJECT_VERSION}"
+ help
+ This entry defines the path to a directory where pre-build archives
+ are expected.
endmenu
--
1.8.5.2
--
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 1/4] QT4/pre-build: installing the examples needs the source tree
When installing the examples, this package cannot be used in its pre-build archive form. But else it can. So disable this feature only on demand. Signed-off-by: Juergen Beisert --- rules/qt4.make | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rules/qt4.make b/rules/qt4.make index eca820b..6ba6392 100644 --- a/rules/qt4.make +++ b/rules/qt4.make @@ -26,6 +26,9 @@ QT4_SOURCE:= $(SRCDIR)/$(QT4).$(QT4_SUFFIX) QT4_DIR:= $(BUILDDIR)/$(QT4) QT4_BUILD_OOT := YES QT4_LICENSE:= GPL3, LGPLv2.1 +ifdef PTXCONF_QT4_EXAMPLES +QT4__DEVPKG:= NO +endif # # Extract -- 1.8.5.2 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 3/4] bluez/pre-build: installing the test scripts needs the source tree
When installing the test scripts, this package cannot be used in its pre-build archive form. But else it can. So disable this feature only on demand. Signed-off-by: Juergen Beisert --- rules/bluez.make | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rules/bluez.make b/rules/bluez.make index 9bfd4df..b46bece 100644 --- a/rules/bluez.make +++ b/rules/bluez.make @@ -24,6 +24,9 @@ BLUEZ_URL := $(call ptx/mirror, KERNEL, bluetooth/$(BLUEZ).$(BLUEZ_SUFFIX)) BLUEZ_SOURCE := $(SRCDIR)/$(BLUEZ).$(BLUEZ_SUFFIX) BLUEZ_DIR := $(BUILDDIR)/$(BLUEZ) BLUEZ_LICENSE := GPLv2+ LGPLv2.1+ +ifdef PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS +BLUEZ_DEVPKG := NO +endif # the tools don't depend on the generated headers BLUEZ_MAKE_PAR := NO -- 1.8.5.2 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/4] Mono/pre-build: targetinstall needs access to the source tree
Installing the mscorlib.dll needs the access to the source tree, so this package cannot be used in its pre-build archive form. Signed-off-by: Juergen Beisert --- rules/mono.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/mono.make b/rules/mono.make index c7eaf7d..04ca831 100644 --- a/rules/mono.make +++ b/rules/mono.make @@ -24,6 +24,7 @@ MONO_URL := http://download.mono-project.com/sources/mono/$(MONO).$(MONO_SUFFIX) MONO_SOURCE:= $(SRCDIR)/$(MONO).$(MONO_SUFFIX) MONO_DIR := $(BUILDDIR)/$(MONO) MONO_LICENSE := unknown +MONO_DEVPKG:= NO # # Prepare -- 1.8.5.2 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] rules/dtc: Add include of KERNEL_DIR/include
include/dt-bindings may be used by dts files. This directory is missing in the dtc rule. Signed-off-by: Markus Pargmann --- rules/dtc.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/dtc.make b/rules/dtc.make index a0eca75..1fddcb7 100644 --- a/rules/dtc.make +++ b/rules/dtc.make @@ -34,6 +34,7 @@ ptx/dtb = $(notdir $(basename $(strip $(1.dtb -I$(dir $<) \ -I$(KERNEL_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/dts \ -I$(KERNEL_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/dts/include \ + -I$(KERNEL_DIR)/include \ -undef -D__DTS__ -x assembler-with-cpp \ -o $<.tmp \ $< -- 1.8.5.2 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/4] QT4/pre-build: installing the examples needs the source tree
On 01/23/2014 10:52 AM, Juergen Beisert wrote: > When installing the examples, this package cannot be used in its pre-build > archive form. But else it can. So disable this feature only on demand. > > Signed-off-by: Juergen Beisert > --- > rules/qt4.make | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/rules/qt4.make b/rules/qt4.make > index eca820b..6ba6392 100644 > --- a/rules/qt4.make > +++ b/rules/qt4.make > @@ -26,6 +26,9 @@ QT4_SOURCE := $(SRCDIR)/$(QT4).$(QT4_SUFFIX) > QT4_DIR := $(BUILDDIR)/$(QT4) > QT4_BUILD_OOT:= YES > QT4_LICENSE := GPL3, LGPLv2.1 > +ifdef PTXCONF_QT4_EXAMPLES > +QT4__DEVPKG := NO ^^ Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] We have 2014 (yes, I'm sure)
Should we reflect this in various default values? If yes, here are some changes to do so. :) Juergen -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] Toolchain/gdb: we have the year 2014, reflect this in the default values
The defaults are now pointing to the last year toolchain (2013.12) release. This includes gdb which is used in this toolchain release. Signed-off-by: Juergen Beisert --- platforms/toolchain.in | 8 rules/gdb-menu.in | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platforms/toolchain.in b/platforms/toolchain.in index 90d62ad..2807bc7 100644 --- a/platforms/toolchain.in +++ b/platforms/toolchain.in @@ -5,7 +5,7 @@ menu "toolchain " config CROSSCHAIN_VENDOR string prompt "check for specific toolchain vendor" - default "OSELAS.Toolchain-1.99.3" + default "OSELAS.Toolchain-2013.12" help Add here an unique vendor string to ensure this project will be build with the correct toolchain. @@ -19,7 +19,7 @@ config CROSSCHAIN_VENDOR config CROSSCHAIN_CHECK string prompt "check for specific gcc version" - default "4.3.2" + default "4.8.2" help PTXdist calls your cross compiler with -dumpversion and compares the output with this string. This should help @@ -47,7 +47,7 @@ if LIBC_GLIBC config GLIBC_VERSION string prompt "check for specific glibc version" - default "2.8" + default "2.18" help Specify the glibc version this BSP shall be built with. This information is used to guess the toolchain path if you use "ptxdist toolchain" @@ -58,7 +58,7 @@ if LIBC_UCLIBC config UCLIBC_VERSION string prompt "check for specific uClibc version" - default "0.9.30.2" + default "0.9.33.2" help Specify the uClibc version this BSP shall be built with. This information is used to guess the toolchain path if you use "ptxdist toolchain" diff --git a/rules/gdb-menu.in b/rules/gdb-menu.in index 610aeb2..79e876b 100644 --- a/rules/gdb-menu.in +++ b/rules/gdb-menu.in @@ -8,11 +8,11 @@ if GDB || GDBSERVER config GDB_VERSION string "gdb version" - default "7.2" + default "7.6.1" config GDB_MD5 string "gdb source md5sum" - default "64260e6c56979ee750a01055f16091a5" + default "fbc4dab4181e6e9937075b43a4ce2732" endif -- 1.8.5.2 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] Barebox: we have the year 2014, reflect this in the default value
Seems long time ago this menu entry was created :)
Signed-off-by: Juergen Beisert
---
platforms/barebox.in | 2 +-
platforms/barebox_mlo.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/platforms/barebox.in b/platforms/barebox.in
index 80b19f0..224bb41 100644
--- a/platforms/barebox.in
+++ b/platforms/barebox.in
@@ -19,7 +19,7 @@ if BAREBOX
config BAREBOX_VERSION
prompt "barebox version"
string
- default "2010.10.0"
+ default "2014.01.0"
config BAREBOX_MD5
prompt "barebox source md5sum"
diff --git a/platforms/barebox_mlo.in b/platforms/barebox_mlo.in
index 2176792..01c8669 100644
--- a/platforms/barebox_mlo.in
+++ b/platforms/barebox_mlo.in
@@ -12,7 +12,7 @@ config BAREBOX_MLO_VERSION
prompt "barebox version"if !BAREBOX
string
default "${PTXCONF_BAREBOX_VERSION}"if BAREBOX
- default "2010.10.0" if !BAREBOX
+ default "2014.01.0" if !BAREBOX
config BAREBOX_MLO_MD5
prompt "barebox source md5sum" if !BAREBOX
--
1.8.5.2
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/4] QT4/pre-build: installing the examples needs the source tree
Hi Marc, On Thursday 23 January 2014 11:57:16 Marc Kleine-Budde wrote: > On 01/23/2014 10:52 AM, Juergen Beisert wrote: > > When installing the examples, this package cannot be used in its > > pre-build archive form. But else it can. So disable this feature only on > > demand. > > > > Signed-off-by: Juergen Beisert > > --- > > rules/qt4.make | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/rules/qt4.make b/rules/qt4.make > > index eca820b..6ba6392 100644 > > --- a/rules/qt4.make > > +++ b/rules/qt4.make > > @@ -26,6 +26,9 @@ QT4_SOURCE:= $(SRCDIR)/$(QT4).$(QT4_SUFFIX) > > QT4_DIR:= $(BUILDDIR)/$(QT4) > > QT4_BUILD_OOT := YES > > QT4_LICENSE:= GPL3, LGPLv2.1 > > +ifdef PTXCONF_QT4_EXAMPLES > > +QT4__DEVPKG:= NO > > ^^ Michael already pointed this out. I have commited a fixed version instead. jbe -- Pengutronix e.K. | Juergen Beisert | Linux Solutions for Science and Industry | http://www.pengutronix.de/ | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] ptxdist getdev: Download dev packages from ${PTXCONF_SETUP_DEVMIRROR}
On Mon, Jan 20, 2014 at 09:11:54PM -0500, j...@ringle.org wrote:
> From: Jon Ringle
>
> Version 2
>
> This patch allows you to setup a dev package mirror to hold *-dev.tar.gz
> packages.
>
> Upload your *-dev.tar.gz packages to your mirror, then you can avoid
> rebuilding all your packages by doing:
>
> ptxdist getdev
>
>
> Signed-off-by: Jon Ringle
> ---
> bin/ptxdist |5 +
> config/setup/Kconfig| 10 ++
> rules/post/ptxd_make_world_get.make |7 +++
> scripts/lib/ptxd_lib_dgen.awk |7 +++
> scripts/lib/ptxd_make_get.sh| 15 ---
> 5 files changed, 37 insertions(+), 7 deletions(-)
>
> diff --git a/bin/ptxdist b/bin/ptxdist
> index f9cbdec..663c41e 100755
> --- a/bin/ptxdist
> +++ b/bin/ptxdist
> @@ -1789,6 +1789,11 @@ EOF
> fi
> exit
> ;;
> + getdev)
> + check_premake &&
> + ptxd_make_log getdev
> + exit
> + ;;
> go|images)
> do_${cmd}
> exit
> diff --git a/config/setup/Kconfig b/config/setup/Kconfig
> index 790276b..e90949b 100644
> --- a/config/setup/Kconfig
> +++ b/config/setup/Kconfig
> @@ -93,6 +93,16 @@ config SETUP_PROJECTPATH
>
> endmenu
>
> +menu "Dev Download "
> +
> +config SETUP_DEVMIRROR
we use:
string
prompt "..."
> + string "Dev package Mirror"
Can you change this to "Mirror for pre-build archives" or something like
that. Take a look at the latest commits. Juergen pushed a patch to change
the corresponding descriptions in rules/project-name.in
jbe: any better idea for the prompt?
> + help
> + Enter a URL where *-dev.tar.gz packages can be downloaded
> + Use: ptxdist getdev
> +
> +endmenu
> +
> menu "Source Directories"
>
> config SETUP_SRCDIR
> diff --git a/rules/post/ptxd_make_world_get.make
> b/rules/post/ptxd_make_world_get.make
> index 152674c..ae11db9 100644
> --- a/rules/post/ptxd_make_world_get.make
> +++ b/rules/post/ptxd_make_world_get.make
> @@ -26,6 +26,9 @@ $(SRCDIR)/%:
> @$(call targetinfo)
> @$(call get, $($@))
>
ifneq ($(call remove_quotes, $(PTXCONF_PROJECT_DEVPKGDIR)),)
$(call remove_quotes, $(PTXCONF_PROJECT_DEVPKGDIR))/%-dev.tar.gz:
[...]
Otherwise this may match other stuff. I was rather confused when ptxdist
tied to download a prepare stage :-)
Michael
> +$(call remove_quotes, $(PTXCONF_PROJECT_DEVPKGDIR))/%:
> + @$(call targetinfo)
> + @$(call getdev, $@)
>
> $(STATEDIR)/%.get:
> @$(call targetinfo)
> @@ -59,4 +62,8 @@ get = \
> check_src = \
> ptxd_make_check_src "$($(strip $(1))_SOURCE)" "$($(strip $(1))_MD5)"
>
> +getdev = \
> + ptxd_make_get_nofail=y \
> + ptxd_make_get "$(strip $(1))" "$(call remove_quotes,
> $(PTXCONF_SETUP_DEVMIRROR))/$(notdir $(1))"
> +
> # vim: syntax=make
> diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk
> index 7f790c9..0cd2ac1 100644
> --- a/scripts/lib/ptxd_lib_dgen.awk
> +++ b/scripts/lib/ptxd_lib_dgen.awk
> @@ -241,6 +241,13 @@ function write_deps_pkg_all(this_PKG, this_pkg) {
> # .get rule
> #
> print "$(STATEDIR)/" this_pkg ".get: $(" this_PKG "_SOURCES)" >
> DGEN_DEPS_POST;
> + print "ifneq ($(call remove_quotes, $(PTXCONF_SETUP_DEVMIRROR)),)" >
> DGEN_DEPS_POST;
> + print "ifneq ($($(" this_PKG "_DEVPKG)),NO)" > DGEN_DEPS_POST;
> + print "ifneq ($(" this_PKG "_CFGHASH),)" > DGEN_DEPS_POST;
> + print "getdev: $(call remove_quotes, $(PTXCONF_PROJECT_DEVPKGDIR))/$("
> this_PKG "_DEVPKG)" > DGEN_DEPS_POST;
> + print "endif" > DGEN_DEPS_POST;
> + print "endif" > DGEN_DEPS_POST;
> + print "endif" > DGEN_DEPS_POST;
> }
>
> function write_deps_pkg_active(this_PKG, this_pkg, prefix) {
> diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
> index f4d7922..185dc77 100644
> --- a/scripts/lib/ptxd_make_get.sh
> +++ b/scripts/lib/ptxd_make_get.sh
> @@ -280,7 +280,7 @@ ptxd_make_get() {
> shift
>
> case "${url}" in
> - ${PTXCONF_SETUP_PTXMIRROR}/*/*)
> + ${PTXCONF_SETUP_PTXMIRROR}/*/*|${PTXCONF_SETUP_DEVMIRROR}/*)
> # keep original URL, for stuff like glibc
> argv[${#argv[@]}]="${url}"
> mrd=true
> @@ -397,11 +397,12 @@ ptxd_make_get() {
> esac
> done
>
> - echo
> - echo "Could not download package"
> - echo "URL: ${orig_argv[@]}"
> - echo
> - exit 1
> + if [ "${ptxd_make_get_nofail}" != "y" ]; then
> + echo
> + echo "Could not download package"
> + echo "URL: ${orig_argv[@]}"
> + echo
> + exit 1
> + fi
> }
> -
> export -f ptxd_make_get
> --
> 1.7.10.4
>
>
> --
> ptxdist mailing list
> pt
Re: [ptxdist] Add patch series to ${PTXDIST_TEMPDIR}/pkghash-*
On Tue, Jan 21, 2014 at 09:02:49AM -0500, Jon Ringle wrote:
> On Tue, Jan 21, 2014 at 4:56 AM, Michael Olbrich
> wrote:
> > Hi,
> >
> > On Mon, Jan 20, 2014 at 08:32:29PM -0500, Jon Ringle wrote:
> >> When generating the ${PTXDIST_TEMPDIR}/pkghash-* in ptxd_lib_dgen.awk,
> >> have you considered adding to that the contents of the first
> >> ${PTXDIST_PATH_PATCHES}/this_PKG/series file found if one exists? This
> >> would make the *_CFGHASH change if the patch series changes for a
> >> given package. I'm not sure how to do this in awk, since
> >> ${PTXDIST_PATH_PATCHES} is actually a : delimited search path.
> >
> > It's not that simple. There are also things like $(KERNEL_SERIES) and the
> > last time I tried, the performance was not acceptable.
>
> Does the special case for $(KERNEL_SERIES) go away with what is being
> discussed on the other thread today about adding
> KERNEL_DEVPKG := NO
Now I remember why that doesn't work:
The name for the individual patch directories are not available yet, so we
cannot find the series file. :-/
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] php: version bump 5.3.10 -> 5.4.24
On Tue, Jan 21, 2014 at 04:34:05PM +0100, Bruno Thomsen wrote:
> Fixes a lot of security flaws and bugs.
>
> Changelog:
> http://www.php.net/ChangeLog-5.php#5.4.24
>
> Old HACK patch removed since it cannot be applied on configure script.
"cannot be applied" is a bad reason. The correct one in this case is "is no
longer needed".
Also, I get "configure: error: unrecognized options: --with-curl-wrappers"
when I try to build it with everything enabled.
Michael
> Signed-off-by: Bruno Thomsen
> ---
> ...make-it-possible-to-force-cross-compiling.patch | 35
>
> patches/php-5.3.10/series |4 ---
> rules/php5.make|4 +--
> 3 files changed, 2 insertions(+), 41 deletions(-)
> delete mode 100644
> patches/php-5.3.10/0001-HACK-make-it-possible-to-force-cross-compiling.patch
> delete mode 100644 patches/php-5.3.10/series
>
> diff --git
> a/patches/php-5.3.10/0001-HACK-make-it-possible-to-force-cross-compiling.patch
>
> b/patches/php-5.3.10/0001-HACK-make-it-possible-to-force-cross-compiling.patch
> deleted file mode 100644
> index 931f9b0..000
> ---
> a/patches/php-5.3.10/0001-HACK-make-it-possible-to-force-cross-compiling.patch
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -From: Michael Olbrich
> -Date: Sat, 27 Oct 2012 11:37:38 +0200
> -Subject: [PATCH] HACK: make it possible to force cross-compiling
> -
> -configure checks for cross-compiling by running a simple program.
> -This returns the wrong result when build and host architecture are
> -the same.
> -This patch makes it possible to force cross-compiling. It hacks
> -configure because it cannot be regenerated.
> -
> -Signed-off-by: Michael Olbrich
>
> - configure |2 ++
> - 1 file changed, 2 insertions(+)
> -
> -diff --git a/configure b/configure
> -index 0900d02..ca0dec0 100755
> a/configure
> -+++ b/configure
> -@@ -2377,6 +2377,7 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS
> conftest.$ac_ext 1>&5'
> - ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS
> conftest.$ac_ext $LIBS 1>&5'
> - cross_compiling=$ac_cv_prog_cc_cross
> -
> -+if test -z "$ac_cv_prog_cc_cross"; then
> - cat > conftest.$ac_ext << EOF
> -
> - #line 2383 "configure"
> -@@ -2398,6 +2399,7 @@ else
> - ac_cv_prog_cc_works=no
> - fi
> - rm -fr conftest*
> -+fi
> - ac_ext=c
> - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
> - ac_cpp='$CPP $CPPFLAGS'
> diff --git a/patches/php-5.3.10/series b/patches/php-5.3.10/series
> deleted file mode 100644
> index bad412b..000
> --- a/patches/php-5.3.10/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-HACK-make-it-possible-to-force-cross-compiling.patch
> -# 92e34182fd5e0535892f282141ab5993 - git-ptx-patches magic
> diff --git a/rules/php5.make b/rules/php5.make
> index f66a664..3e0f4de 100644
> --- a/rules/php5.make
> +++ b/rules/php5.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_PHP5) += php5
> #
> # Paths and names
> #
> -PHP5_VERSION := 5.3.10
> -PHP5_MD5 := 816259e5ca7d0a7e943e56a3bb32b17f
> +PHP5_VERSION := 5.4.24
> +PHP5_MD5 := acef880cc808b85e216897ee88187ee1
> PHP5 := php-$(PHP5_VERSION)
> PHP5_SUFFIX := tar.bz2
> PHP5_SOURCE := $(SRCDIR)/$(PHP5).$(PHP5_SUFFIX)
> --
> 1.7.9.5
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] pv: version bump 1.1.4 -> 1.4.12
On Mon, Jan 20, 2014 at 10:15:33PM -0500, j...@ringle.org wrote: > From: Jon Ringle > > also fixed URL I see two new configure options: --disable-splice --disable-ipc Can you provide a usefull default? Also, can you add --$(call ptx/endis, PTXCONF_GLOBAL_LARGE_FILE)-lfs While you're at it? Michael > Signed-off-by: Jon Ringle > --- > rules/pv.make |6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/rules/pv.make b/rules/pv.make > index 2ce0755..a8a7fe5 100644 > --- a/rules/pv.make > +++ b/rules/pv.make > @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_PV) += pv > # > # Paths and names > # > -PV_VERSION := 1.1.4 > -PV_MD5 := 63033e090d61a040407bfd043aeb6d27 > +PV_VERSION := 1.4.12 > +PV_MD5 := 605adc0f369496bca92b0656cf86b25e > PV := pv-$(PV_VERSION) > PV_SUFFIX:= tar.bz2 > -PV_URL := > http://pipeviewer.googlecode.com/files/$(PV).$(PV_SUFFIX) > +PV_URL := > http://www.ivarch.com/programs/sources/$(PV).$(PV_SUFFIX) > PV_SOURCE:= $(SRCDIR)/$(PV).$(PV_SUFFIX) > PV_DIR := $(BUILDDIR)/$(PV) > > -- > 1.7.10.4 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] ptxdist getdev: Download dev packages from ${PTXCONF_SETUP_DEVMIRROR}
On Mon, Jan 20, 2014 at 09:11:54PM -0500, j...@ringle.org wrote:
> From: Jon Ringle
>
> Version 2
>
> This patch allows you to setup a dev package mirror to hold *-dev.tar.gz
> packages.
>
> Upload your *-dev.tar.gz packages to your mirror, then you can avoid
> rebuilding all your packages by doing:
>
> ptxdist getdev
>
>
> Signed-off-by: Jon Ringle
> ---
> bin/ptxdist |5 +
> config/setup/Kconfig| 10 ++
> rules/post/ptxd_make_world_get.make |7 +++
> scripts/lib/ptxd_lib_dgen.awk |7 +++
> scripts/lib/ptxd_make_get.sh| 15 ---
> 5 files changed, 37 insertions(+), 7 deletions(-)
>
> diff --git a/bin/ptxdist b/bin/ptxdist
> index f9cbdec..663c41e 100755
> --- a/bin/ptxdist
> +++ b/bin/ptxdist
> @@ -1789,6 +1789,11 @@ EOF
> fi
> exit
> ;;
> + getdev)
> + check_premake &&
> + ptxd_make_log getdev
> + exit
> + ;;
> go|images)
> do_${cmd}
> exit
> diff --git a/config/setup/Kconfig b/config/setup/Kconfig
> index 790276b..e90949b 100644
> --- a/config/setup/Kconfig
> +++ b/config/setup/Kconfig
> @@ -93,6 +93,16 @@ config SETUP_PROJECTPATH
>
> endmenu
>
> +menu "Dev Download "
> +
> +config SETUP_DEVMIRROR
> + string "Dev package Mirror"
> + help
> + Enter a URL where *-dev.tar.gz packages can be downloaded
> + Use: ptxdist getdev
> +
> +endmenu
> +
> menu "Source Directories"
>
> config SETUP_SRCDIR
> diff --git a/rules/post/ptxd_make_world_get.make
> b/rules/post/ptxd_make_world_get.make
> index 152674c..ae11db9 100644
> --- a/rules/post/ptxd_make_world_get.make
> +++ b/rules/post/ptxd_make_world_get.make
> @@ -26,6 +26,9 @@ $(SRCDIR)/%:
> @$(call targetinfo)
> @$(call get, $($@))
>
> +$(call remove_quotes, $(PTXCONF_PROJECT_DEVPKGDIR))/%:
> + @$(call targetinfo)
> + @$(call getdev, $@)
>
> $(STATEDIR)/%.get:
> @$(call targetinfo)
> @@ -59,4 +62,8 @@ get = \
> check_src = \
> ptxd_make_check_src "$($(strip $(1))_SOURCE)" "$($(strip $(1))_MD5)"
>
> +getdev = \
> + ptxd_make_get_nofail=y \
> + ptxd_make_get "$(strip $(1))" "$(call remove_quotes,
> $(PTXCONF_SETUP_DEVMIRROR))/$(notdir $(1))"
> +
> # vim: syntax=make
> diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk
> index 7f790c9..0cd2ac1 100644
> --- a/scripts/lib/ptxd_lib_dgen.awk
> +++ b/scripts/lib/ptxd_lib_dgen.awk
> @@ -241,6 +241,13 @@ function write_deps_pkg_all(this_PKG, this_pkg) {
> # .get rule
> #
> print "$(STATEDIR)/" this_pkg ".get: $(" this_PKG "_SOURCES)" >
> DGEN_DEPS_POST;
> + print "ifneq ($(call remove_quotes, $(PTXCONF_SETUP_DEVMIRROR)),)" >
> DGEN_DEPS_POST;
> + print "ifneq ($($(" this_PKG "_DEVPKG)),NO)" > DGEN_DEPS_POST;
> + print "ifneq ($(" this_PKG "_CFGHASH),)" > DGEN_DEPS_POST;
> + print "getdev: $(call remove_quotes, $(PTXCONF_PROJECT_DEVPKGDIR))/$("
> this_PKG "_DEVPKG)" > DGEN_DEPS_POST;
> + print "endif" > DGEN_DEPS_POST;
> + print "endif" > DGEN_DEPS_POST;
> + print "endif" > DGEN_DEPS_POST;
> }
>
> function write_deps_pkg_active(this_PKG, this_pkg, prefix) {
> diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
> index f4d7922..185dc77 100644
> --- a/scripts/lib/ptxd_make_get.sh
> +++ b/scripts/lib/ptxd_make_get.sh
> @@ -280,7 +280,7 @@ ptxd_make_get() {
> shift
>
> case "${url}" in
> - ${PTXCONF_SETUP_PTXMIRROR}/*/*)
> + ${PTXCONF_SETUP_PTXMIRROR}/*/*|${PTXCONF_SETUP_DEVMIRROR}/*)
add this to the next block ("${PTXCONF_SETUP_PTXMIRROR}/*)"). This on
should be removed anyways. I think this was only used for some realy old
toolchains.
Michael
> # keep original URL, for stuff like glibc
> argv[${#argv[@]}]="${url}"
> mrd=true
> @@ -397,11 +397,12 @@ ptxd_make_get() {
> esac
> done
>
> - echo
> - echo "Could not download package"
> - echo "URL: ${orig_argv[@]}"
> - echo
> - exit 1
> + if [ "${ptxd_make_get_nofail}" != "y" ]; then
> + echo
> + echo "Could not download package"
> + echo "URL: ${orig_argv[@]}"
> + echo
> + exit 1
> + fi
> }
> -
> export -f ptxd_make_get
> --
> 1.7.10.4
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 4/4] bzip2: version bump 1.0.5 -> 1.0.6
On Mon, Jan 13, 2014 at 07:38:31PM +0100, Robert Schwebel wrote: > This new version fixes a security issue: CVE-2010-0405. Thanks, all applied. Michael > Signed-off-by: Robert Schwebel > --- > patches/bzip2-1.0.5/0001-fixup-Makefile.patch | 207 > -- > patches/bzip2-1.0.5/series| 4 - > patches/bzip2-1.0.6/0001-fixup-Makefile.patch | 207 > ++ > patches/bzip2-1.0.6/series| 4 + > rules/bzip2.make | 6 +- > 5 files changed, 214 insertions(+), 214 deletions(-) > delete mode 100644 patches/bzip2-1.0.5/0001-fixup-Makefile.patch > delete mode 100644 patches/bzip2-1.0.5/series > create mode 100644 patches/bzip2-1.0.6/0001-fixup-Makefile.patch > create mode 100644 patches/bzip2-1.0.6/series > > diff --git a/patches/bzip2-1.0.5/0001-fixup-Makefile.patch > b/patches/bzip2-1.0.5/0001-fixup-Makefile.patch > deleted file mode 100644 > index 85d4fb4..000 > --- a/patches/bzip2-1.0.5/0001-fixup-Makefile.patch > +++ /dev/null > @@ -1,207 +0,0 @@ > -From: Marc Kleine-Budde > -Date: Sat, 29 Oct 2011 18:59:40 +0200 > -Subject: [PATCH] fixup Makefile > - > -This patch fixes various problems in the makefile and disables compile > -time test. It was taken from Debinan. > - > -Signed-off-by: Robert Schwebel > > -# 20091210 rsc: needs probably another look before going mainline > - > - Makefile | 134 > -- > - 1 files changed, 69 insertions(+), 65 deletions(-) > - > -diff --git a/Makefile b/Makefile > -index eb09753..8b1bf77 100644 > a/Makefile > -+++ b/Makefile > -@@ -12,6 +12,8 @@ > - # in the file LICENSE. > - # -- > - > -+somajor=1.0 > -+sominor=$(somajor).4 > - SHELL=/bin/sh > - > - # To assist in cross-compiling > -@@ -21,7 +23,7 @@ RANLIB=ranlib > - LDFLAGS= > - > - BIGFILES=-D_FILE_OFFSET_BITS=64 > --CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) > -+CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) $(DEBCFLAGS) > - > - # Where you want it installed when you do 'make install' > - PREFIX=/usr/local > -@@ -35,9 +37,9 @@ OBJS= blocksort.o \ > - decompress.o \ > - bzlib.o > - > --all: libbz2.a bzip2 bzip2recover test > -+all: libbz2.a bzip2 bzip2recover # test > - > --bzip2: libbz2.a bzip2.o > -+bzip2: libbz2.so bzip2.o > - $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2 > - > - bzip2recover: bzip2recover.o > -@@ -46,20 +48,42 @@ bzip2recover: bzip2recover.o > - libbz2.a: $(OBJS) > - rm -f libbz2.a > - $(AR) cq libbz2.a $(OBJS) > --@if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \ > ---f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \ > -+@if ( test -f $(RANLIB) || test -f /usr/bin/ranlib || \ > -+test -f /bin/ranlib || test -f /usr/ccs/bin/ranlib ) ; then \ > - echo $(RANLIB) libbz2.a ; \ > - $(RANLIB) libbz2.a ; \ > - fi > - > -+libbz2.so: libbz2.so.$(somajor) > -+ln -sf $^ $@ > -+ > -+libbz2.so.$(somajor): libbz2.so.$(sominor) > -+ln -sf $^ $@ > -+ > -+libbz2.so.$(sominor): $(OBJS:%.o=%.sho) > -+$(CC) -o libbz2.so.$(sominor) -shared \ > -+ -Wl,-soname,libbz2.so.$(somajor) $^ -lc > -+ > -+%.sho: %.c > -+$(CC) $(CFLAGS) -D_REENTRANT -fPIC -o $@ -c $< > -+ > -+%.o: %.c > -+$(CC) $(CFLAGS) -D_REENTRANT -o $@ -c $< > -+ > - check: test > - test: bzip2 > - @cat words1 > -+LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \ > - ./bzip2 -1 < sample1.ref > sample1.rb2 > -+LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \ > - ./bzip2 -2 < sample2.ref > sample2.rb2 > -+LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \ > - ./bzip2 -3 < sample3.ref > sample3.rb2 > -+LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \ > - ./bzip2 -d < sample1.bz2 > sample1.tst > -+LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \ > - ./bzip2 -d < sample2.bz2 > sample2.tst > -+LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \ > - ./bzip2 -ds < sample3.bz2 > sample3.tst > - cmp sample1.bz2 sample1.rb2 > - cmp sample2.bz2 sample2.rb2 > -@@ -69,73 +93,53 @@ test: bzip2 > - cmp sample3.tst sample3.ref > - @cat words3 > - > --install: bzip2 bzip2recover > --if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi > --if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi > --if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi > --if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 > ; fi > --if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; > fi > --cp -f bzip2 $(PREFIX)/bin/bzip2 > --cp -f bzip2 $(PREFIX)/bin/bunzip2 > --cp -f bzip2 $(PREFIX)/bin/bzcat > --cp -f bzip2recover $(PREFIX)/bin/bzip2recover > --chmod a+x $(PREFIX)/bin/bzip2 > --chmod a+x $(PREFIX)/bin/bunzip2 > --chmod a+x $(PREFIX)/bin/bzcat > --chmod a+x $(PREFIX)/bin/bzip2recover > --c
Re: [ptxdist] [PATCH 4/4] chrony: remove duplicate targetinstall for chrony_command
On Tue, Jan 14, 2014 at 08:19:49AM +0100, Robert Schwebel wrote: > Signed-off-by: Robert Schwebel Thanks, all applied. Michael > --- > rules/chrony.make | 5 - > 1 file changed, 5 deletions(-) > > diff --git a/rules/chrony.make b/rules/chrony.make > index 31cc09e..4b8bef5 100644 > --- a/rules/chrony.make > +++ b/rules/chrony.make > @@ -64,11 +64,6 @@ ifdef PTXCONF_CHRONY_INSTALL_CHRONY_COMMAND > $(PTXDIST_TOPDIR)/generic/usr/bin/chrony_command, \ > /usr/bin/chrony_command) > endif > -ifdef PTXCONF_CHRONY_INSTALL_CHRONY_COMMAND > - @$(call install_copy, chrony, 0, 0, 0755, \ > - $(PTXDIST_TOPDIR)/generic/usr/bin/chrony_command, \ > - /usr/bin/chrony_command) > -endif > > # chrony stat convenience wrapper > ifdef PTXCONF_CHRONY_INSTALL_CHRONY_STAT > -- > 1.8.5.2 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] inetutils: version bump 1.6 -> 1.9.2
On Fri, Jan 17, 2014 at 08:56:15AM +0100, Robert Schwebel wrote: > The option --with-PATH-CP fails during configure now. I fixed that when applying and added some more configure options. Michael > Signed-off-by: Robert Schwebel > --- > rules/inetutils.make | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/rules/inetutils.make b/rules/inetutils.make > index a284712..9f17500 100644 > --- a/rules/inetutils.make > +++ b/rules/inetutils.make > @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_INETUTILS) += inetutils > # > # Paths and names > # > -INETUTILS_VERSION:= 1.6 > -INETUTILS_MD5:= 23cc24bc77751bf77d50a07a7395f9b3 > +INETUTILS_VERSION:= 1.9.2 > +INETUTILS_MD5:= aa1a9a132259db83e66c1f3265065ba2 > INETUTILS:= inetutils-$(INETUTILS_VERSION) > INETUTILS_SUFFIX := tar.gz > INETUTILS_URL:= $(call ptx/mirror, GNU, > inetutils/$(INETUTILS).$(INETUTILS_SUFFIX)) > @@ -37,7 +37,6 @@ INETUTILS_ENV := $(CROSS_ENV) > # > INETUTILS_AUTOCONF := $(CROSS_AUTOCONF_USR) \ > $(GLOBAL_IPV6_OPTION) \ > - --with-PATH-CP=/bin/cp \ > --sysconfdir=/etc \ > --libexecdir=/usr/sbin \ > --disable-ftpd \ > @@ -62,6 +61,7 @@ INETUTILS_AUTOCONF := $(CROSS_AUTOCONF_USR) \ > --$(call ptx/endis, PTXCONF_INETUTILS_RSHD)-rshd \ > --$(call ptx/endis, PTXCONF_INETUTILS_SYSLOGD)-syslogd \ > --$(call ptx/endis, PTXCONF_INETUTILS_TFTPD)-tftpd > + > # > # FIXME: Unhandled options: > # --enable-encryption > -- > 1.8.5.2 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] lighttpd: version bump 1.4.32 -> 1.4.33
On Thu, Jan 16, 2014 at 04:54:04PM +0100, Bruno Thomsen wrote: > Time to get some fixes out; nothing special, just many small fixes – and some > new features. > > Changes from 1.4.32: > http://www.lighttpd.net/2013/9/27/1-4-33/ > Thanks, applied. Michael > Signed-off-by: Bruno Thomsen > --- > rules/lighttpd.make |4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/rules/lighttpd.make b/rules/lighttpd.make > index 5267b12..da97233 100644 > --- a/rules/lighttpd.make > +++ b/rules/lighttpd.make > @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd > # > # Paths and names > # > -LIGHTTPD_VERSION := 1.4.32 > -LIGHTTPD_MD5 := 8e2d4ae8e918d4de1aeb9842584d170b > +LIGHTTPD_VERSION := 1.4.33 > +LIGHTTPD_MD5 := e66b8164e5fc5a6beec0823b697fbe1d > LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION) > LIGHTTPD_SUFFIX := tar.bz2 > LIGHTTPD_URL := > http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX) > -- > 1.7.9.5 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] openssl: version bump 1.0.0k -> 1.0.1e
On Mon, Jan 20, 2014 at 11:45:20AM +0100, Michael Olbrich wrote: > Hi, > > On Fri, Jan 17, 2014 at 03:18:43PM +, Bruno Thomsen wrote: > > > PTXdist comes with various patches for openssl-1.0.0k. Did you check if > > > they are obsolete when updating to release 1.0.1e? If yes, you should > > > remove them with your patch as well. > > > > Ups, I was using the openssl-1.0.0h patch series when testing 1.0.1e. > > I will try to rebase/cleanup/test patch series and resubmit a patch. > > Let me handle that, I have a script here to import the latest patches from > debian. We now have 1.0.1f Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] opkg: do not grab files from the build directory
On Tue, Jan 21, 2014 at 04:27:02PM +0100, Juergen Beisert wrote: > To just rename a file while installing, we also can grab this file from > the install directory. This change enables the opkg package to be used as > a pre-build archive. > Thanks, both applied. Michael > Signed-off-by: Juergen Beisert > --- > rules/opkg.make | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/rules/opkg.make b/rules/opkg.make > index 8fc464f..4e78509 100644 > --- a/rules/opkg.make > +++ b/rules/opkg.make > @@ -67,7 +67,7 @@ ifdef PTXCONF_OPKG_GPG > @$(call install_copy, opkg, 0, 0, 0755, -, /usr/bin/opkg-key) > endif > #@$(call install_copy, opkg, 0, 0, 0755, -, /usr/bin/update-alternatives) > - @$(call install_copy, opkg, 0, 0, 0755, $(OPKG_DIR)/src/opkg-cl, > /usr/bin/opkg) > + @$(call install_copy, opkg, 0, 0, 0755, $(OPKG_PKGDIR)/usr/bin/opkg-cl, > /usr/bin/opkg) > > @$(call install_copy, opkg, 0, 0, 0755, -, > /usr/share/opkg/intercept/ldconfig) > @$(call install_copy, opkg, 0, 0, 0755, -, > /usr/share/opkg/intercept/depmod) > -- > 1.8.5.2 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] rules/dtc: Add include of KERNEL_DIR/include
On Thu, Jan 23, 2014 at 11:36:28AM +0100, Markus Pargmann wrote: > include/dt-bindings may be used by dts files. This directory is missing > in the dtc rule. > Thanks, applied. Michael > Signed-off-by: Markus Pargmann > --- > rules/dtc.make | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/rules/dtc.make b/rules/dtc.make > index a0eca75..1fddcb7 100644 > --- a/rules/dtc.make > +++ b/rules/dtc.make > @@ -34,6 +34,7 @@ ptx/dtb = $(notdir $(basename $(strip $(1.dtb > -I$(dir $<) \ > -I$(KERNEL_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/dts \ > -I$(KERNEL_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/dts/include \ > + -I$(KERNEL_DIR)/include \ > -undef -D__DTS__ -x assembler-with-cpp \ > -o $<.tmp \ > $< > -- > 1.8.5.2 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] Toolchain/gdb: we have the year 2014, reflect this in the default values
On Thu, Jan 23, 2014 at 12:32:51PM +0100, Juergen Beisert wrote: > The defaults are now pointing to the last year toolchain (2013.12) release. > This includes gdb which is used in this toolchain release. > Thnaks, both applied. Michael > Signed-off-by: Juergen Beisert > --- > platforms/toolchain.in | 8 > rules/gdb-menu.in | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/platforms/toolchain.in b/platforms/toolchain.in > index 90d62ad..2807bc7 100644 > --- a/platforms/toolchain.in > +++ b/platforms/toolchain.in > @@ -5,7 +5,7 @@ menu "toolchain " > config CROSSCHAIN_VENDOR > string > prompt "check for specific toolchain vendor" > - default "OSELAS.Toolchain-1.99.3" > + default "OSELAS.Toolchain-2013.12" > help > Add here an unique vendor string to ensure this project will > be build with the correct toolchain. > @@ -19,7 +19,7 @@ config CROSSCHAIN_VENDOR > config CROSSCHAIN_CHECK > string > prompt "check for specific gcc version" > - default "4.3.2" > + default "4.8.2" > help > PTXdist calls your cross compiler with -dumpversion and > compares the output with this string. This should help > @@ -47,7 +47,7 @@ if LIBC_GLIBC > config GLIBC_VERSION > string > prompt "check for specific glibc version" > - default "2.8" > + default "2.18" > help > Specify the glibc version this BSP shall be built with. This > information >is used to guess the toolchain path if you use "ptxdist toolchain" > @@ -58,7 +58,7 @@ if LIBC_UCLIBC > config UCLIBC_VERSION > string > prompt "check for specific uClibc version" > - default "0.9.30.2" > + default "0.9.33.2" > help > Specify the uClibc version this BSP shall be built with. This > information >is used to guess the toolchain path if you use "ptxdist toolchain" > diff --git a/rules/gdb-menu.in b/rules/gdb-menu.in > index 610aeb2..79e876b 100644 > --- a/rules/gdb-menu.in > +++ b/rules/gdb-menu.in > @@ -8,11 +8,11 @@ if GDB || GDBSERVER > > config GDB_VERSION > string "gdb version" > - default "7.2" > + default "7.6.1" > > config GDB_MD5 > string "gdb source md5sum" > - default "64260e6c56979ee750a01055f16091a5" > + default "fbc4dab4181e6e9937075b43a4ce2732" > > endif > > -- > 1.8.5.2 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] host-perl: add modules JSON and Locale::PO
On Thu, Jan 23, 2014 at 10:45:59AM +0100, Alexander Dahl wrote: > Thanks, applied with small changes. Michael > Signed-off-by: Alexander Dahl > --- > rules/host-system-perl.in |7 +++ > rules/host-system-perl.make | 16 > 2 files changed, 23 insertions(+) > > diff --git a/rules/host-system-perl.in b/rules/host-system-perl.in > index fc487ce..c02eb08 100644 > --- a/rules/host-system-perl.in > +++ b/rules/host-system-perl.in > @@ -5,8 +5,15 @@ config HOST_SYSTEM_PERL > > if HOST_SYSTEM_PERL > > +config HOST_SYSTEM_PERL_JSON > + bool > + > +config HOST_SYSTEM_PERL_LOCALE_PO > + bool > + > config HOST_SYSTEM_PERL_XMLPARSER > bool > > endif > > +# vim: ft=kconfig noet tw=72 > diff --git a/rules/host-system-perl.make b/rules/host-system-perl.make > index 8a7b33c..1d9e2ef 100644 > --- a/rules/host-system-perl.make > +++ b/rules/host-system-perl.make > @@ -22,12 +22,28 @@ $(STATEDIR)/host-system-perl.prepare: > @echo "Checking for Perl ..." > @perl -v >/dev/null 2>&1 || \ > ptxd_bailout "'perl' not found! Please install."; > + > +ifdef PTXCONF_HOST_SYSTEM_PERL_LOCALE_PO > + @echo "Checking for Perl: Locale::PO" > + @perl -e "require Locale::PO" 2>/dev/null || \ > + ptxd_bailout "Locale::PO perl module is required. \ > + Please install liblocale-po-perl (debian)." > +endif > + > +ifdef PTXCONF_HOST_SYSTEM_PERL_JSON > + @echo "Checking for Perl: JSON" > + @perl -e "require JSON" 2>/dev/null || \ > + ptxd_bailout "JSON perl module is required. \ > + Please install libjson-perl (debian)." > +endif > + > ifdef PTXCONF_HOST_SYSTEM_PERL_XMLPARSER > @echo "Checking for Perl: XML::Parser" > @perl -e "require XML::Parser" 2>/dev/null || \ > ptxd_bailout "XML::Parser perl module is required. \ > Please install libxml-parser-perl (debian)." > endif > + > @echo > @$(call touch) > > -- > 1.7.10.4 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] dropbear: upgrade to 2013.60
On Mon, Dec 16, 2013 at 01:44:57PM +0100, Alexander Dahl wrote: > Hei hei, > > what about this one? Did anyone had time to review this? Yes now :-). Try not to forget the patches next time... Applied. Michael > Greets > Alex > > Am 2013-10-18 13:21, schrieb Alexander Dahl: > > Several security issues were fixed between 2013.56 and 2013.59, > > 2013.60 fixed build on ptxdist (and other platforms). > > > > Signed-off-by: Alexander Dahl > > --- > > rules/dropbear.make |4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/rules/dropbear.make b/rules/dropbear.make > > index 74f273f..60de9d4 100644 > > --- a/rules/dropbear.make > > +++ b/rules/dropbear.make > > @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_DROPBEAR) += dropbear > > # > > # Paths and names > > # > > -DROPBEAR_VERSION := 2013.56 > > -DROPBEAR_MD5 := 700f1ae51ff008486465968db692b6dc > > +DROPBEAR_VERSION := 2013.60 > > +DROPBEAR_MD5 := fffa2fec0c887201bed3a3cc6df7fa35 > > DROPBEAR := dropbear-$(DROPBEAR_VERSION) > > DROPBEAR_SUFFIX:= tar.bz2 > > DROPBEAR_URL := > > > > ttp://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX) > > -- > »With the first link, the chain is forged. The first speech censured, > the first thought forbidden, the first freedom denied, chains us all > irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie) > *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** > > -- > ptxdist mailing list > ptxdist@pengutronix.de -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] Bridge-utils requires a kernel version to build
On Mon, Jan 13, 2014 at 08:56:05AM +0100, Jürgen Beisert wrote: > Until a kernel version is defined the bridge-utils' prepare stage fails. > As this failure is due to an incomplete project configuration, add a more > helpful error message how to resolve it. I think this check should go to kernel-headers.make. A valid version is always needed when kernel-headers are enabled. Michael > Signed-off-by: Juergen Beisert > > diff --git a/rules/bridge-utils.make b/rules/bridge-utils.make > index 9de1c16..f4b1402 100644 > --- a/rules/bridge-utils.make > +++ b/rules/bridge-utils.make > @@ -40,6 +40,16 @@ BRIDGE_UTILS_AUTOCONF := \ > $(CROSS_AUTOCONF_USR) \ > --with-linux-headers=$(KERNEL_HEADERS_DIR) > > +ifdef PTXCONF_BRIDGE_UTILS > +ifeq ($(KERNEL_HEADER_VERSION),) > + $(warning ### ERROR > ##) > + $(warning # Linux kernel version required in order to make bridge-utils > work #) > + $(warning #Define a platform kernel or the kernel headers > #) > + $(warning > ) > + $(error ) > +endif > +endif > + > # > > # Target-Install > # > > > -- > Pengutronix e.K. | Juergen Beisert | > Linux Solutions for Science and Industry | http://www.pengutronix.de/ | > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] host-perl: add modules JSON and Locale::PO
Hei hei, Am 2014-01-23 17:57, schrieb Michael Olbrich: > Thanks, applied with small changes. I remember thinking I should order it alphabetically, don't know how it had gone wrong then. Maybe too late yesterday. :-/ Thanks anyway. :-) Greets Alex -- »With the first link, the chain is forged. The first speech censured, the first thought forbidden, the first freedom denied, chains us all irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie) *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Add patch series to ${PTXDIST_TEMPDIR}/pkghash-*
On Thu, Jan 23, 2014 at 11:10 AM, Michael Olbrich
wrote:
> On Tue, Jan 21, 2014 at 09:02:49AM -0500, Jon Ringle wrote:
>> On Tue, Jan 21, 2014 at 4:56 AM, Michael Olbrich
>> wrote:
>> > Hi,
>> >
>> > On Mon, Jan 20, 2014 at 08:32:29PM -0500, Jon Ringle wrote:
>> >> When generating the ${PTXDIST_TEMPDIR}/pkghash-* in ptxd_lib_dgen.awk,
>> >> have you considered adding to that the contents of the first
>> >> ${PTXDIST_PATH_PATCHES}/this_PKG/series file found if one exists? This
>> >> would make the *_CFGHASH change if the patch series changes for a
>> >> given package. I'm not sure how to do this in awk, since
>> >> ${PTXDIST_PATH_PATCHES} is actually a : delimited search path.
>> >
>> > It's not that simple. There are also things like $(KERNEL_SERIES) and the
>> > last time I tried, the performance was not acceptable.
>>
>> Does the special case for $(KERNEL_SERIES) go away with what is being
>> discussed on the other thread today about adding
>> KERNEL_DEVPKG := NO
>
> Now I remember why that doesn't work:
> The name for the individual patch directories are not available yet, so we
> cannot find the series file. :-/
It would be great if there was someway to get the series file so it
could be included in pkghash-*. I've been bitten by adding a custom
patch to a package only to have the old dev package used because the
series file change was not detected.
--
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] We have 2014 (yes, I'm sure)
On Thu, Jan 23, 2014 at 12:32:49PM +0100, Juergen Beisert wrote: > Should we reflect this in various default values? If yes, here are some > changes to do so. :) Yeah, we have 2014, so you could do: git config --global user.name "Jürgen Beisert" echo 'set realname = "Jürgen Beisert"' >> .mutt/muttrc SCNR Uwe > > Juergen -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | -- ptxdist mailing list ptxdist@pengutronix.de
