Re: [ptxdist] [PATCHv4 1/4] collectd: add base functionality
On Thu, Feb 05, 2015 at 02:18:15PM +0100, Robert Schwebel wrote: This adds collectd, without any further plugin support so far. The systemd unit file was derived from the example delivered with the packet; some default options have been removed, and we don't depend on networking. Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de Thanks, all applied. Michael --- Changes since v3: * use $(GLOBAL_LARGE_FILE_OPTION) * add --without-perl-bindings * relative link for systemd service files * install config files Changes since v2: * adapted systemd unit according to review feedback Changes since v1: * use modern enable/disable method, similar to gstreamer generic/etc/collectd.conf | 46 ++ generic/lib/systemd/system/collectd.service | 9 ++ rules/collectd.in | 10 ++ rules/collectd.make | 219 4 files changed, 284 insertions(+) create mode 100644 generic/etc/collectd.conf create mode 100644 generic/lib/systemd/system/collectd.service create mode 100644 rules/collectd.in create mode 100644 rules/collectd.make diff --git a/generic/etc/collectd.conf b/generic/etc/collectd.conf new file mode 100644 index 000..400ff6d --- /dev/null +++ b/generic/etc/collectd.conf @@ -0,0 +1,46 @@ +# +# Config file for collectd(1). +# Please read collectd.conf(5) for a list of options. +# http://collectd.org/ +# + +## +# Global # +## +# Global settings for the daemon. # +## + +Hostnamelocalhost +FQDNLookup true +BaseDir /var/lib/collectd +PIDFile /var/run/collectd.pid +PluginDir /usr/lib/collectd +TypesDB /usr/share/collectd/types.db + +## +# When enabled, plugins are loaded automatically with the default options # +# when an appropriate Plugin ... block is encountered. # +# Disabled by default. # +## +AutoLoadPlugin false + +## +# Interval at which to query values. This may be overwritten on a per-plugin # +# base by using the 'Interval' option of the LoadPlugin block: # +# LoadPlugin foo # +# Interval 60 # +# /LoadPlugin # +## +Interval 10 + +Timeout 2 +ReadThreads 2 +WriteThreads 2 + +# Limit the size of the write queue. Default is no limit. Setting up a limit is +# recommended for servers handling a high volume of traffic. +#WriteQueueLimitHigh 100 +#WriteQueueLimitLow 80 + +Include /etc/collectd.d/*.conf + diff --git a/generic/lib/systemd/system/collectd.service b/generic/lib/systemd/system/collectd.service new file mode 100644 index 000..752245c --- /dev/null +++ b/generic/lib/systemd/system/collectd.service @@ -0,0 +1,9 @@ +[Unit] +Description=statistics collection daemon + +[Service] +ExecStart=/usr/sbin/collectd -f +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/rules/collectd.in b/rules/collectd.in new file mode 100644 index 000..c5a29d0 --- /dev/null +++ b/rules/collectd.in @@ -0,0 +1,10 @@ +## SECTION=shell_and_console + +menuconfig COLLECTD + tristate + prompt collectd + help + collectd is a daemon which collects system performance statistics + periodically and provides mechanisms to store the values in a + variety of ways, for example in RRD files. + diff --git a/rules/collectd.make b/rules/collectd.make new file mode 100644 index 000..ec20230 --- /dev/null +++ b/rules/collectd.make @@ -0,0 +1,219 @@ +# -*-makefile-*- +# +# Copyright (C) 2014 by Markus Pargmann m...@pengutronix.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_COLLECTD) += collectd + +# +# Paths and names +# +COLLECTD_VERSION := 5.4.1 +COLLECTD := collectd-$(COLLECTD_VERSION) +COLLECTD_SUFFIX := tar.bz2 +COLLECTD_URL :=
[ptxdist] [ANNOUNCE] PTXdist 2015.01.0 released
Hi, I'm happy to announce that I've just released ptxdist-2015.01.0. Just a bunch of version bumps and a few bugfixes and new packages. Nothing special this time. Thanks to all contributors and - as always - the shortlog below. Enjoy, Michael Olbrich Alexander Aring (1): lowpan-tools: replace with wpan-tools Alexander Stein (1): u-boot-tools: Fix build dir Bernhard Walle (1): lighttpd: Implement 'restart' in init script Bruno Thomsen (4): php5: added openssl support option php5: version bump 5.4.33 - 5.4.35 strongswan: added openssl plugin option strongswan: aes-gcm support enabled Juergen Borleis (2): GDB: switch to an available archive type for all releases. GDB: fix default MD5 checksum Martin Hejnfelt (1): Added Oracles Java 7 JRE Michael Olbrich (19): gst-rtsp-server1: new package orc: version bump 0.4.21 - 0.4.23 gstreamer1: version bump 1.4.4 - 1.4.5 gst-plugins-base1: version bump 1.4.4 - 1.4.5 gst-plugins-good1: version bump 1.4.4 - 1.4.5 gst-plugins-bad1: version bump 1.4.4 - 1.4.5 gst-plugins-ugly1: version bump 1.4.4 - 1.4.5 gst-rtsp-server1: version bump 1.4.4 - 1.4.5 libva: version bump 1.4.0 - 1.5.0 libva-intel-driver: version bump 1.4.0 - 1.5.0 systemd: version bump 217 - 218 host-fakeroot: make sure bash is used as the shell for bin/fakeroot crda: fix fox x86_64 crda: update regulatory.bin architecture: fix long double handling for x86_64 host-systemd: needs libmount openssl: version bump 1.0.1j - 1.0.1k systemd: add hack to build host-systemd with glibc 2.13 ptxd_make_get_http: add option to define cookies Philipp Zabel (1): gnupg: update to 2.0.26 Robert Schwebel (5): python: prepare version bump python: update patches for 2.7.9 python: version bump 2.7.5 - 2.7.9 python: remove old patches avahi: version bump 0.6.30 - 0.6.31 grodriguez (2): New package: libzip New package: fuse-zip -- 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- | signature.asc Description: Digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCHv2] c-ares: added c-ares to ptxdist
On Mon, Feb 16, 2015 at 03:51:13PM +0100, Oliver Graute wrote: This patch add c-ares to ptxdist, its a C library for async DNS requests Signed-off-by: Oliver Graute oliver.gra...@neuhaus.de --- rules/c-ares.in |7 +++ rules/c-ares.make | 52 2 files changed, 59 insertions(+) create mode 100644 rules/c-ares.in create mode 100644 rules/c-ares.make diff --git a/rules/c-ares.in b/rules/c-ares.in new file mode 100644 index 000..2443499 --- /dev/null +++ b/rules/c-ares.in @@ -0,0 +1,7 @@ +## SECTION=networking + +config C_ARES + tristate + prompt c-ares + help + c-ares is a C library for asynchronous DNS requests (including name resolves) diff --git a/rules/c-ares.make b/rules/c-ares.make new file mode 100644 index 000..e89b813 --- /dev/null +++ b/rules/c-ares.make @@ -0,0 +1,52 @@ +# -*-makefile-*- +# +# Copyright (C) 2014 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute oliver.gra...@neuhaus.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_C_ARES) += c-ares + +# +# Paths and names +# +C_ARES_VERSION := 1.10.0 +C_ARES_MD5 := 6d325e6ef7afbb0a1041a4d2b1266533 Hmm, that's not the checksum I get here. +C_ARES := c-ares-$(C_ARES_VERSION) +C_ARES_SUFFIX:= tar.gz +C_ARES_URL := http://c-ares.haxx.se/download//$(C_ARES).$(C_ARES_SUFFIX) +C_ARES_SOURCE:= $(SRCDIR)/$(C_ARES).$(C_ARES_SUFFIX) +C_ARES_DIR := $(BUILDDIR)/$(C_ARES) +C_ARES_LICENSE := MIT license please align the ':=' (in the file not the patch) + add: +# +# Prepare +# + +# +# autoconf +# +C_ARES_CONF_TOOL := autoconf You need to specify the configure options: C_ARES_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ ... Disable all debugging, $(GLOBAL_LARGE_FILE_OPTION) for the largefile option and --enable-nonblocking I guess? Michael + +# +# Target-Install +# + +$(STATEDIR)/c-ares.targetinstall: + @$(call targetinfo) + + @$(call install_init, c-ares) + @$(call install_fixup, c-ares,PRIORITY,optional) + @$(call install_fixup, c-ares,SECTION,base) + @$(call install_fixup, c-ares,AUTHOR,oliver.gra...@neuhaus.de) + @$(call install_fixup, c-ares,DESCRIPTION,missing) + + @$(call install_lib, c-ares, 0, 0, 0644, libcares) + + @$(call install_finish, c-ares) + + + @$(call touch) + +# vim: syntax=make -- 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] dropbear: version bump 2014.65 - 2015.67
On Mon, Feb 16, 2015 at 04:47:09PM +0100, Bruno Thomsen wrote: The new version contain options to enable/disable cipher modes. Keeping today's default cipher mode. In a secure solution one would disable CBC and enable CTR. Signed-off-by: Bruno Thomsen b...@kamstrup.com --- rules/dropbear.in | 15 +++ rules/dropbear.make | 18 -- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/rules/dropbear.in b/rules/dropbear.in index fe2ada3..79aad57 100644 --- a/rules/dropbear.in +++ b/rules/dropbear.in @@ -203,6 +203,21 @@ config DROPBEAR_TWOFISH256 bijective f function made by four key-dependent 8x8-bit S-boxes. +config DROPBEAR_CBC_CIPHERS + bool + prompt CBC mode ciphers + default y + help + Enable CBC mode for ciphers. This has security issues though + is the most compatible with older SSH implementations. In that case, shouldn't this be off by default? Those that still need it can enable it. Michael + +config DROPBEAR_CTR_CIPHERS + bool + prompt Counter mode ciphers + help + Enable Counter Mode for ciphers. This is more secure than normal + CBC mode against certain attacks. This adds around 1kB to binary + size and is recommended for most cases. comment Integrity, at least one required --- RFC Draft requires sha1-hmac and recommends sha1-96 diff --git a/rules/dropbear.make b/rules/dropbear.make index f03d0fc..ab9da5d 100644 --- a/rules/dropbear.make +++ b/rules/dropbear.make @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_DROPBEAR) += dropbear # # Paths and names # -DROPBEAR_VERSION := 2014.65 -DROPBEAR_MD5 := 1918604238817385a156840fa2c39490 +DROPBEAR_VERSION := 2015.67 +DROPBEAR_MD5 := e967e320344cd4bfebe321e3ab8514d6 DROPBEAR := dropbear-$(DROPBEAR_VERSION) DROPBEAR_SUFFIX := tar.bz2 DROPBEAR_URL := http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX) @@ -163,7 +163,21 @@ else @$(call disable_c, $(DROPBEAR_DIR)/options.h,DROPBEAR_TWOFISH128) endif +ifdef PTXCONF_DROPBEAR_CBC_CIPHERS + @echo ptxdist: enabling cbc ciphers + @$(call enable_c, $(DROPBEAR_DIR)/options.h,DROPBEAR_ENABLE_CBC_MODE) +else + @echo ptxdist: disabling cbc ciphers + @$(call disable_c, $(DROPBEAR_DIR)/options.h,DROPBEAR_ENABLE_CBC_MODE) +endif +ifdef PTXCONF_DROPBEAR_CTR_CIPHERS + @echo ptxdist: enabling ctr ciphers + @$(call enable_c, $(DROPBEAR_DIR)/options.h,DROPBEAR_ENABLE_CTR_MODE) +else + @echo ptxdist: disabling ctr ciphers + @$(call disable_c, $(DROPBEAR_DIR)/options.h,DROPBEAR_ENABLE_CTR_MODE) +endif ifdef PTXCONF_DROPBEAR_SHA1 @echo ptxdist: enabling sha1 -- 1.9.1 -- 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] ext2.make:16: warning: overriding commands for target
On Tue, Feb 17, 2015 at 08:23:22AM +, Hänel-Baas, Alexander wrote: Hi Michael Thank you for reply But I have only changed the entry in ptxdist - platformconfig - image creation window. No rules or other files was changed. You see the message printed the original file under ptxdist-2014.10.0/rules/post/. These files I have never touched?! rules/image-root-ext.make and rules/post/image_ext2.make both define a rule for root.ext2. However, both are inside an ifdef and only active if the corresponding option is enabled. The error occures if both options are enabled. Michael I try ptxdist newpackage image-genimage, very good idea. I think that is my way. Best regards Alexander -Ursprüngliche Nachricht- Von: ptxdist-boun...@pengutronix.de [mailto:ptxdist-boun...@pengutronix.de] Im Auftrag von Michael Olbrich Gesendet: Montag, 16. Februar 2015 11:34 An: ptxdist@pengutronix.de Betreff: Re: [ptxdist] ext2.make:16: warning: overriding commands for target On Fri, Feb 13, 2015 at 06:45:52AM +, Hänel-Baas, Alexander wrote: I change the image creation option under ptxdist platformconfig - image creation - generates images/hd.img an now i get the message: ptxdist-2014.10.0/ rules/post/image_ext2.make:16: warning: overriding commands for target You're mixing the 'old' and 'new' image rules. That does not work. I would like to create a further partition in the hd.img . The best solution for me is a filesystem that contains directories and files, such as projectroot. How I can di this in ptxdist? With the 'new' image creation rules you can do this, but there is not a lot of documentation. You can define a new image with 'ptxdist newpackage image-genimage'. Look at rules/image-*.make (and config/images/) for examples. The input data is usually a tarball. 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
[ptxdist] [ANNOUNCE] PTXdist 2015.02.0 released
Hi, I'm happy to announce that I've just released ptxdist-2015.02.0. We have the usual mix of new packages and bugfixes. That includes the last fixes to build all packages with OSELAS.Toolchain-2014.12.0. PTXdist now has initial support for ARM64. Not all packages can be build yet, but a basic headless system should work. And we have a bunch of license information updates with some initial support to extract the information for all enabled packages: ptxdist make license-report will generate license-report.pdf and license-report-tools.pdf in the state dir. Thanks to all contributors and - as always - the shortlog below. Enjoy, Michael Olbrich Alexander Aring (5): liblzo: rework and version bump wpan-tools: version bump 0.3 - 0.4 openssl: allow to install openssl.cnf easy-rsa: initial commit openvpn: rework and version bump André Hentschel (1): nano: Fix a typo Bernhard Walle (5): Update host-cmake to 3.1.1 sqlite: version bump 3.8.7.1 - 3.8.8.1 pyserial: Version bump 2.6 - 2.7 python3: Add menu for python3 3rd-party modules pyserial3: Provide pyserial package for Python 3 Bruno Thomsen (2): strongswan: version bump 5.1.3 - 5.2.2 php5: version bump 5.4.35 - 5.5.21 Gieseler, Christian (1): jansson: version bump to 2.7 Guillermo Rodriguez (1): Init script was ignoring OPTIONS variable Jon Ringle (1): make dist: tar --owner=0 --group=0 Juergen Borleis (51): dbus-python: use the same license than the dbus core is using dbus-glib: add license information bash: add license information dosfstools: add license information fbutils: WIP add license information freetype: add license files for report generation gdbserver: update license information and list all license files for report generation iputiles: add license files for report generation libpcap: update license information and ad license file for report generation libgcrypt: add license information and license files for report generation libgpg-error: add license information and license files for report generation liblockfile: add license file for report generation libpcre: add license information and add license file for report generation libsysfs: add license information and license files for report generation lmbench: add license information and license files for report generation module-init-tools: add license information openssh: add license information and license file for report generation prelink: add license information for report generation procps: add license files for report generation rsync3: add license information rsyslog: update license information and add license files for report generation sed: update license information and add license files for report generation systemd: update license information and add license files for report generation udev: if the udev feature comes from the systemd package use its license information unzip: add license information and license file for report generation util-linux-ng: update license and add license file for report generation acl: update license information and add license file for report generation attr: update license information and add license file for report generation autoconf: add license information and license files for report generation automake: add license information host-cmake: add license information and license files for report generation zlib: update license information libtool: add license information libkmod: adjust license info host-lndir: add license information host-m4: add license information host-pkg-config: add license information xorg-proto-x: add license information libpopt: add license information Perl: update license information tcpwrapper: add license information License management: prevent some packages from listed in the report host-elf-h-compat: add license information host-fakeroot: add license information host-gperf: add license information host-gtk-doc: add license information host-opkg-utils: add license information host-perl: no license information available host-unfs: add license information python: update license information host-intltools: add license information Marc Kleine-Budde (2): iproute2: allow overwriting of /etc/iproute2/* via projectdir architecture: add missing select to ARCH_LP64 for ARCH_ARM64 Michael Olbrich (38): wayland: version bump 1.6.0 - 1.6.1 weston: version bump 1.6.0 - 1.6.1 dbus: version bump 1.8.8 - 1.8.14 util-linux-ng: version bump 2.25 - 2.25.2 architecture: add arm64 support kernel: add arm64 support libva-intel-driver: don't forget the patches dt: move
Re: [ptxdist] [PATCH 1/2] apr-util: version bump apr-util
On Wed, Feb 18, 2015 at 11:49:20AM +0100, Oliver Graute wrote: This is a apr-util version bump from 0.9.19 to 1.5.4 this is necessary for the Apache2 version bump Signed-off-by: Oliver Graute oliver.gra...@neuhaus.de --- rules/apr-util.in |1 - rules/apr-util.make | 14 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/rules/apr-util.in b/rules/apr-util.in index aaacfad..6e53726 100644 --- a/rules/apr-util.in +++ b/rules/apr-util.in @@ -3,7 +3,6 @@ config APR_UTIL tristate select APR - select HOST_APR_UTIL select EXPAT prompt apr-util help diff --git a/rules/apr-util.make b/rules/apr-util.make index 821a838..86aa107 100644 --- a/rules/apr-util.make +++ b/rules/apr-util.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2012 by Marc Kleine-Budde m...@pengutronix.de +# Copyright (C) 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute oliver.gra...@neuhaus.de # # See CREDITS for details about who has contributed to this project. # @@ -16,8 +17,8 @@ PACKAGES-$(PTXCONF_APR_UTIL) += apr-util # # Paths and names # -APR_UTIL_VERSION := 0.9.19 -APR_UTIL_MD5 := 927a200513018a579cc9936c05d35206 +APR_UTIL_VERSION := 1.5.4 +APR_UTIL_MD5 := 866825c04da827c6e5f53daff5569f42 APR_UTIL := apr-util-$(APR_UTIL_VERSION) APR_UTIL_SUFFIX := tar.bz2 APR_UTIL_URL := http://archive.apache.org/dist/apr/$(APR_UTIL).$(APR_UTIL_SUFFIX) @@ -29,14 +30,17 @@ APR_UTIL_LICENSE := APLv2 # Prepare # +APR_UTIL_CONF_ENV:= $(CROSS_ENV) + # # autoconf # APR_UTIL_CONF_TOOL := autoconf APR_UTIL_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \ - --with-expat=$(PTXDIST_SYSROOT_TARGET)/usr + --with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-1-config \ This seems strange (the original, not just your change): I don't think there is a $(PTXDIST_SYSROOT_CROSS)/bin/apr-config, it should be in PTXDIST_SYSROOT_TARGET. Can you check what configure does here? + --with-expat=$(PTXDIST_SYSROOT_TARGET)/usr/include/apr-1 No, I'm pretty sure, that's not where expat is found. Michael + # # Target-Install @@ -51,7 +55,7 @@ $(STATEDIR)/apr-util.targetinstall: @$(call install_fixup, apr-util,AUTHOR,Marc Kleine-Budde m...@pengutronix.de) @$(call install_fixup, apr-util,DESCRIPTION,missing) - @$(call install_lib, apr-util, 0, 0, 0644, libaprutil-0) + @$(call install_lib, apr-util, 0, 0, 0644, libaprutil-1) @$(call install_finish, apr-util) -- 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 2/2] added 0001-apr-gen-test-char.patch
On Wed, Feb 18, 2015 at 11:45:18AM +0100, Oliver Graute wrote: Signed-off-by: Oliver Graute oliver.gra...@neuhaus.de --- patches/apr-1.5.1/0001-apr-gen-test-char.patch | 69 patches/apr-1.5.1/series |1 + 2 files changed, 70 insertions(+) create mode 100644 patches/apr-1.5.1/0001-apr-gen-test-char.patch create mode 100644 patches/apr-1.5.1/series diff --git a/patches/apr-1.5.1/0001-apr-gen-test-char.patch b/patches/apr-1.5.1/0001-apr-gen-test-char.patch new file mode 100644 index 000..12d47f6 --- /dev/null +++ b/patches/apr-1.5.1/0001-apr-gen-test-char.patch Proper patch header please. @@ -0,0 +1,69 @@ +diff -rupN AK/apr-config.in AL/apr-config.in +--- AK/apr-config.in 2015-02-12 11:36:28.0 +0100 AL/apr-config.in 2015-02-12 11:44:24.515350580 +0100 +@@ -200,7 +200,7 @@ while test $# -gt 0; do + ### avoid using -L if libdir is a standard location like /usr/lib + # Since the user is specifying they are linking with libtool, we + # *know* that -R will be recognized by libtool. +-flags=$flags -L$libdir -R$libdir -l${APR_LIBNAME} ++flags=$flags -L@SYSROOT@$libdir -l${APR_LIBNAME} + else + flags=$flags $LA_FILE + fi +diff -rupN AK/include/private/apr_escape_test_char.h AL/include/private/apr_escape_test_char.h +--- AK/include/private/apr_escape_test_char.h1970-01-01 01:00:00.0 +0100 AL/include/private/apr_escape_test_char.h2015-02-12 13:53:10.195232200 +0100 No. This should be generated. Copy the tool from host-apr. See e.g. host-mesalib/mesalib for an example how to do this. Michael +@@ -0,0 +1,23 @@ ++/* this file is automatically generated by gen_test_char, do not edit. make include/private/apr_escape_test_char.h to regenerate. */ ++#define T_ESCAPE_SHELL_CMD (1) ++#define T_ESCAPE_PATH_SEGMENT (2) ++#define T_OS_ESCAPE_PATH (4) ++#define T_ESCAPE_ECHO (8) ++#define T_ESCAPE_URLENCODED(16) ++#define T_ESCAPE_XML (32) ++ ++static const unsigned char test_char_table[256] = { ++32,30,30,30,30,30,30,30,30,30,31,30,30,30,30,30,30,30,30,30, ++30,30,30,30,30,30,30,30,30,30,30,30,6,16,63,22,17,22,49,17, ++17,17,1,16,16,0,0,18,0,0,0,0,0,0,0,0,0,0,16,23, ++55,16,55,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, ++0,0,0,0,0,0,0,0,0,0,0,23,31,23,23,0,23,0,0,0, ++0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, ++0,0,0,23,23,23,17,30,30,30,30,30,30,30,30,30,30,30,30,30, ++30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, ++30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, ++30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, ++30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, ++30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, ++30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30 ++}; +diff -rupN AK/Makefile.in AL/Makefile.in +--- AK/Makefile.in 2014-03-17 16:10:26.0 +0100 AL/Makefile.in 2015-02-12 15:42:23.506233505 +0100 +@@ -71,7 +71,7 @@ apr-config.out: $(APR_CONFIG) + + # Create apr_rules.mk suitable for the install tree + build/apr_rules.out: build/apr_rules.mk +-sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' build/apr_rules.mk $@ ++sed 's,^\(apr_build.*=\).*$$,\1@SYSROOT@$(installbuilddir),' build/apr_rules.mk $@ + + install: $(TARGETS) + $(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \ +@@ -132,14 +132,9 @@ etags: + make_tools_dir: + $(APR_MKDIR) tools + +-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) +-tools/gen_test_char.lo: make_tools_dir +-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) +-$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) +- +-include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ +-$(APR_MKDIR) include/private +-tools/gen_test_char@EXEEXT@ $@ ++#include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ ++# $(APR_MKDIR) include/private ++# tools/gen_test_char@EXEEXT@ $@ + + LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \ + @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@ diff --git a/patches/apr-1.5.1/series b/patches/apr-1.5.1/series new file mode 100644 index 000..9b5a323 --- /dev/null +++ b/patches/apr-1.5.1/series @@ -0,0 +1 @@ +0001-apr-gen-test-char.patch -- 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] [PATCHv2 1/2] apache2: version bump to 2.4.12
Hi, Please send on patch that contains the rules changes and the patches. This applies to your other patches as well. Michael On Wed, Feb 18, 2015 at 12:00:48PM +0100, Oliver Graute wrote: apache2 version bump to 2.4.12 apr-1.5.1 and apr-utils-1.5.4 is necessary Signed-off-by: Oliver Graute oliver.gra...@neuhaus.de --- rules/apache2.in |1 - rules/apache2.make | 14 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/rules/apache2.in b/rules/apache2.in index 653f9cd..7441486 100644 --- a/rules/apache2.in +++ b/rules/apache2.in @@ -5,7 +5,6 @@ menuconfig APACHE2 prompt apache 2 http server select APR select APR_UTIL - select HOST_APACHE2 Check the old patches. This is used to build some helper tools, so we don't need to ship the generated files. select LIBC_M select LIBC_RT select LIBC_DL diff --git a/rules/apache2.make b/rules/apache2.make index 98b628e..ba82592 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -2,6 +2,7 @@ # # Copyright (C) 2005 by Robert Schwebel # 2009, 2012 by Marc Kleine-Budde m...@pengutronix.de +# 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute oliver.gra...@neuhaus.de # # See CREDITS for details about who has contributed to this project. # @@ -17,8 +18,8 @@ PACKAGES-$(PTXCONF_APACHE2) += apache2 # # Paths and names # -APACHE2_VERSION := 2.0.64 -APACHE2_MD5 := 762e250a3b981ce666bc10e6748a1ac1 +APACHE2_VERSION := 2.4.12 +APACHE2_MD5 := b8dc8367a57a8d548a9b4ce16d264a13 APACHE2 := httpd-$(APACHE2_VERSION) APACHE2_SUFFIX := tar.bz2 APACHE2_URL := http://archive.apache.org/dist/httpd/$(APACHE2).$(APACHE2_SUFFIX) @@ -36,10 +37,13 @@ APACHE2_LICENSE := APLv2 APACHE2_CONF_TOOL := autoconf APACHE2_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + ap_cv_void_ptr_lt_long=4 \ --includedir=/usr/include/apache2 \ --enable-so \ - --with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \ - --with-apr-util=$(PTXDIST_SYSROOT_CROSS)/bin/apu-config + --with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-1-config \ + --with-apr-util=$(PTXDIST_SYSROOT_CROSS)/bin/apu-1-config \ Again, I don't think this is in PTXDIST_SYSROOT_CROSS. This might be the cause of your other problem, because it picks the wrong apr? Michael + --with-ssl=$(PTXDIST_SYSROOT_TARGET)/usr/lib/ssl \ + --enable-ssl=shared ifdef PTXCONF_APACHE2_MPM_PREFORK APACHE2_CONF_OPT += --with-mpm=prefork @@ -129,6 +133,8 @@ endif $(PTXCONF_APACHE2_SERVERROOT)/conf/magic) @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/etc/mime.types, \ $(PTXCONF_APACHE2_SERVERROOT)/conf/mime.types) + @$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/modules/mod_ssl.so, \ + $(PTXCONF_APACHE2_SERVERROOT)/modules/mod_ssl.so) endif -- 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] [RFC 0/2] add a way to extract license text from packages
On Tue, Feb 17, 2015 at 09:10:09AM +0100, Markus Niebel wrote: Am 11.02.2015 um 14:02 schrieb Michael Olbrich: On Wed, Feb 11, 2015 at 12:19:34PM +0100, Juergen Borleis wrote: On Wednesday 11 February 2015 11:50:16 Hubert Feurstein wrote: IMHO the proposal by Markus makes sense. I have had the same issues with collecting license texts in the past. So a solution integrated in PTXdist would be great. Because then it would be possible to collect the license texts depending on the config options of a package (sometimes plugins have a different license). Please checkout current PTXdist master and run ptxdist make license-report inside a PTXdist project. You need LATEX and dot to make it work. xelatex (from texlive-xetex in Debian) and dot2tex are needed as well. Thank you, test looks promising and generated data are very helpfull. Just a hint for documentation - recent versions of the LATEX packages are needed, because of style packages used. It worked on my Debian unstable :-). I'd be happy to take patches that make it work with older versions if there is a need for that. 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] [PATCHv2 06/10] collectd: add base functionality
On Mon, Jan 26, 2015 at 11:13:08PM +0100, Robert Schwebel wrote: This adds collectd, without any further plugin support so far. Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- Changes since v1: * use modern enable/disable method, similar to gstreamer See my other mail. The comments still apply. Michael generic/etc/collectd.conf | 46 ++ generic/lib/systemd/system/collectd.service | 15 ++ rules/collectd.in | 10 ++ rules/collectd.make | 216 4 files changed, 287 insertions(+) create mode 100644 generic/etc/collectd.conf create mode 100644 generic/lib/systemd/system/collectd.service create mode 100644 rules/collectd.in create mode 100644 rules/collectd.make diff --git a/generic/etc/collectd.conf b/generic/etc/collectd.conf new file mode 100644 index 000..400ff6d --- /dev/null +++ b/generic/etc/collectd.conf @@ -0,0 +1,46 @@ +# +# Config file for collectd(1). +# Please read collectd.conf(5) for a list of options. +# http://collectd.org/ +# + +## +# Global # +## +# Global settings for the daemon. # +## + +Hostnamelocalhost +FQDNLookup true +BaseDir /var/lib/collectd +PIDFile /var/run/collectd.pid +PluginDir /usr/lib/collectd +TypesDB /usr/share/collectd/types.db + +## +# When enabled, plugins are loaded automatically with the default options # +# when an appropriate Plugin ... block is encountered. # +# Disabled by default. # +## +AutoLoadPlugin false + +## +# Interval at which to query values. This may be overwritten on a per-plugin # +# base by using the 'Interval' option of the LoadPlugin block: # +# LoadPlugin foo # +# Interval 60 # +# /LoadPlugin # +## +Interval 10 + +Timeout 2 +ReadThreads 2 +WriteThreads 2 + +# Limit the size of the write queue. Default is no limit. Setting up a limit is +# recommended for servers handling a high volume of traffic. +#WriteQueueLimitHigh 100 +#WriteQueueLimitLow 80 + +Include /etc/collectd.d/*.conf + diff --git a/generic/lib/systemd/system/collectd.service b/generic/lib/systemd/system/collectd.service new file mode 100644 index 000..53eb5db --- /dev/null +++ b/generic/lib/systemd/system/collectd.service @@ -0,0 +1,15 @@ +[Unit] +Description=statistics collection daemon +Documentation=man:collectd(1) +After=local-fs.target network.target +Requires=local-fs.target network.target + +[Service] +ExecStart=/usr/sbin/collectd -C /etc/collectd.conf -f +Restart=always +RestartSec=10 +StandardOutput=syslog +StandardError=syslog + +[Install] +WantedBy=multi-user.target diff --git a/rules/collectd.in b/rules/collectd.in new file mode 100644 index 000..c5a29d0 --- /dev/null +++ b/rules/collectd.in @@ -0,0 +1,10 @@ +## SECTION=shell_and_console + +menuconfig COLLECTD + tristate + prompt collectd + help + collectd is a daemon which collects system performance statistics + periodically and provides mechanisms to store the values in a + variety of ways, for example in RRD files. + diff --git a/rules/collectd.make b/rules/collectd.make new file mode 100644 index 000..5ee4e7c --- /dev/null +++ b/rules/collectd.make @@ -0,0 +1,216 @@ +# -*-makefile-*- +# +# Copyright (C) 2014 by Markus Pargmann m...@pengutronix.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_COLLECTD) += collectd + +# +# Paths and names +# +COLLECTD_VERSION := 5.4.1 +COLLECTD := collectd-$(COLLECTD_VERSION) +COLLECTD_SUFFIX := tar.bz2 +COLLECTD_URL := http://collectd.org/files/${COLLECTD}.${COLLECTD_SUFFIX} +COLLECTD_MD5 := 6f56c71c96573a7f4f7fb3bfab185974 +COLLECTD_DIR := $(BUILDDIR)/$(COLLECTD)
Re: [ptxdist] [PATCH 5/5] pyserial3: Provide pyserial package for Python 3
On Sun, Jan 25, 2015 at 07:11:56PM +0100, Bernhard Walle wrote: This upstream package can be used for both Python 2.7 and Python 3. I'm providing the python 3 variant as 'pyserial3'. The package is designed so that it can be built and installed in parallel to pyserial (Python 2 installation). So I renamed the miniterm.py to miniterm3.py. The other example are not installed as renaming all of them wasn't worth the effort in my opinion. Thanks, all patches applied. I was about to comment the miniterm installation, but the I noticed, that you just copied it from the Python 2.x package... This needs to be fixed in the distutils... Michael Signed-off-by: Bernhard Walle bernh...@bwalle.de --- rules/pyserial3.in | 26 + rules/pyserial3.make | 105 +++ 2 files changed, 131 insertions(+) create mode 100644 rules/pyserial3.in create mode 100644 rules/pyserial3.make diff --git a/rules/pyserial3.in b/rules/pyserial3.in new file mode 100644 index 000..3cb83e5 --- /dev/null +++ b/rules/pyserial3.in @@ -0,0 +1,26 @@ +## SECTION=python3 + +menuconfig PYSERIAL3 + tristate + select PYTHON3 + prompt pyserial + help + This module encapsulates the access for the serial port. It provides + backends for Python running on Windows, Linux, BSD (possibly any + POSIX compliant system), Jython and IronPython (.NET and Mono). The + module named serial automatically selects the appropriate backend. + + - Project Homepage: http://pyserial.sourceforge.net + - Project page on SourceForge: http://sourceforge.net/projects/pyserial/ + - SVN repository: http://sourceforge.net/svn/?group_id=46487 + - Download Page: http://sourceforge.net/project/showfiles.php?group_id=46487 + +if PYSERIAL3 + +config PYSERIAL3_MINITERM + bool + prompt Install 'miniterm' + help + Install the miniterm script coming with this package. + +endif diff --git a/rules/pyserial3.make b/rules/pyserial3.make new file mode 100644 index 000..534ced6 --- /dev/null +++ b/rules/pyserial3.make @@ -0,0 +1,105 @@ +# -*-makefile-*- +# +# Copyright (C) 2011 by Juergen Beisert j...@pengutronix.de +# Copyright (C) 2015 by Bernhard Walle bernh...@bwalle.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYSERIAL3) += pyserial3 + +# +# Paths and names +# +PYSERIAL3_VERSION:= 2.7 +PYSERIAL3_MD5:= 794506184df83ef2290de0d18803dd11 +PYSERIAL3:= pyserial3-$(PYSERIAL3_VERSION) +PYSERIAL3_SUFFIX := tar.gz +PYSERIAL3_URL:= http://pypi.python.org/packages/source/p/pyserial/pyserial-$(PYSERIAL3_VERSION).$(PYSERIAL3_SUFFIX) +PYSERIAL3_SOURCE := $(SRCDIR)/$(PYSERIAL3).$(PYSERIAL3_SUFFIX) +PYSERIAL3_DIR:= $(BUILDDIR)/$(PYSERIAL3) +PYSERIAL3_LICENSE:= BSD + +# +# Extract +# + +$(STATEDIR)/pyserial3.extract: + @$(call targetinfo) + @$(call clean, $(PYSERIAL3_DIR)) + @$(call extract, PYSERIAL3) + @$(call patchin, PYSERIAL3) + @(cd $(PYSERIAL3_DIR) ; \ + find . -name '*.py' -exec sed -i \ + 's@#! \?/usr/bin/env python@#!/usr/bin/env python3@g' {} \;) + @$(call touch) + +# +# Prepare +# + +PYSERIAL3_PATH := PATH=$(CROSS_PATH) +PYSERIAL3_CONF_TOOL := NO +PYSERIAL3_MAKE_ENV := $(CROSS_ENV) + +# +# Compile +# + +$(STATEDIR)/pyserial3.compile: + @$(call targetinfo) + @$(call touch) + +# +# Install +# + +$(STATEDIR)/pyserial3.install: + @$(call targetinfo) + @cd $(PYSERIAL3_DIR) \ + $(PYSERIAL3_PATH) $(PYSERIAL3_MAKE_ENV) \ + python3 setup.py install --root=$(PYSERIAL3_PKGDIR) --prefix=/usr + @$(call touch) + +# +# Target-Install +# + +$(STATEDIR)/pyserial3.targetinstall: + @$(call targetinfo) + + @$(call install_init, pyserial3) +
Re: [ptxdist] ptxdist: BUSYBOX_NTPD blocks NTP
On Mon, Jan 26, 2015 at 05:24:55PM +0100, Guillermo Rodriguez Garcia wrote: Hello all, I am using the ntpd applet in busybox but also wanted to enable the ntpdate program (yes I know use of ntpdate is not recommended in general but this is for a very specific use case). However I see that ntpdate is part of the ntp package and that the ntp package is blocked by BUSYBOX_NTPD. From rules/ntp.in: menuconfig NTP tristate prompt ntp select OPENSSL if NTP_CRYPTO select ROOTFS_VAR_CACHE if NTP_NTPD select LIBC_M select LIBC_RT select GCCLIBS_GCC_S select LIBMD depends on !BUSYBOX_NTPD || ALLYES [...] config NTP_NTPDATE bool prompt install ntpdate depends on NTP Obviously one would not want to run two ntp services at the same time, but since busybox lacks an ntpdate command, there are cases where one would want to use ntpdate from the NTP package while still using Busybox's ntpd for everything else. My question is: Is there any reason why this wouldn't work? Was the depends on !BUSYBOX_NTPD line added just to avoid the possibility of the two ntp services running at the same time? Or is it there to guard from other possible problems/issues? We usually add those lines only to prevent two packages from installing the same file. In this case we have the !BUSYBOX_NTPD check twice, once for the package and once for ntpd. This is clearly wrong. I don't see a reason why the check for the packages is needed and I don't remember why I added it. I suggest you remove the check (and the comment at the end of the file) and see what happens. 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 06/10] collectd: add base functionality
On Sun, Jan 25, 2015 at 01:37:22AM +0100, Robert Schwebel wrote: This adds collectd, without any further plugin support so far. Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- generic/etc/collectd.conf | 46 +++ generic/lib/systemd/system/collectd.service | 15 +++ rules/collectd.in | 10 ++ rules/collectd.make | 202 4 files changed, 273 insertions(+) create mode 100644 generic/etc/collectd.conf create mode 100644 generic/lib/systemd/system/collectd.service create mode 100644 rules/collectd.in create mode 100644 rules/collectd.make diff --git a/generic/etc/collectd.conf b/generic/etc/collectd.conf new file mode 100644 index 000..400ff6d --- /dev/null +++ b/generic/etc/collectd.conf @@ -0,0 +1,46 @@ +# +# Config file for collectd(1). +# Please read collectd.conf(5) for a list of options. +# http://collectd.org/ +# + +## +# Global # +## +# Global settings for the daemon. # +## + +Hostnamelocalhost +FQDNLookup true +BaseDir /var/lib/collectd +PIDFile /var/run/collectd.pid +PluginDir /usr/lib/collectd +TypesDB /usr/share/collectd/types.db + +## +# When enabled, plugins are loaded automatically with the default options # +# when an appropriate Plugin ... block is encountered. # +# Disabled by default. # +## +AutoLoadPlugin false + +## +# Interval at which to query values. This may be overwritten on a per-plugin # +# base by using the 'Interval' option of the LoadPlugin block: # +# LoadPlugin foo # +# Interval 60 # +# /LoadPlugin # +## +Interval 10 + +Timeout 2 +ReadThreads 2 +WriteThreads 2 + +# Limit the size of the write queue. Default is no limit. Setting up a limit is +# recommended for servers handling a high volume of traffic. +#WriteQueueLimitHigh 100 +#WriteQueueLimitLow 80 + +Include /etc/collectd.d/*.conf + diff --git a/generic/lib/systemd/system/collectd.service b/generic/lib/systemd/system/collectd.service new file mode 100644 index 000..53eb5db --- /dev/null +++ b/generic/lib/systemd/system/collectd.service @@ -0,0 +1,15 @@ +[Unit] +Description=statistics collection daemon +Documentation=man:collectd(1) +After=local-fs.target network.target +Requires=local-fs.target network.target + +[Service] +ExecStart=/usr/sbin/collectd -C /etc/collectd.conf -f +Restart=always +RestartSec=10 +StandardOutput=syslog +StandardError=syslog + +[Install] +WantedBy=multi-user.target This is just a copy from the shipped file, right? Just install it manually in the install stage and then use install_copy in targetinstall. diff --git a/rules/collectd.in b/rules/collectd.in new file mode 100644 index 000..c5a29d0 --- /dev/null +++ b/rules/collectd.in @@ -0,0 +1,10 @@ +## SECTION=shell_and_console + +menuconfig COLLECTD + tristate + prompt collectd + help + collectd is a daemon which collects system performance statistics + periodically and provides mechanisms to store the values in a + variety of ways, for example in RRD files. + diff --git a/rules/collectd.make b/rules/collectd.make new file mode 100644 index 000..e2268ae --- /dev/null +++ b/rules/collectd.make @@ -0,0 +1,202 @@ +# -*-makefile-*- +# +# Copyright (C) 2014 by Markus Pargmann m...@pengutronix.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_COLLECTD) += collectd + +# +# Paths and names +# +COLLECTD_VERSION := 5.4.1 +COLLECTD := collectd-$(COLLECTD_VERSION) +COLLECTD_SUFFIX := tar.bz2 +COLLECTD_URL := http://collectd.org/files/${COLLECTD}.${COLLECTD_SUFFIX} +COLLECTD_MD5 := 6f56c71c96573a7f4f7fb3bfab185974 +COLLECTD_DIR :=
Re: [ptxdist] [PATCHv2 06/10] collectd: add base functionality
On Mon, Jan 26, 2015 at 11:13:08PM +0100, Robert Schwebel wrote: This adds collectd, without any further plugin support so far. Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- Changes since v1: * use modern enable/disable method, similar to gstreamer generic/etc/collectd.conf | 46 ++ generic/lib/systemd/system/collectd.service | 15 ++ rules/collectd.in | 10 ++ rules/collectd.make | 216 4 files changed, 287 insertions(+) create mode 100644 generic/etc/collectd.conf create mode 100644 generic/lib/systemd/system/collectd.service create mode 100644 rules/collectd.in create mode 100644 rules/collectd.make diff --git a/generic/etc/collectd.conf b/generic/etc/collectd.conf new file mode 100644 index 000..400ff6d --- /dev/null +++ b/generic/etc/collectd.conf @@ -0,0 +1,46 @@ +# +# Config file for collectd(1). +# Please read collectd.conf(5) for a list of options. +# http://collectd.org/ +# + +## +# Global # +## +# Global settings for the daemon. # +## + +Hostnamelocalhost +FQDNLookup true +BaseDir /var/lib/collectd +PIDFile /var/run/collectd.pid +PluginDir /usr/lib/collectd +TypesDB /usr/share/collectd/types.db + +## +# When enabled, plugins are loaded automatically with the default options # +# when an appropriate Plugin ... block is encountered. # +# Disabled by default. # +## +AutoLoadPlugin false + +## +# Interval at which to query values. This may be overwritten on a per-plugin # +# base by using the 'Interval' option of the LoadPlugin block: # +# LoadPlugin foo # +# Interval 60 # +# /LoadPlugin # +## +Interval 10 + +Timeout 2 +ReadThreads 2 +WriteThreads 2 + +# Limit the size of the write queue. Default is no limit. Setting up a limit is +# recommended for servers handling a high volume of traffic. +#WriteQueueLimitHigh 100 +#WriteQueueLimitLow 80 + +Include /etc/collectd.d/*.conf + diff --git a/generic/lib/systemd/system/collectd.service b/generic/lib/systemd/system/collectd.service new file mode 100644 index 000..53eb5db --- /dev/null +++ b/generic/lib/systemd/system/collectd.service @@ -0,0 +1,15 @@ +[Unit] +Description=statistics collection daemon +Documentation=man:collectd(1) +After=local-fs.target network.target +Requires=local-fs.target network.target + +[Service] +ExecStart=/usr/sbin/collectd -C /etc/collectd.conf -f +Restart=always +RestartSec=10 +StandardOutput=syslog +StandardError=syslog + +[Install] +WantedBy=multi-user.target diff --git a/rules/collectd.in b/rules/collectd.in new file mode 100644 index 000..c5a29d0 --- /dev/null +++ b/rules/collectd.in @@ -0,0 +1,10 @@ +## SECTION=shell_and_console + +menuconfig COLLECTD + tristate + prompt collectd + help + collectd is a daemon which collects system performance statistics + periodically and provides mechanisms to store the values in a + variety of ways, for example in RRD files. + diff --git a/rules/collectd.make b/rules/collectd.make new file mode 100644 index 000..5ee4e7c --- /dev/null +++ b/rules/collectd.make @@ -0,0 +1,216 @@ +# -*-makefile-*- +# +# Copyright (C) 2014 by Markus Pargmann m...@pengutronix.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_COLLECTD) += collectd + +# +# Paths and names +# +COLLECTD_VERSION := 5.4.1 +COLLECTD := collectd-$(COLLECTD_VERSION) +COLLECTD_SUFFIX := tar.bz2 +COLLECTD_URL := http://collectd.org/files/${COLLECTD}.${COLLECTD_SUFFIX} +COLLECTD_MD5 := 6f56c71c96573a7f4f7fb3bfab185974 +COLLECTD_DIR := $(BUILDDIR)/$(COLLECTD) +COLLECTD_SOURCE :=
Re: [ptxdist] [PATCHv2 1/4] liblzo: rework and version bump
On Sun, Jan 25, 2015 at 08:56:21PM +0100, Alexander Aring wrote: This patch removes the menuentries to generate a static or shared library. Instead we do default a shared library now. Additional we do slightly a version bump to 2.08 liblzo version. Signed-off-by: Alexander Aring alex.ar...@gmail.com Thanks, applied. Michael --- rules/liblzo.in | 18 -- rules/liblzo.make | 11 +-- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/rules/liblzo.in b/rules/liblzo.in index 62c74c7..d416b59 100644 --- a/rules/liblzo.in +++ b/rules/liblzo.in @@ -9,21 +9,3 @@ menuconfig LIBLZO Compiles the LZO compression libraries on your target system. See http://www.oberhumer.com/opensource/lzo/ for info about it. - -if LIBLZO - -config LIBLZO_SHARED - bool - default y - prompt Create shared library - help - Create a shared library and install it into /usr/lib - -config LIBLZO_STATIC - bool - prompt Create static link library - help - Create a static link library and install it into /usr/lib. - Normally not needed. - -endif diff --git a/rules/liblzo.make b/rules/liblzo.make index 2bcb25f..dcb4c9e 100644 --- a/rules/liblzo.make +++ b/rules/liblzo.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBLZO) += liblzo # # Paths and names # -LIBLZO_VERSION := 2.03 -LIBLZO_MD5 := 0c3d078c2e8ea5a88971089a2f02a726 +LIBLZO_VERSION := 2.08 +LIBLZO_MD5 := fcec64c26a0f4f4901468f360029678f LIBLZO := lzo-$(LIBLZO_VERSION) LIBLZO_SUFFIX:= tar.gz LIBLZO_URL := http://www.oberhumer.com/opensource/lzo/download/$(LIBLZO).$(LIBLZO_SUFFIX) @@ -38,8 +38,8 @@ LIBLZO_ENV := $(CROSS_ENV) # LIBLZO_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --$(call ptx/endis, PTXCONF_LIBLZO_SHARED)-shared \ - --$(call ptx/endis, PTXCONF_LIBLZO_STATIC)-static + --enable-shared \ + --disable-static # # Target-Install @@ -54,9 +54,8 @@ $(STATEDIR)/liblzo.targetinstall: @$(call install_fixup, liblzo,AUTHOR,Carsten Schlote c.schl...@konzeptpark.de) @$(call install_fixup, liblzo,DESCRIPTION,missing) -ifdef PTXCONF_LIBLZO_SHARED @$(call install_lib, liblzo, 0, 0, 0644, liblzo2) -endif + @$(call install_finish, liblzo) @$(call touch) -- 2.2.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 v2] nano: Fix a typo
On Mon, Jan 26, 2015 at 08:37:57PM +0100, André Hentschel wrote: Signed-off-by: André Hentschel n...@dawncrow.de --- v2: fixed the mail mangling (at least i hope so) It works now. Thanks, applied. Michael rules/nano.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/nano.make b/rules/nano.make index 4dc2551..94f4435 100644 --- a/rules/nano.make +++ b/rules/nano.make @@ -32,7 +32,7 @@ NANO_DIR:= $(BUILDDIR)/$(NANO) # # autoconf # -NAN_CONF_TOOL:= autoconf +NANO_CONF_TOOL := autoconf NANO_CONF_OPT:= \ $(CROSS_AUTOCONF_USR) \ $(GLOBAL_LARGE_FILE_OPTION) \ -- 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] wpan-tools: version bump 0.3 - 0.4
On Sun, Jan 25, 2015 at 09:02:53PM +0100, Alexander Aring wrote: Signed-off-by: Alexander Aring alex.ar...@gmail.com Thanks, applied. Michael --- rules/wpan-tools.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/wpan-tools.make b/rules/wpan-tools.make index 2dc27d7..480d151 100644 --- a/rules/wpan-tools.make +++ b/rules/wpan-tools.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_WPAN_TOOLS) += wpan-tools # # Paths and names # -WPAN_TOOLS_VERSION := 0.3 -WPAN_TOOLS_MD5 := 7b79a68b4529f6f3913f9e2ae19edb65 +WPAN_TOOLS_VERSION := 0.4 +WPAN_TOOLS_MD5 := 7dec36cec484cf4cbfb717536bd7aa83 WPAN_TOOLS := wpan-tools-$(WPAN_TOOLS_VERSION) WPAN_TOOLS_SUFFIX:= tar.gz WPAN_TOOLS_URL := http://wpan.cakelab.org/releases/$(WPAN_TOOLS).$(WPAN_TOOLS_SUFFIX) -- 2.2.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 06/10] collectd: add base functionality
Hi, This is just a copy from the shipped file, right? Just install it manually in the install stage and then use install_copy in targetinstall. It's modified to use the standard location for the config file. In that case, we should clean it up: On Tue, Jan 27, 2015 at 11:01:59AM +0100, Robert Schwebel wrote: On Tue, Jan 27, 2015 at 08:31:42AM +0100, Michael Olbrich wrote: diff --git a/generic/lib/systemd/system/collectd.service b/generic/lib/systemd/system/collectd.service new file mode 100644 index 000..53eb5db --- /dev/null +++ b/generic/lib/systemd/system/collectd.service @@ -0,0 +1,15 @@ +[Unit] +Description=statistics collection daemon +Documentation=man:collectd(1) +After=local-fs.target network.target +Requires=local-fs.target network.target local-fs.target is already the default, so that can be dropped. network.target is rarely what you want. What kind of network requirements does collectd have? + +[Service] +ExecStart=/usr/sbin/collectd -C /etc/collectd.conf -f drop the config file, it it's the default. +Restart=always +RestartSec=10 I don't see a reason to wait 10 seconds. The default should be ok. +StandardOutput=syslog +StandardError=syslog syslog will just be forwarded to the journal, so this can be dropped. Michael + +[Install] +WantedBy=multi-user.target -- 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 bluetooth-next 4/4] openvpn: rework and version bump
On Sat, Dec 27, 2014 at 06:38:55PM +0100, Alexander Aring wrote: This patch reworks the openvpn rules. Some points which are new now: - systemd support if OPENVPN_SYSTEMD - install openvpn sample configs as reference for /etc/openvpn/ - install openvpn sample scripts (ethernet bridging) - add required environemnt for networking utilities while configure - add several missed autoconf configure options Additional this patch do a version bump to 2.3.6 Signed-off-by: Alexander Aring alex.ar...@gmail.com --- rules/openvpn.in | 26 rules/openvpn.make | 59 +++--- 2 files changed, 73 insertions(+), 12 deletions(-) diff --git a/rules/openvpn.in b/rules/openvpn.in index 3649968..d68dc7a 100644 --- a/rules/openvpn.in +++ b/rules/openvpn.in @@ -5,6 +5,10 @@ menuconfig OPENVPN prompt openvpn select OPENSSL select LIBLZO if OPENVPN_LZO + depends on IPROUTE2_IP || BUSYBOX_IP + depends on BUSYBOX_IFCONFIG + depends on BUSYBOX_NETSTAT + depends on BUSYBOX_ROUTE no 'depends' here: select IPROUTE2 if !BUSYBOX_IP RUNTIME select IPROUTE2_IP if !BUSYBOX_IP RUNTIME select BUSYBOX_IFCONFIG [...] I think. Michael help virtual private network daemon @@ -34,4 +38,26 @@ config OPENVPN_LZO will select the LZO library as well. If unsure, say N. +config OPENVPN_SYSTEMD + bool + prompt Enable systemd support + depends on SYSTEMD + help + This enables systemd support for openvpn. + +config OPENVPN_INSTALL_SAMPLE_CONFIGS + bool + prompt Install sample configs + select IPTABLES + select IPTABLES_INSTALL_TOOLS + help + Install sample configs into /usr/share/openvpn/sample-config-files. + +config OPENVPN_INSTALL_SAMPLE_SCRIPTS + bool + prompt Install sample scripts + select BRIDGE_UTILS + help + Install sample scripts into /usr/share/openvpn/sample-scripts. + endif diff --git a/rules/openvpn.make b/rules/openvpn.make index d288d43..7cfa427 100644 --- a/rules/openvpn.make +++ b/rules/openvpn.make @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_OPENVPN) += openvpn # # Paths and names # -OPENVPN_VERSION := 2.1.1 -OPENVPN_MD5 := b273ed2b5ec8616fb9834cde8634bce7 +OPENVPN_VERSION := 2.3.6 +OPENVPN_MD5 := 6ca03fe0fd093e0d01601abee808835c OPENVPN := openvpn-$(OPENVPN_VERSION) OPENVPN_SUFFIX := tar.gz -OPENVPN_URL := http://openvpn.net/release/$(OPENVPN).$(OPENVPN_SUFFIX) +OPENVPN_URL := http://swupdate.openvpn.org/community/releases/$(OPENVPN).$(OPENVPN_SUFFIX) OPENVPN_SOURCE := $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX) OPENVPN_DIR := $(BUILDDIR)/$(OPENVPN) @@ -29,18 +29,36 @@ OPENVPN_DIR := $(BUILDDIR)/$(OPENVPN) # OPENVPN_PATH := PATH=$(CROSS_PATH) -OPENVPN_ENV := $(CROSS_ENV) +OPENVPN_ENV := \ + $(CROSS_ENV) \ + IFCONFIG=/sbin/ifconfig \ + ROUTE=/sbin/route \ + IPROUTE=/sbin/ip \ + NETSTAT=/bin/netstat # # autoconf # -OPENVPN_AUTOCONF := $(CROSS_AUTOCONF_USR) +OPENVPN_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + --$(call ptx/endis, PTXCONF_OPENVPN_LZO)-lzo \ + --disable-plugins \ + --disable-debug \ + --enable-small \ + --disable-iproute2 \ + --disable-selinux \ + --$(call ptx/endis, PTXCONF_OPENVPN_SYSTEMD)-systemd \ + --with-crypto-library=openssl -ifdef PTXCONF_OPENVPN_LZO -OPENVPN_AUTOCONF += --enable-lzo -else -OPENVPN_AUTOCONF += --disable-lzo -endif +OPENVPN_INSTALL_SAMPLE_CONFIG_FILES := \ + client.conf loopback-client loopback-server README server.conf \ + static-home.conf static-office.conf tls-home.conf tls-office.conf \ + xinetd-client-config xinetd-server-config + +OPENVPN_INSTALL_SAMPLE_CONFIG_SCRIPTS := \ + firewall.sh home.up office.up openvpn-shutdown.sh openvpn-startup.sh + +OPENVPN_INSTALL_SAMPLE_SCRIPTS := bridge-start bridge-stop # # Target-Install @@ -55,9 +73,26 @@ $(STATEDIR)/openvpn.targetinstall: @$(call install_fixup, openvpn,AUTHOR,Carsten Schlote c.schl...@konzeptpark.de) @$(call install_fixup, openvpn,DESCRIPTION,missing) - @$(call install_copy, openvpn, 0, 0, 0755, -, /usr/sbin/openvpn) +ifdef PTXCONF_OPENVPN_INSTALL_SAMPLE_CONFIGS + @$(foreach file,$(OPENVPN_INSTALL_SAMPLE_CONFIG_FILES), \ + $(call install_copy, openvpn, 0, 0, 0644, \ + $(OPENVPN_DIR)/sample/sample-config-files/$(file), \ + /usr/share/openvpn/sample-config-files/$(file));) - @$(call install_copy,
Re: [ptxdist] [oracle java7 jre 1/1] Added Oracles Java 7 JRE
On Thu, Jan 08, 2015 at 01:36:19PM +0100, Martin Hejnfelt wrote: Hi Michael, 2015-01-08 12:58 GMT+01:00 Michael Olbrich m.olbr...@pengutronix.de: Any reason to use java7 and not java8? Only reason is that I am developing for Java 7, and want to keep the compatibility (or at least not introduce any issues, simply for versioning). In my opinion, you should have both if anything. +config ORACLE_JAVA7_JRE_TARGET_PREFIX + string + depends on ORACLE_JAVA7_JRE + default /usr/lib/jvm + prompt PREFIX for JRE 7 + help + Where should the JRE be installed. Do we need this? I think we can just hardcode this path. I agree, I'll change that. + +# +# Get +# + +$(ORACLE_JAVA7_JRE_SOURCE): + @$(call targetinfo) + wget --no-cookies --header Cookie: oraclelicense=accept-securebackup-cookie $(ORACLE_JAVA7_JRE_URL) -P $(SRCDIR)/ No, this is more complex. I need to think about how to handle this correctly. Yes it's more complex, but right now it's the only way I know to download it automatically. Suggestions to change are welcome :) Should I put up a new patch with the changes mentioned here, and the rest? Just send it and I'll fix the download part once I know how I want to handle this. 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 bluetooth-next 2/4] openssl: allow to install openssl.cnf
On Sat, Dec 27, 2014 at 06:38:53PM +0100, Alexander Aring wrote: For doing some certificates magic the openssl tool requires some openssl.cnf files. This patch adds an option to install the default one. Signed-off-by: Alexander Aring alex.ar...@gmail.com --- rules/openssl.in | 5 + rules/openssl.make | 6 ++ 2 files changed, 11 insertions(+) diff --git a/rules/openssl.in b/rules/openssl.in index 096b398..d1c085d 100644 --- a/rules/openssl.in +++ b/rules/openssl.in @@ -28,4 +28,9 @@ config OPENSSL_BIN help Whether to build and install OpenSSL binary. +config OPENSSL_CNF + bool install openssl.cnf + help + Install openssl.cnf config file. + endif diff --git a/rules/openssl.make b/rules/openssl.make index 56cd6b7..ec32fe5 100644 --- a/rules/openssl.make +++ b/rules/openssl.make @@ -100,6 +100,12 @@ ifdef PTXCONF_OPENSSL_BIN @$(call install_copy, openssl, 0, 0, 0755, -, \ /usr/bin/openssl) endif + +ifdef PTXCONF_OPENSSL_CNF + @$(call install_copy, openssl, 0, 0, 0644, -, \ + /usr/lib/ssl/openssl.cnf) +endif I think we should always install this, unless there is a good reason to make this optional? Michael + @$(call install_lib, openssl, 0, 0, 0644, libssl) @$(call install_lib, openssl, 0, 0, 0644, libcrypto) -- 2.2.0 -- 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] New package: libzip
On Fri, Dec 12, 2014 at 05:00:36PM +0100, grodriguez wrote: Your Signed-off-by: is missing --- rules/libzip.in | 12 + rules/libzip.make | 67 + 2 files changed, 79 insertions(+), 0 deletions(-) create mode 100644 rules/libzip.in create mode 100644 rules/libzip.make diff --git a/rules/libzip.in b/rules/libzip.in new file mode 100644 index 000..b871e10 --- /dev/null +++ b/rules/libzip.in @@ -0,0 +1,12 @@ +## SECTION=system_libraries + +config LIBZIP + tristate + prompt libzip + select ZLIB + help + libzip is a C library for reading, creating, and modifying + zip archives. Files can be added from data buffers, files, + or compressed data copied directly from other zip archives. + Changes made without closing the archive can be reverted. + diff --git a/rules/libzip.make b/rules/libzip.make new file mode 100644 index 000..e7596b7 --- /dev/null +++ b/rules/libzip.make @@ -0,0 +1,67 @@ +# -*-makefile-*- +# +# Copyright (C) 2014 by Guillermo Rodriguez guille.rodrig...@gmail.com +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_LIBZIP) += libzip + +# +# Paths and names +# +LIBZIP_VERSION := 0.11.2 +LIBZIP_MD5 := c5437df15e4825d40cdc3ec8b9b7516c +LIBZIP := libzip-$(LIBZIP_VERSION) +LIBZIP_SUFFIX:= tar.gz +LIBZIP_URL := http://www.nih.at/libzip/$(LIBZIP).$(LIBZIP_SUFFIX) +LIBZIP_SOURCE:= $(SRCDIR)/$(LIBZIP).$(LIBZIP_SUFFIX) +LIBZIP_DIR := $(BUILDDIR)/$(LIBZIP) +LIBZIP_LICENSE := BSD + +# +# Prepare +# + +LIBZIP_CONF_ENV := $(CROSS_ENV) drop this line + +LIBZIP_CONF_TOOL := autoconf +LIBZIP_CONF_OPT := $(CROSS_AUTOCONF_USR) LIBZIP_CONF_TOOL:= autoconf LIBZIP_CONF_OPT := \ $(CROSS_AUTOCONF_USR)·\ $(GLOBAL_LARGE_FILE_OPTION) Michael + +# +# Install +# + +$(STATEDIR)/libzip.install.pack: + @$(call targetinfo) + @$(call world/install.pack, LIBZIP) + @sed -i -e 's,libincludedir=/usr/lib,libincludedir=$${libdir},g' \ + '$(LIBZIP_PKGDIR)/usr/lib/pkgconfig/libzip.pc' + @$(call touch) + +# +# Target-Install +# + +$(STATEDIR)/libzip.targetinstall: + @$(call targetinfo) + + @$(call install_init, libzip) + @$(call install_fixup, libzip, PRIORITY, optional) + @$(call install_fixup, libzip, SECTION, base) + @$(call install_fixup, libzip, AUTHOR, Guillermo Rodriguez guille.rodrig...@gmail.com) + @$(call install_fixup, libzip, DESCRIPTION, missing) + + @$(call install_lib, libzip, 0, 0, 0644, libzip) + + @$(call install_finish, libzip) + + @$(call touch) + +# vim: syntax=make -- 1.7.0.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] [oracle java7 jre 1/1] Added Oracles Java 7 JRE
On Mon, Jan 12, 2015 at 03:51:52PM +0100, Michael Olbrich wrote: On Thu, Jan 08, 2015 at 01:36:19PM +0100, Martin Hejnfelt wrote: 2015-01-08 12:58 GMT+01:00 Michael Olbrich m.olbr...@pengutronix.de: Any reason to use java7 and not java8? Only reason is that I am developing for Java 7, and want to keep the compatibility (or at least not introduce any issues, simply for versioning). In my opinion, you should have both if anything. +config ORACLE_JAVA7_JRE_TARGET_PREFIX + string + depends on ORACLE_JAVA7_JRE + default /usr/lib/jvm + prompt PREFIX for JRE 7 + help + Where should the JRE be installed. Do we need this? I think we can just hardcode this path. I agree, I'll change that. + +# +# Get +# + +$(ORACLE_JAVA7_JRE_SOURCE): + @$(call targetinfo) + wget --no-cookies --header Cookie: oraclelicense=accept-securebackup-cookie $(ORACLE_JAVA7_JRE_URL) -P $(SRCDIR)/ No, this is more complex. I need to think about how to handle this correctly. Yes it's more complex, but right now it's the only way I know to download it automatically. Suggestions to change are welcome :) Should I put up a new patch with the changes mentioned here, and the rest? Just send it and I'll fix the download part once I know how I want to handle this. I've pushed a change to handle this via the URL. Use: ORACLE_JAVA7_JRE_URL:= http://download.oracle.com/otn-pub/java/jdk/$(ORACLE_JAVA7_JRE_VERSION)-b01/$(ORACLE_JAVA7_JRE).$(ORACLE_JAVA7_JRE_SUFFIX);cookie:oraclelicense=accept-securebackup-cookie 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] php5: version bump 5.4.33 - 5.4.35
On Fri, Dec 05, 2014 at 04:03:23PM +0100, Bruno Thomsen wrote: Multiple bugs were fixed including security vulnerabilities CVE-2014-3710, CVE-2014-3669, CVE-2014-3670, CVE-2014-3668. Thanks, applied. Michael Signed-off-by: Bruno Thomsen b...@kamstrup.dk --- rules/php5.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/php5.make b/rules/php5.make index aef503b..c3f0168 100644 --- a/rules/php5.make +++ b/rules/php5.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_PHP5) += php5 # # Paths and names # -PHP5_VERSION := 5.4.33 -PHP5_MD5 := c6878bb1cdb46bfc1e1a5cd67a024737 +PHP5_VERSION := 5.4.35 +PHP5_MD5 := 489cc8336488fb2e722ffa3c08f9c864 PHP5 := php-$(PHP5_VERSION) PHP5_SUFFIX := tar.bz2 PHP5_SOURCE := $(SRCDIR)/$(PHP5).$(PHP5_SUFFIX) -- 1.9.1 -- 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 1/2] strongswan: added openssl plugin option
On Fri, Dec 12, 2014 at 01:21:03PM +0100, Bruno Thomsen wrote: OpenSSL adds Elliptic Curve support in IKE Diffie-Hellman key exchange. Thanks, both applied. Michael Signed-off-by: Bruno Thomsen b...@kamstrup.dk --- rules/strongswan.in | 8 rules/strongswan.make | 5 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/rules/strongswan.in b/rules/strongswan.in index 5402ffb..d50ea8d 100644 --- a/rules/strongswan.in +++ b/rules/strongswan.in @@ -5,6 +5,7 @@ menuconfig STRONGSWAN prompt strongswan select LIBGMP select LIBCURL if STRONGSWAN_LIBCURL + select OPENSSL if STRONGSWAN_OPENSSL help strongSwan is a complete IPsec implementation. Please keep in mind to configure the kernel accordingly to fulfill @@ -22,6 +23,13 @@ config STRONGSWAN_LIBCURL (CRLs) from an HTTP server or as an alternative want to use the Online Certificate Status Protocol (OCSP) say yes. +config STRONGSWAN_OPENSSL + bool + default n + prompt OpenSSL crypto library for IKE + help + This will add Elliptic Curve support in IKE Diffie-Hellman key exchange. + config STRONGSWAN_AFALG bool default y diff --git a/rules/strongswan.make b/rules/strongswan.make index 57fc7da..df4f9c8 100644 --- a/rules/strongswan.make +++ b/rules/strongswan.make @@ -34,6 +34,7 @@ STRONGSWAN_CONF_TOOL:= autoconf STRONGSWAN_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --$(call ptx/endis, PTXCONF_STRONGSWAN_LIBCURL)-curl \ + --$(call ptx/endis, PTXCONF_STRONGSWAN_OPENSSL)-openssl \ --disable-unbound \ --disable-soup \ --disable-ldap \ @@ -150,7 +151,6 @@ STRONGSWAN_CONF_OPT := \ --disable-osx-attr \ --enable-resolve \ --disable-padlock \ - --disable-openssl \ --disable-gcrypt \ --disable-agent \ --disable-pkcs11 \ @@ -228,6 +228,9 @@ STRONGSWAN_PLUGINS := \ ifdef PTXCONF_STRONGSWAN_LIBCURL STRONGSWAN_PLUGINS += libstrongswan-curl.so endif +ifdef PTXCONF_STRONGSWAN_OPENSSL + STRONGSWAN_PLUGINS += libstrongswan-openssl.so +endif ifdef PTXCONF_STRONGSWAN_AFALG STRONGSWAN_PLUGINS += libstrongswan-af-alg.so endif -- 1.9.1 -- 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 1/4] python: prepare version bump
On Sun, Dec 14, 2014 at 10:42:07AM +0100, Robert Schwebel wrote: Copy old patches in preparation of version bump. Thanks, all applied. Michael Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- ...-for-socketcan-to-the-python-socket-modul.patch | 224 + ...K_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch | 37 ..._LONG_DOUBLE-to-detect-long-double-suppor.patch | 35 patches/Python-2.7.9/0004-use-PGEN_FOR_BUILD.patch | 32 +++ ...n-t-leak-host-path-into-cross-compilation.patch | 40 .../0006-add-cross-compilation-support.patch | 61 ++ .../0007-python-don-t-add-rpaths-in-setup.py.patch | 31 +++ .../Python-2.7.9/0008-add-more-search-paths.patch | 28 +++ ...sting-LD_LIBRARY_PATH-during-make-not-dur.patch | 25 +++ patches/Python-2.7.9/autogen.sh| 14 ++ patches/Python-2.7.9/series| 12 ++ 11 files changed, 539 insertions(+) create mode 100644 patches/Python-2.7.9/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch create mode 100644 patches/Python-2.7.9/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch create mode 100644 patches/Python-2.7.9/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch create mode 100644 patches/Python-2.7.9/0004-use-PGEN_FOR_BUILD.patch create mode 100644 patches/Python-2.7.9/0005-setup.py-don-t-leak-host-path-into-cross-compilation.patch create mode 100644 patches/Python-2.7.9/0006-add-cross-compilation-support.patch create mode 100644 patches/Python-2.7.9/0007-python-don-t-add-rpaths-in-setup.py.patch create mode 100644 patches/Python-2.7.9/0008-add-more-search-paths.patch create mode 100644 patches/Python-2.7.9/0009-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch create mode 100755 patches/Python-2.7.9/autogen.sh create mode 100644 patches/Python-2.7.9/series diff --git a/patches/Python-2.7.9/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch b/patches/Python-2.7.9/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch new file mode 100644 index 000..360df3e --- /dev/null +++ b/patches/Python-2.7.9/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch @@ -0,0 +1,224 @@ +From: Michael Olbrich m.olbr...@pengutronix.de +Date: Tue, 5 May 2009 15:17:20 +0200 +Subject: [PATCH] Add support for socketcan to the python socket module + +This patch add support for the protocol family AF_CAN. It contains all the +necessary code to use the python socket module for socketcan. + +Signed-off-by: Michael Olbrich m.olbr...@pengutronix.de +Signed-off-by: Marc Kleine-Budde m...@pengutronix.de +--- + Lib/plat-linux2/IN.py | 2 ++ + Modules/socketmodule.c | 89 ++ + Modules/socketmodule.h | 11 +++ + configure.ac | 13 + 4 files changed, 115 insertions(+) + +diff --git a/Lib/plat-linux2/IN.py b/Lib/plat-linux2/IN.py +index ad307f6..f72ae88 100644 +--- a/Lib/plat-linux2/IN.py b/Lib/plat-linux2/IN.py +@@ -384,6 +384,7 @@ PF_SNA = 22 + PF_IRDA = 23 + PF_PPPOX = 24 + PF_WANPIPE = 25 ++PF_CAN = 29 + PF_BLUETOOTH = 31 + PF_MAX = 32 + AF_UNSPEC = PF_UNSPEC +@@ -414,6 +415,7 @@ AF_SNA = PF_SNA + AF_IRDA = PF_IRDA + AF_PPPOX = PF_PPPOX + AF_WANPIPE = PF_WANPIPE ++AF_CAN = PF_CAN + AF_BLUETOOTH = PF_BLUETOOTH + AF_MAX = PF_MAX + SOL_RAW = 255 +diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c +index bdc055d..066221a 100644 +--- a/Modules/socketmodule.c b/Modules/socketmodule.c +@@ -420,6 +420,10 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size); + + #define SAS2SA(x) ((struct sockaddr *)(x)) + ++#ifdef ENABLE_CAN ++#include linux/can/raw.h ++#endif ++ + /* + * Constants for getnameinfo() + */ +@@ -1097,6 +1101,22 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto) + } + #endif + ++#ifdef ENABLE_CAN ++case AF_CAN: ++{ ++struct sockaddr_can *a = (struct sockaddr_can *)addr; ++char *ifname = ; ++struct ifreq ifr; ++/* need to look up interface name give index */ ++if (a-can_ifindex) { ++ifr.ifr_ifindex = a-can_ifindex; ++if (ioctl(sockfd, SIOCGIFNAME, ifr) == 0) ++ifname = ifr.ifr_name; ++} ++return Py_BuildValue(s, ifname); ++} ++#endif ++ + #ifdef USE_BLUETOOTH + case AF_BLUETOOTH: + switch (proto) { +@@ -1383,6 +1403,28 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, + } + #endif + ++#ifdef ENABLE_CAN ++case AF_CAN: ++{ ++struct sockaddr_can* addr; ++struct ifreq ifr; ++char *interfaceName; ++addr = (struct sockaddr_can*)addr_ret; ++if (!PyArg_Parse(args, s, interfaceName)) ++return 0; ++strncpy
Re: [ptxdist] splashutils fails to build
On Fri, Jan 09, 2015 at 02:30:03PM +0100, Martin Hejnfelt wrote: 2015-01-08 7:46 GMT+01:00 Martin Hejnfelt m...@newtec.dk: After upgrading to OSELAS-Toolchain-2014.12.0, using gcc-4.9.2-glibc-2.20-binutils-2.24-kernel-3.16 for i686-atom-linux-gnu, suddenly splashutils (of ptxdist-2014.12.0) does not build anymore. It fails with this: CC fbsplashctl-util.o CC fbsplashctl-fbsplashctl.o CCLD fbsplashctl /opt/OSELAS.Toolchain-2014.12.0/i686-atom-linux-gnu/gcc-4.9.2-glibc-2.20-binutils-2.24-kernel-3.16-sanitized/lib/gcc/i686-atom-linux-gnu/4.9.2/../../../../i686-atom-linux-gnu/bin/ld: attempted static link of dynamic object `./.libs/libfbsplashrender.so' collect2: error: ld returned 1 exit status It worked with OSELAS-Toolchain-2013.12.2. so I guess this is an issue due to the upgraded compiler tools, however I am no autotools master, so I am struggling to iron out why it suddenly refers to the dynamic libfbsplashrender.so instead of the static libfbsplashrender.la one... Ok apparently something has changed somewhere so static libraries are not compiled by default (even though the configure options state them to be). Thus to get this compiling, I needed to explicitly set --enable-static in the .make file, and do the same for libpng and libjpeg (probably also for other libraries that might be needed depending on the configuration through menuconfig). Is this a change created by ptxdist, gcc or what? That's a change in PTXdist: We've added enable_static=no to the environment (rules/pre/Rules.make). This changes the default --disable-static for all configure scripts that have this option. 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] Can not build Casablanca-2.3.0 with arm-v5te-linux-gnueabi-gcc-4.8.2-glibc-2.18-binutils-2.24-kernel-3.12-sanitized
On Fri, Jan 09, 2015 at 03:55:54PM +0100, genieplus wrote: I am currently trying to build Casablanca [https://casablanca.codeplex.com/] for my ARM board using the toolchain gcc-4.8.2-glibc-2.18-binutils-2.24-kernel-3.12-sanitized (from OSELAS.Toolchain-2013.12.2) and ptxdist-2014.12.0. The compilation fails with a lot of errors related to the C++11 standard. For example: build-target/casablanca-2.3.0/tests/common/UnitTestpp/src/TestRunner.cpp:41:0: /opt/OSELAS.Toolchain-2013.12.2/arm-v5te-linux-gnueabi/gcc-4.8.2-glibc-2.18-binutils-2.24-kernel-3.12-sanitized/arm-v5te-linux-gnueabi/include/c++/4.8.2/future:113:11: error: declaration of 'class std::futurevoid' class future; I am able to build the same version of Casablanca on my x86 machine using gcc version 4.8.2 (Ubuntu 4.8.2.-19ubuntu1). Am I doing something wrong, or this version of arm-v5te-linux-gnueabi-gcc-4.8.2 do not have the same support of C++11 features as the desktop version? There should be noch difference. Maybe the gcc command-line is not set up correctly when cross-compiling. 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 v3] New package: fuse-zip
On Tue, Jan 13, 2015 at 05:04:39PM +0100, grodriguez wrote: v2: Added package description in .in file v3: Add patch to fix a missing header. More info: http://code.google.com/p/fuse-zip/issues/detail?id=44 Thanks, applied. Michael Signed-off-by: Guillermo Rodriguez guille.rodrig...@gmail.com --- patches/fuse-zip-0.4.0/Fix_missing_header.diff | 13 + patches/fuse-zip-0.4.0/series |1 + rules/fuse-zip.in | 17 +++ rules/fuse-zip.make| 58 4 files changed, 89 insertions(+), 0 deletions(-) create mode 100644 patches/fuse-zip-0.4.0/Fix_missing_header.diff create mode 100644 patches/fuse-zip-0.4.0/series create mode 100644 rules/fuse-zip.in create mode 100644 rules/fuse-zip.make diff --git a/patches/fuse-zip-0.4.0/Fix_missing_header.diff b/patches/fuse-zip-0.4.0/Fix_missing_header.diff new file mode 100644 index 000..39ccc92 --- /dev/null +++ b/patches/fuse-zip-0.4.0/Fix_missing_header.diff @@ -0,0 +1,13 @@ +Index: fuse-zip-0.4.0/lib/fileNode.cpp +=== +--- fuse-zip-0.4.0.orig/lib/fileNode.cpp 2014-01-14 17:55:27.0 +0100 fuse-zip-0.4.0/lib/fileNode.cpp 2014-12-10 18:33:42.524472368 +0100 +@@ -27,6 +27,8 @@ + #include stdexcept + #include syslog.h + #include cassert ++#define __STDC_LIMIT_MACROS ++#include stdint.h + + #include fileNode.h + #include extraField.h diff --git a/patches/fuse-zip-0.4.0/series b/patches/fuse-zip-0.4.0/series new file mode 100644 index 000..b460945 --- /dev/null +++ b/patches/fuse-zip-0.4.0/series @@ -0,0 +1 @@ +Fix_missing_header.diff diff --git a/rules/fuse-zip.in b/rules/fuse-zip.in new file mode 100644 index 000..f61df44 --- /dev/null +++ b/rules/fuse-zip.in @@ -0,0 +1,17 @@ +## SECTION=disk_and_file + +config FUSE_ZIP + tristate + prompt fuse-zip + select LIBZIP + select FUSE + select FUSE__LIB + help + fuse-zip is a FUSE file system to navigate, extract, create + and modify ZIP and ZIP64 archives based on libzip implemented + in C++. + + With fuse-zip you really can work with ZIP archives as real + directories. Unlike KIO or Gnome VFS, it can be used in any + application without modifications. + diff --git a/rules/fuse-zip.make b/rules/fuse-zip.make new file mode 100644 index 000..482fe18 --- /dev/null +++ b/rules/fuse-zip.make @@ -0,0 +1,58 @@ +# -*-makefile-*- +# +# Copyright (C) 2014 by Guillermo Rodriguez guille.rodrig...@gmail.com +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_FUSE_ZIP) += fuse-zip + +# +# Paths and names +# +FUSE_ZIP_VERSION := 0.4.0 +FUSE_ZIP_MD5 := da2d85c5b28ccd153c928f8030e3f729 +FUSE_ZIP := fuse-zip-$(FUSE_ZIP_VERSION) +FUSE_ZIP_SUFFIX := tar.gz +FUSE_ZIP_URL := http://fuse-zip.googlecode.com/files/$(FUSE_ZIP).$(FUSE_ZIP_SUFFIX) +FUSE_ZIP_SOURCE := $(SRCDIR)/$(FUSE_ZIP).$(FUSE_ZIP_SUFFIX) +FUSE_ZIP_DIR := $(BUILDDIR)/$(FUSE_ZIP) +FUSE_ZIP_LICENSE := LGPL + +# +# Prepare +# + +FUSE_ZIP_CONF_TOOL := NO +FUSE_ZIP_MAKE_ENV:= $(CROSS_ENV) + +# Makefile ignores DESTDIR +FUSE_ZIP_INSTALL_OPT := 'INSTALLPREFIX=$(FUSE_ZIP_PKGDIR)/usr' install + + +# +# Target-Install +# + +$(STATEDIR)/fuse-zip.targetinstall: + @$(call targetinfo) + + @$(call install_init, fuse-zip) + @$(call install_fixup, fuse-zip, PRIORITY,optional) + @$(call install_fixup, fuse-zip, SECTION,base) + @$(call install_fixup, fuse-zip, AUTHOR,Guillermo Rodriguez guille.rodrig...@gmail.com) + @$(call install_fixup, fuse-zip, DESCRIPTION,missing) + + @$(call install_copy, fuse-zip, 0, 0, 0755, -, /usr/bin/fuse-zip) + + @$(call install_finish, fuse-zip) + + @$(call touch) + +# vim: syntax=make -- 1.7.0.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] [oracle java7 jre 1/1] Added Oracles Java 7 JRE
On Mon, Jan 12, 2015 at 07:07:55PM +0100, Martin Hejnfelt wrote: Signed-off-by: Martin Hejnfelt m...@newtec.dk Thanks, applied. Michael --- :00 100644 000... d9c32c0... Arules/oracle-java7-jre.in :00 100644 000... ab8af1e... Arules/oracle-java7-jre.make rules/oracle-java7-jre.in | 10 ++ rules/oracle-java7-jre.make | 87 + 2 files changed, 97 insertions(+) diff --git a/rules/oracle-java7-jre.in b/rules/oracle-java7-jre.in new file mode 100644 index 000..d9c32c0 --- /dev/null +++ b/rules/oracle-java7-jre.in @@ -0,0 +1,10 @@ +## SECTION=bytecode_engines + +config ORACLE_JAVA7_JRE + bool + + prompt oracle java7 jre + help + Oracle[tm] Java Runtime Environment 7 + This downloads the binary distribution + and extracts into the target prefix. diff --git a/rules/oracle-java7-jre.make b/rules/oracle-java7-jre.make new file mode 100644 index 000..ab8af1e --- /dev/null +++ b/rules/oracle-java7-jre.make @@ -0,0 +1,87 @@ +# -*-makefile-*- +# +# Copyright (C) 2014 by Martin Hejnfelt m...@newtec.dk +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_ORACLE_JAVA7_JRE) += oracle-java7-jre + +# +# Paths and names +# +ifdef PTXCONF_ARCH_X86_64 +ORACLE_JAVA7_JRE_ARCH:= x64 +ORACLE_JAVA7_JRE_MD5 := 9007c79167be0177fb47e5313c53d5cb +else +ORACLE_JAVA7_JRE_ARCH:= i586 +ORACLE_JAVA7_JRE_MD5 := 2a256eb2a91f0084e58c612636342c2b +endif + +ORACLE_JAVA7_JRE_VERSION := 7u67 + +ORACLE_JAVA7_JRE := jre-$(ORACLE_JAVA7_JRE_VERSION)-linux-$(ORACLE_JAVA7_JRE_ARCH) +ORACLE_JAVA7_JRE_SUFFIX := tar.gz +ORACLE_JAVA7_JRE_URL := http://download.oracle.com/otn-pub/java/jdk/$(ORACLE_JAVA7_JRE_VERSION)-b01/$(ORACLE_JAVA7_JRE).$(ORACLE_JAVA7_JRE_SUFFIX);cookie:oraclelicense=accept-securebackup-cookie +ORACLE_JAVA7_JRE_SOURCE := $(SRCDIR)/$(ORACLE_JAVA7_JRE).$(ORACLE_JAVA7_JRE_SUFFIX) +ORACLE_JAVA7_JRE_DIR := $(BUILDDIR)/$(ORACLE_JAVA7_JRE) +ORACLE_JAVA7_JRE_LICENSE := unknown + +# +# Prepare +# + +ORACLE_JAVA7_JRE_CONF_TOOL := NO + +# +# Compile +# + +$(STATEDIR)/oracle-java7-jre.compile: + @$(call targetinfo) + @$(call touch) + +# +# Install +# + +$(STATEDIR)/oracle-java7-jre.install: + @$(call targetinfo) + @$(call touch) + +# +# Target-Install +# + +$(STATEDIR)/oracle-java7-jre.targetinstall: + @$(call targetinfo) + + @$(call install_init, oracle-java7-jre) + @$(call install_fixup, oracle-java7-jre,PRIORITY,optional) + @$(call install_fixup, oracle-java7-jre,SECTION,base) + @$(call install_fixup, oracle-java7-jre,AUTHOR,Martin Hejnfelt m...@newtec.dk) + @$(call install_fixup, oracle-java7-jre,DESCRIPTION,Oracle Java 7 Runtime Environment) + + @$(call install_tree, oracle-java7-jre, -, -, \ + $(ORACLE_JAVA7_JRE_DIR), \ + /usr/lib/jvm/jre-$(ORACLE_JAVA7_JRE_VERSION)) + + @$(call install_link, oracle-java7-jre, \ + /usr/lib/jvm/jre-$(ORACLE_JAVA7_JRE_VERSION)/bin/java, \ + /usr/bin/java) + + @$(call install_link, oracle-java7-jre, \ + /usr/lib/jvm/jre-$(ORACLE_JAVA7_JRE_VERSION)/bin/javaws, \ + /usr/bin/javaws) + + @$(call install_finish, oracle-java7-jre) + + @$(call touch) + +# vim: syntax=make -- 1.9.1 -- 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] Patches for fuse-zip: Adds a missing header. See: http://code.google.com/p/fuse-zip/issues/detail?id=44
This should be part of the patch that adds package. Michael On Fri, Dec 12, 2014 at 05:05:35PM +0100, grodriguez wrote: --- patches/fuse-zip-0.4.0/Fix_missing_header.diff | 13 + patches/fuse-zip-0.4.0/series |1 + 2 files changed, 14 insertions(+), 0 deletions(-) create mode 100644 patches/fuse-zip-0.4.0/Fix_missing_header.diff create mode 100644 patches/fuse-zip-0.4.0/series diff --git a/patches/fuse-zip-0.4.0/Fix_missing_header.diff b/patches/fuse-zip-0.4.0/Fix_missing_header.diff new file mode 100644 index 000..39ccc92 --- /dev/null +++ b/patches/fuse-zip-0.4.0/Fix_missing_header.diff @@ -0,0 +1,13 @@ +Index: fuse-zip-0.4.0/lib/fileNode.cpp +=== +--- fuse-zip-0.4.0.orig/lib/fileNode.cpp 2014-01-14 17:55:27.0 +0100 fuse-zip-0.4.0/lib/fileNode.cpp 2014-12-10 18:33:42.524472368 +0100 +@@ -27,6 +27,8 @@ + #include stdexcept + #include syslog.h + #include cassert ++#define __STDC_LIMIT_MACROS ++#include stdint.h + + #include fileNode.h + #include extraField.h diff --git a/patches/fuse-zip-0.4.0/series b/patches/fuse-zip-0.4.0/series new file mode 100644 index 000..b460945 --- /dev/null +++ b/patches/fuse-zip-0.4.0/series @@ -0,0 +1 @@ +Fix_missing_header.diff -- 1.7.0.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] curl: install root CA certificates option
On Wed, Dec 10, 2014 at 09:04:23AM +0100, Bruno Thomsen wrote: Install a bundle of X.509 certificates of public Certificate Authorities (CA) in PEM format. The bundle is automatically extracted from one of Mozilla's development channels/trees. Test case 1: openssl s_client -connect www.google.com:443 -CAfile /usr/share/ca-certificates/curl/ca-bundle.crt Result: Verify return code: 0 (ok) Test case 2: openssl s_client -connect www.google.com:443 Result: Verify return code: 20 (unable to get local issuer certificate) Test case 3: curl https://www.google.com Result: HTMLHEAD... Test case 4: rm /usr/share/ca-certificates/curl/ca-bundle.crt curl https://www.google.com Result: curl: (77) error setting certificate verify locations: CAfile: /usr/share/ca-certificates/curl/ca-bundle.crt CApath: none Signed-off-by: Bruno Thomsen b...@kamstrup.dk --- rules/libcurl.in | 57 ++ rules/libcurl.make | 40 +- 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/rules/libcurl.in b/rules/libcurl.in index 0ad7fb4..e5f25f8 100644 --- a/rules/libcurl.in +++ b/rules/libcurl.in @@ -20,6 +20,63 @@ if LIBCURL config LIBCURL_CURL bool install curl program +config LIBCURL_CA_BUNDLE + bool install CA Root Certificates + help + Bundle of CA Root Certificates. + + This is a bundle of X.509 certificates of public Certificate Authorities + (CA). These were automatically extracted from Mozilla's root certificates + file (certdata.txt). + + It contains the certificates in PEM format and therefore + can be directly used with curl / libcurl / php_curl / openssl. + +choice + prompt Mozilla tree + default LIBCURL_CA_TREE_RELEASE + depends on LIBCURL_CA_BUNDLE + help + Pull certdata.txt from this Mozilla tree. + https://wiki.mozilla.org/Tree_Rules + +config LIBCURL_CA_TREE_CENTRAL + bool + prompt central + help + Central is also known as nightly channel. + +config LIBCURL_CA_TREE_AURORA + bool + prompt aurora + help + Aurora channel is after central and before beta. + +config LIBCURL_CA_TREE_BETA + bool + prompt beta + help + Beta channel is just before release. + +config LIBCURL_CA_TREE_RELEASE + bool + prompt release + help + Changes to the release branch are limited to urgent chemspills + like zero-day security vulnerabilities and other unplanned emergencies. + In the normal development process, no changes will land on release + except regular merges from beta every six weeks. + +config LIBCURL_CA_TREE_NSS + bool + prompt nss + help + Network Security Services (NSS) is a set of libraries designed to support + cross-platform development of security-enabled client and server applications. + Mozilla develops NSS separate from Firefox. + +endchoice + config LIBCURL_HTTP bool http default y diff --git a/rules/libcurl.make b/rules/libcurl.make index 5babcb0..9e7b57b 100644 --- a/rules/libcurl.make +++ b/rules/libcurl.make @@ -26,6 +26,36 @@ LIBCURL_SOURCE := $(SRCDIR)/$(LIBCURL).$(LIBCURL_SUFFIX) LIBCURL_DIR := $(BUILDDIR)/$(LIBCURL) LIBCURL_LICENSE := MIT +ifdef PTXCONF_LIBCURL_CA_TREE_CENTRAL +MOZ_CA_TREE := central +endif +ifdef PTXCONF_LIBCURL_CA_TREE_AURORA +MOZ_CA_TREE := aurora +endif +ifdef PTXCONF_LIBCURL_CA_TREE_BETA +MOZ_CA_TREE := beta +endif +ifdef PTXCONF_LIBCURL_CA_TREE_RELEASE +MOZ_CA_TREE := release +endif +ifdef PTXCONF_LIBCURL_CA_TREE_NSS +MOZ_CA_TREE := nss +endif + +# +# Extract +# + +$(STATEDIR)/libcurl.extract: + @$(call targetinfo) + @$(call clean, $(LIBCURL_DIR)) + @$(call extract, LIBCURL, $(BUILDDIR)) + @$(call patchin, LIBCURL, $(LIBCURL_DIR)) +ifdef PTXCONF_LIBCURL_CA_BUNDLE + @$(LIBCURL_DIR)/lib/mk-ca-bundle.pl -i -d$(MOZ_CA_TREE) -v $(LIBCURL_DIR)/ca-bundle.crt +endif No, not like this. Downloading an undefined version of a file during the build process is not acceptable. Add a second file to download (see rules/host-tz-database.make) how to do this) and use a URL that does not change, maybe the last tag: http://hg.mozilla.org/releases/mozilla-release/raw-file/FIREFOX_35_0_RELEASE/security/nss/lib/ckfw/builtins/certdata.txt ifdef PTXCONF_LIBCURL_CA_BUNDLE @cp $(LIBCURL_CERTDATA_SOURCE) $(LIBCURL_DIR) endif Also, you need to 'select HOST_SYSTEM_PERL' in the .in file and running mk-ca-bundle.pl should be in the compile stage. Otherwise the dependencies are not handled correctly. Michael + @$(call touch) + #
Re: [ptxdist] [PATCH] lowpan-tools: replace with wpan-tools
On Sun, Dec 14, 2014 at 01:27:33PM +0100, Alexander Aring wrote: This patch removes the actual lowpan-tools for the 802.15.4 stack and replace it with the wpan-tools. The lowpan-tools are deprecated now, see http://www.spinics.net/lists/linux-wpan/msg01132.html for more information. This patch also adds a migrate functionality to replace LOWPAN_TOOLS with WPAN_TOOLS. Signed-off-by: Alexander Aring alex.ar...@gmail.com --- I am not sure about the migrate functionality. Maybe this could also be improved because both has the substring _TOOLS inside. Nevertheless this should work. It was not quite correct. I fixed it and it works now. Thanks, applied. Michael ...0001-izoordinator-Fixes-to-error-handling.patch | 46 .../0002-configure.ac-check-for-python2.x.patch| 28 - .../0003-m4-add-py_check_major_version.m4.patch| 40 --- ...c-Check-that-the-python-version-is-indeed.patch | 23 ...t-PAN-ID-short-address-and-channel-manual.patch | 122 - ...z-mac-Handle-return-code-from-set-command.patch | 39 --- ...hon-is-required-only-for-the-serial-tests.patch | 63 --- patches/lowpan-tools-0.3/autogen.sh| 11 -- patches/lowpan-tools-0.3/series| 10 -- rules/lowpan-tools.in | 21 rules/lowpan-tools.make| 91 --- rules/wpan-tools.in| 8 ++ rules/wpan-tools.make | 57 ++ scripts/migrate/migrate_ptx| 8 ++ 14 files changed, 73 insertions(+), 494 deletions(-) delete mode 100644 patches/lowpan-tools-0.3/0001-izoordinator-Fixes-to-error-handling.patch delete mode 100644 patches/lowpan-tools-0.3/0002-configure.ac-check-for-python2.x.patch delete mode 100644 patches/lowpan-tools-0.3/0003-m4-add-py_check_major_version.m4.patch delete mode 100644 patches/lowpan-tools-0.3/0004-configure.ac-Check-that-the-python-version-is-indeed.patch delete mode 100644 patches/lowpan-tools-0.3/0005-Allow-to-set-PAN-ID-short-address-and-channel-manual.patch delete mode 100644 patches/lowpan-tools-0.3/0006-iz-mac-Handle-return-code-from-set-command.patch delete mode 100644 patches/lowpan-tools-0.3/0007-Python-is-required-only-for-the-serial-tests.patch delete mode 100755 patches/lowpan-tools-0.3/autogen.sh delete mode 100644 patches/lowpan-tools-0.3/series delete mode 100644 rules/lowpan-tools.in delete mode 100644 rules/lowpan-tools.make create mode 100644 rules/wpan-tools.in create mode 100644 rules/wpan-tools.make diff --git a/patches/lowpan-tools-0.3/0001-izoordinator-Fixes-to-error-handling.patch b/patches/lowpan-tools-0.3/0001-izoordinator-Fixes-to-error-handling.patch deleted file mode 100644 index b290bbf..000 --- a/patches/lowpan-tools-0.3/0001-izoordinator-Fixes-to-error-handling.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Alan Ott a...@signal11.us -Date: Thu, 5 Apr 2012 00:22:56 -0400 -Subject: [PATCH] izoordinator: Fixes to error handling - -Some of the error handling was checking for != 0 on functions which -return positive values on success. - -Signed-off-by: Alan Ott a...@signal11.us - src/coordinator.c | 9 ++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/src/coordinator.c b/src/coordinator.c -index a09633a59eca..c139aae3de31 100644 a/src/coordinator.c -+++ b/src/coordinator.c -@@ -94,7 +94,8 @@ static int mlme_start(uint16_t short_addr, uint16_t pan, uint8_t channel, uint8_ - nla_put_u8(msg, IEEE802154_ATTR_COORD_REALIGN, 0); - #endif - int err = nl_send_auto_complete(nl, msg); --log_msg_nl_perror(nl_send_auto_complete, err); -+if (err 0) -+log_msg_nl_perror(nl_send_auto_complete, err); - return 0; - } - -@@ -129,7 +130,8 @@ static int coordinator_associate(struct genlmsghdr *ghdr, struct nlattr **attrs) - - int err = nl_send_auto_complete(nl, msg); - --log_msg_nl_perror(nl_send_auto_complete, err); -+if (err 0) -+log_msg_nl_perror(nl_send_auto_complete, err); - - return 0; - } -@@ -408,7 +410,8 @@ int main(int argc, char **argv) - log_msg_nl_perror(genl_connect, err); - - family = genl_ctrl_resolve(nl, IEEE802154_NL_NAME); --log_msg_nl_perror(genl_ctrl_resolve, NLE_NOMEM); -+if (family 0) -+log_msg_nl_perror(genl_ctrl_resolve, family); - - nl_socket_add_membership(nl, nl_get_multicast_id(nl, IEEE802154_NL_NAME, IEEE802154_MCAST_COORD_NAME)); - diff --git a/patches/lowpan-tools-0.3/0002-configure.ac-check-for-python2.x.patch b/patches/lowpan-tools-0.3/0002-configure.ac-check-for-python2.x.patch deleted file mode 100644 index 6c67f62..000 --- a/patches/lowpan-tools-0.3/0002-configure.ac-check-for-python2.x.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Alexander Aring
Re: [ptxdist] [PATCH] avahi: version bump 0.6.30 - 0.6.31
On Mon, Dec 15, 2014 at 08:39:35PM +0100, Robert Schwebel wrote: No relevant configure.ac changes found. Thanks, applied. Michael Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- rules/avahi.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/avahi.make b/rules/avahi.make index c0b9b49..8427fc8 100644 --- a/rules/avahi.make +++ b/rules/avahi.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_AVAHI) += avahi # # Paths and names # -AVAHI_VERSION:= 0.6.30 -AVAHI_MD5:= e4db89a2a403ff4c47d66ac66fad1f43 +AVAHI_VERSION:= 0.6.31 +AVAHI_MD5:= 2f22745b8f7368ad5a0a3fddac343f2d AVAHI:= avahi-$(AVAHI_VERSION) AVAHI_SUFFIX := tar.gz AVAHI_URL:= http://avahi.org/download/$(AVAHI).$(AVAHI_SUFFIX) -- 2.1.3 -- 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] [RFC 0/2] add a way to extract license text from packages
Hi, On Wed, Feb 11, 2015 at 12:19:34PM +0100, Juergen Borleis wrote: On Wednesday 11 February 2015 11:50:16 Hubert Feurstein wrote: IMHO the proposal by Markus makes sense. I have had the same issues with collecting license texts in the past. So a solution integrated in PTXdist would be great. Because then it would be possible to collect the license texts depending on the config options of a package (sometimes plugins have a different license). Please checkout current PTXdist master and run ptxdist make license-report inside a PTXdist project. You need LATEX and dot to make it work. xelatex (from texlive-xetex in Debian) and dot2tex are needed as well. The raw license data for each package is collected in platform-something/state/report/pkg/ if you have use for that. 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] ext2.make:16: warning: overriding commands for target
On Fri, Feb 13, 2015 at 06:45:52AM +, Hänel-Baas, Alexander wrote: I change the image creation option under ptxdist platformconfig - image creation - generates images/hd.img an now i get the message: ptxdist-2014.10.0/ rules/post/image_ext2.make:16: warning: overriding commands for target You're mixing the 'old' and 'new' image rules. That does not work. I would like to create a further partition in the hd.img . The best solution for me is a filesystem that contains directories and files, such as projectroot. How I can di this in ptxdist? With the 'new' image creation rules you can do this, but there is not a lot of documentation. You can define a new image with 'ptxdist newpackage image-genimage'. Look at rules/image-*.make (and config/images/) for examples. The input data is usually a tarball. 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] php5: version bump 5.4.35 - 5.5.21
On Thu, Feb 12, 2015 at 03:27:17PM +0100, Bruno Thomsen wrote: Disabled new OPcache feature (Zend Optimizer+) due to cross-compiling issue. https://bugs.php.net/bug.php?id=66103 Package format changed from tar.bz2 to tar.xz. Thanks, applied. Michael Signed-off-by: Bruno Thomsen b...@kamstrup.com --- rules/php5.make | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/php5.make b/rules/php5.make index c3f0168..5dddeab 100644 --- a/rules/php5.make +++ b/rules/php5.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_PHP5) += php5 # # Paths and names # -PHP5_VERSION := 5.4.35 -PHP5_MD5 := 489cc8336488fb2e722ffa3c08f9c864 +PHP5_VERSION := 5.5.21 +PHP5_MD5 := 79664ce44f7c93f355a25a3fe3dcc91b PHP5 := php-$(PHP5_VERSION) -PHP5_SUFFIX := tar.bz2 +PHP5_SUFFIX := tar.xz PHP5_SOURCE := $(SRCDIR)/$(PHP5).$(PHP5_SUFFIX) PHP5_DIR := $(BUILDDIR)/$(PHP5) @@ -49,6 +49,7 @@ PHP5_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --disable-phar \ --with-config-file-path=/etc/php5 \ + --enable-opcache=no \ --without-iconv # FIXME: php5 doesn't interprete with_foo=no correctly, so we cannot -- 1.9.1 -- 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] [PATCHv2] mosh: added mosh package to ptxdist
On Mon, Feb 16, 2015 at 10:52:01AM +0100, Alexander Aring wrote: On Mon, Feb 16, 2015 at 10:39:34AM +0100, Michael Olbrich wrote: On Tue, Feb 10, 2015 at 09:44:37AM +0100, Oliver Graute wrote: second try, thank you for feedback its my first contribution to ptxdist Thanks, I've applied it with some cleanups: Make sure you handle the white-spaces correctly in future patches. And Alex got it wrong. It should be: MOSH_CONF_TOOL := autoconf MOSH_CONF_OPT := \ [...] Michael Signed-off-by: Oliver Graute oliver.gra...@neuhaus.de --- rules/mosh.in | 17 rules/mosh.make | 61 +++ 2 files changed, 78 insertions(+) create mode 100644 rules/mosh.in create mode 100644 rules/mosh.make diff --git a/rules/mosh.in b/rules/mosh.in new file mode 100644 index 000..d9cc583 --- /dev/null +++ b/rules/mosh.in @@ -0,0 +1,17 @@ +## SECTION=networking + +config MOSH + tristate + prompt mosh +select PROTOBUF + select NCURSES + select ZLIB + select OPENSSL + select OPENSSH if RUNTIME + select OPENSSH_SSH if RUNTIME + select OPENSSH_SSHD if RUNTIME now I see, there is PERL missing here. The mosh script require PERL with: select PERL if RUNTIME also the mosh script uses: use IO::Socket::INET;, see [0]. that means we need also a: select IO_SOCKET_INET6_PERL if RUNTIME, see [1]. [0] https://github.com/keithw/mosh/blob/mosh-1.2.4/scripts/mosh#L153 [1] http://search.cpan.org/~shlomif/IO-Socket-INET6-2.72/lib/IO/Socket/INET6.pm Is it usefull without perl? Maybe the server could be startet without it? The we should add an option for this. 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] [RfC] ptxdist: add rootstat command
On Wed, Feb 11, 2015 at 05:34:50PM +0100, Robert Schwebel wrote: Since we have our debug root components in .debug directories, it became complicated to find out about the size of the root directory. Add an option for it. 'du' can do that for you easily: $ du -sh --exclude=.debug platform-something/root No need for an extra command. Michael Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- bin/ptxdist | 11 +++ 1 file changed, 11 insertions(+) diff --git a/bin/ptxdist b/bin/ptxdist index 854648a..34605c2 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -994,6 +994,7 @@ Misc: newpackage type create a new package Makefile in a rules dir use 'newpackage help' for a longer description nfsrootrun a userspace NFS server and export the nfsroot + rootstat print statistics about root directory print varprint the contents of a variable, in the way it is known by make list-packages print a list of all selected packages @@ -1959,6 +1960,16 @@ EOF ptxd_make_log ptxd_make_nfsd exit ;; + rootstat) + if [ ${PTXDIST_VERBOSE} == 1 ]; then + echo verbose + exit + fi + find ${ROOTDIR} -type f \ + -and \! -path */.debug/* -exec ls --block-size=1 -s {} \; \ + | awk '{sum += $1} END {print sum/(1024*1024) MB}' + exit + ;; print) if [ ${#} -eq 0 ]; then exit 1 -- 2.1.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] [PATCHv2] mosh: added mosh package to ptxdist
On Mon, Feb 16, 2015 at 11:55:51AM +0100, Alexander Aring wrote: On Mon, Feb 16, 2015 at 11:38:40AM +0100, Michael Olbrich wrote: On Mon, Feb 16, 2015 at 10:52:01AM +0100, Alexander Aring wrote: On Mon, Feb 16, 2015 at 10:39:34AM +0100, Michael Olbrich wrote: On Tue, Feb 10, 2015 at 09:44:37AM +0100, Oliver Graute wrote: second try, thank you for feedback its my first contribution to ptxdist Thanks, I've applied it with some cleanups: Make sure you handle the white-spaces correctly in future patches. And Alex got it wrong. It should be: MOSH_CONF_TOOL := autoconf MOSH_CONF_OPT := \ [...] Michael Signed-off-by: Oliver Graute oliver.gra...@neuhaus.de --- rules/mosh.in | 17 rules/mosh.make | 61 +++ 2 files changed, 78 insertions(+) create mode 100644 rules/mosh.in create mode 100644 rules/mosh.make diff --git a/rules/mosh.in b/rules/mosh.in new file mode 100644 index 000..d9cc583 --- /dev/null +++ b/rules/mosh.in @@ -0,0 +1,17 @@ +## SECTION=networking + +config MOSH + tristate + prompt mosh +select PROTOBUF + select NCURSES + select ZLIB + select OPENSSL + select OPENSSH if RUNTIME + select OPENSSH_SSH if RUNTIME + select OPENSSH_SSHD if RUNTIME now I see, there is PERL missing here. The mosh script require PERL with: select PERL if RUNTIME also the mosh script uses: use IO::Socket::INET;, see [0]. that means we need also a: select IO_SOCKET_INET6_PERL if RUNTIME, see [1]. [0] https://github.com/keithw/mosh/blob/mosh-1.2.4/scripts/mosh#L153 [1] http://search.cpan.org/~shlomif/IO-Socket-INET6-2.72/lib/IO/Socket/INET6.pm Is it usefull without perl? Maybe the server could be startet without it? The we should add an option for this. yep, option would be great. For myself I don't know how to create a mosh connection without the mosh script (this is only possible if you do some own hard work). On website stands: --- The mosh command is a wrapper script that is designed to be the primary way that you use mosh. In most cases, you can simply just replace ssh with mosh in your command line. Behind the scenes, the mosh wrapper script will SSH to the server, start up mosh-server, and then close the SSH connection. Then it will start up the mosh-client executable on the client, passing it the necessary information for it to connect to the newly spawned mosh-server instance. In normal usage, mosh-client and mosh-server don't need to be run directly. --- Afterwards there is a complicated How-To how you setup a connection without mosh script. See [0], Q: How do I run the mosh client and server separately?. I am fine to add a option and we have already a perfect help message see above. ok. I also mentioned to add a config for the mosh script in some of my previous mail. [1] 'Something like config MOSH_INSTALL_MOSH_SCRIPT'. btw: another issue is maybe the OPENSSH_SSH and OPENSSH_SSHD, if you want only be a server or a client. This could be an option which select OPENSSH_SSH or OPENSSH_SSHD when client or server only, but I would keep it in this way. Otherwise it would be much complicated to deal with the dependencies. I agree. If we need the option later, then we can still add it. Michael - Alex [0] https://mosh.mit.edu/ [1] http://article.gmane.org/gmane.comp.embedded.ptxdist.devel/12592 -- 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] cbenchsuite: Initial commit, v1.0
On Sun, Feb 08, 2015 at 10:57:24AM +0100, Markus Pargmann wrote: Add a rule for cbenchsuite. Signed-off-by: Markus Pargmann m...@pengutronix.de --- rules/cbenchsuite.in | 11 rules/cbenchsuite.make | 68 ++ 2 files changed, 79 insertions(+) create mode 100644 rules/cbenchsuite.in create mode 100644 rules/cbenchsuite.make diff --git a/rules/cbenchsuite.in b/rules/cbenchsuite.in new file mode 100644 index ..4b9280fbdf11 --- /dev/null +++ b/rules/cbenchsuite.in @@ -0,0 +1,11 @@ +## SECTION=test_suites + +config CBENCHSUITE + tristate + prompt cbenchsuite 'readelf -d' says: select LIBC_PTHREAD select LIBC_DL select LIBC_M select LIBUUID + select HOST_CMAKE + select SQLITE + + help + cbenchsuite is a benchmark suite including plotter for high accuracy + measurements. See http://cbenchsuite.org diff --git a/rules/cbenchsuite.make b/rules/cbenchsuite.make new file mode 100644 index ..84f86d6335dd --- /dev/null +++ b/rules/cbenchsuite.make @@ -0,0 +1,68 @@ +# -*-makefile-*- +# +# Copyright (C) 2015 by Markus Pargmann m...@pengutronix.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_CBENCHSUITE) += cbenchsuite + +# +# Paths and names +# +CBENCHSUITE_VERSION := 1.0 +CBENCHSUITE_MD5 := d5bddd48495edf7200d11fce03a310ef +CBENCHSUITE := cbenchsuite-$(CBENCHSUITE_VERSION) +CBENCHSUITE_SUFFIX := tar.gz +CBENCHSUITE_URL := https://github.com/scosu/cbenchsuite/archive/v$(CBENCHSUITE_VERSION).$(CBENCHSUITE_SUFFIX) +CBENCHSUITE_SOURCE := $(SRCDIR)/$(CBENCHSUITE).$(CBENCHSUITE_SUFFIX) +CBENCHSUITE_DIR := $(BUILDDIR)/$(CBENCHSUITE) +CBENCHSUITE_LICENSE := GPL + +# +# autoconf +# +CBENCHSUITE_CONF_TOOL:= cmake +CBENCHSUITE_CONF_OPT = \ + $(CROSS_CMAKE_USR) \ + -DBUILD_TESTS:BOOL=OFF \ + -DPython_PREFERRED_VERSION=python$(PYTHON_MAJORMINOR) \ Does it work without Python on the target? If not use 'select PYTHON if RUNTIME' above. + -DMODULE_COMPRESSION:BOOL=ON \ + -DMODULE_COOLDOWN:BOOL=ON \ + -DMODULE_CPUSCHED:BOOL=ON \ + -DMODULE_KERNEL:BOOL=ON \ + -DMODULE_LINUX_PERF:BOOL=ON \ + -DMODULE_MATH:BOOL=ON \ + -DMODULE_SYSCTL:BOOL=ON \ + -DDB_DIR:STRING=/run/cbenchsuite/db/ \ + -DWORK_DIR:STRING=/run/cbenchsuite/work/ \ + -DDOWNLOAD_DIR:STRING=/run/cbenchsuite/downloads/ + + +# +# Target-Install +# + +$(STATEDIR)/cbenchsuite.targetinstall: + @$(call targetinfo) + + @$(call install_init, cbenchsuite) + @$(call install_fixup, cbenchsuite,PRIORITY,optional) + @$(call install_fixup, cbenchsuite,SECTION,base) + @$(call install_fixup, cbenchsuite,AUTHOR,Markus Pargmann m...@pengutronix.de) + @$(call install_fixup, cbenchsuite,DESCRIPTION,missing) + + @$(call install_tree, cbenchsuite, 0, 0, -, /usr/bin) It's just one binary. Use install_copy + @$(call install_tree, cbenchsuite, 0, 0, -, /usr/lib) Use /usr/lib/cbenchsuite. We use the most restrictive path for things like this. Michael + + @$(call install_finish, cbenchsuite) + + @$(call touch) + +# vim: syntax=make -- 2.1.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] [PATCHv2] mosh: added mosh package to ptxdist
On Tue, Feb 10, 2015 at 09:44:37AM +0100, Oliver Graute wrote: second try, thank you for feedback its my first contribution to ptxdist Thanks, I've applied it with some cleanups: Make sure you handle the white-spaces correctly in future patches. And Alex got it wrong. It should be: MOSH_CONF_TOOL := autoconf MOSH_CONF_OPT := \ [...] Michael Signed-off-by: Oliver Graute oliver.gra...@neuhaus.de --- rules/mosh.in | 17 rules/mosh.make | 61 +++ 2 files changed, 78 insertions(+) create mode 100644 rules/mosh.in create mode 100644 rules/mosh.make diff --git a/rules/mosh.in b/rules/mosh.in new file mode 100644 index 000..d9cc583 --- /dev/null +++ b/rules/mosh.in @@ -0,0 +1,17 @@ +## SECTION=networking + +config MOSH + tristate + prompt mosh +select PROTOBUF + select NCURSES + select ZLIB + select OPENSSL + select OPENSSH if RUNTIME + select OPENSSH_SSH if RUNTIME + select OPENSSH_SSHD if RUNTIME + help + Remote terminal application that allows roaming, supports intermittent + connectivity, and provides intelligent local echo and line editing of + user keystrokes. Mosh is a replacement for SSH. It's more robust and + responsive, especially over Wi-Fi, cellular, and long-distance links. diff --git a/rules/mosh.make b/rules/mosh.make new file mode 100644 index 000..b96af5a --- /dev/null +++ b/rules/mosh.make @@ -0,0 +1,61 @@ +# -*-makefile-*- +# +# Copyright (C) 2015 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute oliver.gra...@neuhaus.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_MOSH) += mosh + +# +# Paths and names +# +MOSH_VERSION := 1.2.4 +MOSH_MD5 := c2d918f4d91fdc32546e2e089f9281b2 +MOSH := mosh-$(MOSH_VERSION) +MOSH_SUFFIX := tar.gz +MOSH_URL := https://mosh.mit.edu/$(MOSH).$(MOSH_SUFFIX) +MOSH_SOURCE := $(SRCDIR)/$(MOSH).$(MOSH_SUFFIX) +MOSH_DIR := $(BUILDDIR)/$(MOSH) +MOSH_LICENSE := GPLv3 + +# +# autoconf +# +MOSH_AUTOCONF:= \ + $(CROSS_AUTOCONF_USR) \ + --enable-hardening \ + --enable-client \ + --enable-server \ + --disable-examples \ + --disable-completion \ + --without-utempter + +# +# Target-Install +# + +$(STATEDIR)/mosh.targetinstall: + @$(call targetinfo) + + @$(call install_init, mosh) + @$(call install_fixup, mosh,PRIORITY,optional) + @$(call install_fixup, mosh,SECTION,base) + @$(call install_fixup, mosh,AUTHOR,Oliver gra...@neuhaus.de) + @$(call install_fixup, mosh,DESCRIPTION,missing) + + @$(call install_copy, mosh, 0, 0, 0755, -, /usr/bin/mosh) + @$(call install_copy, mosh, 0, 0, 0755, -, /usr/bin/mosh-server) + @$(call install_copy, mosh, 0, 0, 0755, -, /usr/bin/mosh-client) + + @$(call install_finish, mosh) + + @$(call touch) + +# vim: syntax=make -- 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] version bump to 2.4.7
On Tue, Feb 10, 2015 at 11:27:29AM +, Bruno Thomsen wrote: Subject: [ptxdist] [PATCH] version bump to 2.4.7 Add package name to subject. version bump to 2.4.7 What about patch set from ppp 2.4.5? Have they been merged/fixed upstream? At least one seems rather PTXdist specific, so we probably still need it, or fix the rules if upstream fixed it differently. 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] Init script was ignoring OPTIONS variable
On Tue, Feb 10, 2015 at 01:50:13PM +0100, Guillermo Rodriguez wrote: The init script defines an OPTIONS variable (which can be overriden by an additional config file in /etc/default/avahi-daemon) but then ignores this OPTIONS variable when starting the daemon. Thanks, applied. Michael --- generic/etc/init.d/avahi-daemon |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/generic/etc/init.d/avahi-daemon b/generic/etc/init.d/avahi-daemon index 7dc8be6..27c22cc 100644 --- a/generic/etc/init.d/avahi-daemon +++ b/generic/etc/init.d/avahi-daemon @@ -13,7 +13,7 @@ test -f /etc/default/avahi-daemon . /etc/default/avahi-daemon start_proc(){ $BINARY -c return 0 -$BINARY -D +$BINARY $OPTIONS case $? in 0) echo [+] (avahi-daemon) -- 1.7.0.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] jansson: version bump to 2.7
On Wed, Feb 11, 2015 at 04:01:34PM +, Gieseler, Christian wrote: Signed-off-by: Christian Gieseler c...@eks-engel.de Thanks, applied. Michael --- rules/jansson.make |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/jansson.make b/rules/jansson.make index 2311763..11ede07 100644 --- a/rules/jansson.make +++ b/rules/jansson.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_JANSSON) += jansson # # Paths and names # -JANSSON_VERSION := 2.6 -JANSSON_MD5 := c70a52488db623a26f7213c7c6b7c878 +JANSSON_VERSION := 2.7 +JANSSON_MD5 := ffac352f9c5f80a6ae8145d451af2c0e JANSSON := jansson-$(JANSSON_VERSION) JANSSON_SUFFIX := tar.bz2 JANSSON_URL := http://www.digip.org/jansson/releases/$(JANSSON).$(JANSSON_SUFFIX) -- 1.7.1 -- 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] create img option new partition - how create fs
Hi, On Wed, Feb 11, 2015 at 04:41:39PM +, Hänel-Baas, Alexander wrote: Under platformconfig - generates images/hd.img i create two partitions. These two partitions was excellent created and partition one contains the rootfs - great. My question is how I create a file system in part two? There are two ways to create hd.img. With the one in image creation options it not possible. With the on in new image creation options you need to copy config/images/hd.config from ptxdist into the same path in your BSP and add another partition entry. Unfortunately there is not a lot of documentation for this. There is a readme (platform-something/build-host/genimage-version/README). 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] OpenNHRP: added opennhrp rule file
On Thu, Feb 12, 2015 at 04:02:47PM +0100, Oliver Graute wrote: adding the rule file to ptxdist Both files in one patch. Signed-off-by: Oliver Graute oliver.gra...@neuhaus.de --- rules/opennhrp.make | 54 +++ 1 file changed, 54 insertions(+) create mode 100644 rules/opennhrp.make diff --git a/rules/opennhrp.make b/rules/opennhrp.make new file mode 100644 index 000..cdbd3d5 --- /dev/null +++ b/rules/opennhrp.make @@ -0,0 +1,54 @@ +# -*-makefile-*- +# +# Copyright (C) 2014 Dr. Neuhaus Telekommunikation GmbH, Hamburg Germany, Oliver Graute oliver.gra...@neuhaus.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_OPENNHRP) += opennhrp + +# +# Paths and names +# +OPENNHRP_VERSION := 0.14 Why not 0.14.1 ? +OPENNHRP_MD5 := 62e8f16dd3bdf0600e43fcb37aa40462 +OPENNHRP := opennhrp-$(OPENNHRP_VERSION) +OPENNHRP_SUFFIX := tar.bz2 +OPENNHRP_URL := http://www.mirrorservice.org/sites/downloads.sourceforge.net/o/op/opennhrp/opennhrp/$(OPENNHRP).$(OPENNHRP_SUFFIX) Use $(call ptx/mirror, SF, opennhrp/$(OPENNHRP).$(OPENNHRP_SUFFIX)), or something like that. +OPENNHRP_SOURCE := $(SRCDIR)/$(OPENNHRP).$(OPENNHRP_SUFFIX) +OPENNHRP_DIR := $(BUILDDIR)/$(OPENNHRP) +OPENNHRP_LICENSE := MIT License + + +# +# Target-Install +# + +$(STATEDIR)/opennhrp.targetinstall: + @$(call targetinfo) + + @$(call install_init, opennhrp) + @$(call install_fixup, opennhrp,PRIORITY,optional) + @$(call install_fixup, opennhrp,SECTION,base) + @$(call install_fixup, opennhrp,AUTHOR,oliver.gra...@neuhaus.de) + @$(call install_fixup, opennhrp,DESCRIPTION,missing) + + @$(call install_copy, opennhrp, 0, 0, 0755, $(OPENNHRP_DIR)/nhrp/opennhrp, /usr/bin/opennhrp) Use '-' for the source and it will look for the file in platform-XXX/packages/opennhrp-0.14/ for the files: @$(call install_copy, opennhrp, 0, 0, 0755, -, /usr/sbin/opennhrp) + @$(call install_copy, opennhrp, 0, 0, 0755, $(OPENNHRP_DIR)/nhrp/opennhrpctl, /usr/bin/opennhrpctl) + @$(call install_copy, opennhrp, 0, 0, 0755, $(OPENNHRP_DIR)/etc/opennhrp-script, /etc/opennhrp/opennhrp-script) same here. + #@$(call install_copy, opennhrp, 0, 0, 0755, $(OPENNHRP_DIR)/etc/opennhrp-script.cert, /etc/opennhrp/opennhrp-script.cert) remove. + #@$(call install_copy, opennhrp, 0, 0, 0755, $(OPENNHRP_DIR)/etc/opennhrp.conf, /etc/opennhrp/opennhrp.conf) Is it usefull without a conf file? Maybe: @$(call install_alternative, opennhrp, 0, 0, 0644, \ /etc/opennhrp/opennhrp.conf) It will use the example file as fallback but can be overwritten in projectroot/ + @$(call install_copy, opennhrp, 0, 0, 0755, $(OPENNHRP_DIR)/etc/racoon-ph1dead.sh, /etc/opennhrp/racoon-ph1dead.sh) + @$(call install_copy, opennhrp, 0, 0, 0755, $(OPENNHRP_DIR)/etc/racoon-ph1down.sh, /etc/opennhrp/racoon-ph1down.sh) same as above again. Michael + + @$(call install_finish, opennhrp) + + @$(call touch) + +# vim: syntax=make -- 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] targetinstall fails
On Fri, Jan 02, 2015 at 09:36:10AM -0500, Jon Ringle wrote: On Fri, Jan 2, 2015 at 9:28 AM, Jon Ringle j...@ringle.org wrote: On Wed, Dec 31, 2014 at 7:55 AM, Michael Olbrich m.olbr...@pengutronix.de wrote: On Wed, Dec 31, 2014 at 01:57:17AM -0500, Jon Ringle wrote: Changing the /bin/sh link to point to bash instead of dash fixed this for me On Tue, Dec 30, 2014 at 2:02 PM, Jon Ringle j...@ringle.org wrote: I'm setting up a new machine with Ubuntu-14.04 where I'll be doing ptxdist builds. I'm running into a problem where the targetinstall step fails on all packages with something like the following (I added 'set -x' to the fakeroot script for debugging purposes): [...] I think I saw this at some point, but then it worked again and I never made a patch. Does this help? Michael diff --git a/rules/host-fakeroot.make b/rules/host-fakeroot.make index 53236194a582..3fb699a56759 100644 --- a/rules/host-fakeroot.make +++ b/rules/host-fakeroot.make @@ -30,6 +30,10 @@ HOST_FAKEROOT_DIR:= $(HOST_BUILDDIR)/$(HOST_FAKEROOT) # Prepare # +HOST_FAKEROOT_CONF_ENV := \ + $(HOST_ENV) \ + CONFIG_SHELL=/bin/bash + HOST_FAKEROOT_CONF_TOOL := autoconf HOST_FAKEROOT_CONF_OPT := \ $(HOST_AUTOCONF) \ I reproduced the problem by restoring the sh link to point back to dash again and then applied this patch. Starting a build after a complete clean again, this patch did not help :( Ahh... however, I just realized that I had a host-fakeroot-*-dev.tar.gz package that my build was using. After removing that so that ptxdist would rebuild host-fakeroot again, it is now having a positive effect :) I've pushed a patch for this. Thanks for testing. 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] [oracle java7 jre 1/1] Added Oracles Java 7 JRE
On Thu, Jan 08, 2015 at 09:43:16AM +0100, Martin Hejnfelt wrote: Signed-off-by: Martin Hejnfelt m...@newtec.dk --- :00 100644 000... 4b4512c... Arules/oracle-java7-jre.in :00 100644 000... 8a5603d... Arules/oracle-java7-jre.make rules/oracle-java7-jre.in | 25 +++ rules/oracle-java7-jre.make | 102 2 files changed, 127 insertions(+) diff --git a/rules/oracle-java7-jre.in b/rules/oracle-java7-jre.in new file mode 100644 index 000..4b4512c --- /dev/null +++ b/rules/oracle-java7-jre.in @@ -0,0 +1,25 @@ +## SECTION=bytecode_engines + +menuconfig ORACLE_JAVA7_JRE + tristate + + prompt oracle java7 jre Any reason to use java7 and not java8? + help + Oracle[tm] Java Runtime Environment 7 + This downloads the binary distribution + and extracts into the target prefix. + +config ORACLE_JAVA7_JRE_TARGET_PREFIX + string + depends on ORACLE_JAVA7_JRE + default /usr/lib/jvm + prompt PREFIX for JRE 7 + help + Where should the JRE be installed. Do we need this? I think we can just hardcode this path. + +config ORACLE_JAVA7_JRE_ARCHX64 + boolean + depends on ORACLE_JAVA7_JRE + prompt JRE7 x64 binary + help + Downloads the x64 binary instead this should not be needed. Use PTXCONF_ARCH_X86_64 instead. diff --git a/rules/oracle-java7-jre.make b/rules/oracle-java7-jre.make new file mode 100644 index 000..8a5603d --- /dev/null +++ b/rules/oracle-java7-jre.make @@ -0,0 +1,102 @@ +# -*-makefile-*- +# +# Copyright (C) 2014 by Oracle This is the copyright for this file, so your name/email belongs here. +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_ORACLE_JAVA7_JRE) += oracle-java7-jre PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_ORACLE_JAVA7_JRE) += oracle-java7-jre + +# +# Paths and names +# +ifdef PTXCONF_ORACLE_JAVA7_JRE_ARCHX64 +ORACLE_JAVA7_JRE_ARCH:= x64 +else +ORACLE_JAVA7_JRE_ARCH:= i586 +endif + +ORACLE_JAVA7_JRE_VERSION := 7u67 + +ifdef PTXCONF_ORACLE_JAVA7_JRE_ARCHX64 +ORACLE_JAVA7_JRE_MD5 := 9007c79167be0177fb47e5313c53d5cb +else +ORACLE_JAVA7_JRE_MD5:= 2a256eb2a91f0084e58c612636342c2b indent with tabs. +endif + +ORACLE_JAVA7_JRE := jre-$(ORACLE_JAVA7_JRE_VERSION)-linux-$(ORACLE_JAVA7_JRE_ARCH) +ORACLE_JAVA7_JRE_SUFFIX := tar.gz +ORACLE_JAVA7_JRE_URL := http://download.oracle.com/otn-pub/java/jdk/$(ORACLE_JAVA7_JRE_VERSION)-b01/$(ORACLE_JAVA7_JRE).$(ORACLE_JAVA7_JRE_SUFFIX) +ORACLE_JAVA7_JRE_SOURCE := $(SRCDIR)/$(ORACLE_JAVA7_JRE).$(ORACLE_JAVA7_JRE_SUFFIX) +ORACLE_JAVA7_JRE_DIR := $(BUILDDIR)/$(ORACLE_JAVA7_JRE) +ORACLE_JAVA7_JRE_LICENSE := unknown + +# +# Get +# + +$(ORACLE_JAVA7_JRE_SOURCE): + @$(call targetinfo) + wget --no-cookies --header Cookie: oraclelicense=accept-securebackup-cookie $(ORACLE_JAVA7_JRE_URL) -P $(SRCDIR)/ No, this is more complex. I need to think about how to handle this correctly. + @$(call touch) + +# +# Prepare +# + +$(STATEDIR)/oracle-java7-jre.prepare: + @$(call targetinfo) + @$(call touch) replace this with: ORACLE_JAVA7_JRE_CONF_TOOL := NO + +# +# Compile +# + +$(STATEDIR)/oracle-java7-jre.compile: + @$(call targetinfo) + @$(call touch) + +# +# Install +# + +$(STATEDIR)/oracle-java7-jre.install: + @$(call targetinfo) + @$(call touch) + +# +# Target-Install +# + +$(STATEDIR)/oracle-java7-jre.targetinstall: + @$(call targetinfo) + + @$(call install_init, oracle-java7-jre) + @$(call install_fixup, oracle-java7-jre,PRIORITY,optional) + @$(call install_fixup, oracle-java7-jre,SECTION,base) + @$(call install_fixup, oracle-java7-jre,AUTHOR,Oracle) This is the package author (you, same as copyright) not the upstream author. +
Re: [ptxdist] [RFC] update NetworkManager
On Fri, Feb 20, 2015 at 10:18:59AM +0100, Juergen Borleis wrote: The following patch series tries to update the NetworkManager package. Try because I'm not sure if the dependencies are set correctly. For example the HOST_INTLTOOL dependency looks strange. I'm also not sure if and why there was a run-time dependency to IPTABLES and IPTABLES_IPV4. How is NetworkManager using these tools? It seems the nmtui coming with NetworkManager is a nice tool but on my target it runs but I cannot use it because it does not interact with my keystrokes. So I kept its support in a separate patch. Any idea what's missing? Beside that the libnewt (used by nmtui) fails with this strange behaviour: ...] I fixed this. All patches applied with small changes. 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 10/10] libgcrypt: version bump 1.5.3 - 1.6.3
On Fri, Mar 06, 2015 at 11:26:00AM +0100, Hubert Feurstein wrote: Signed-off-by: Hubert Feurstein h.feurst...@gmail.com When updating to a new version, please check for new configure options. I usually diff the output of './configure --help' to see what changed and update the options accordingly. In this case I see some hardware accel options. I think there are runtime checks (please verify) so we can enable those unconditionally. For NEON we have an options (PTXCONF_NEON) so that should be used. Michael --- rules/libgcrypt.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make index b700487..fe3e474 100644 --- a/rules/libgcrypt.make +++ b/rules/libgcrypt.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBGCRYPT) += libgcrypt # # Paths and names # -LIBGCRYPT_VERSION:= 1.5.3 -LIBGCRYPT_MD5:= 993159b2924ae7b0e4eaff0743c2db35 +LIBGCRYPT_VERSION:= 1.6.3 +LIBGCRYPT_MD5:= 4262c3aadf837500756c2051a5c4ae5e LIBGCRYPT:= libgcrypt-$(LIBGCRYPT_VERSION) LIBGCRYPT_SUFFIX := tar.bz2 LIBGCRYPT_URL:= http://artfiles.org/gnupg.org/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX) ftp://ftp.gnupg.org/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX) -- 2.3.0 -- 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] [APTCH] polkit: version bump 0.96 - 0.104
On Mon, Mar 16, 2015 at 02:24:05PM +0100, Juergen Borleis wrote: Signed-off-by: Juergen Borleis j...@pengutronix.de diff --git a/patches/polkit-0.96/0001-Bug-26982-pkexec-information-disclosure-vulnerabilit.patch b/patches/polkit-0.96/0001-Bug-26982-pkexec-information-disclosure-vulnerabilit.patch deleted file mode 100644 index 3c8efb61bdbd.. --- a/patches/polkit-0.96/0001-Bug-26982-pkexec-information-disclosure-vulnerabilit.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 14bdfd816512a82b1ad258fa143ae5faa945df8a Mon Sep 17 00:00:00 2001 -From: Dan Rosenberg dan.j.rosenb...@gmail.com -Date: Wed, 10 Mar 2010 12:46:19 -0500 -Subject: [PATCH 1/3] =?UTF-8?q?Bug=2026982=20=E2=80=93=20pkexec=20information=20disclosure=20vulnerability?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -pkexec is vulnerable to a minor information disclosure vulnerability -that allows an attacker to verify whether or not arbitrary files -exist, violating directory permissions. I reproduced the issue on my -Karmic installation as follows: - - $ mkdir secret - $ sudo chown root:root secret - $ sudo chmod 400 secret - $ sudo touch secret/hidden - $ pkexec /home/drosenbe/secret/hidden - (password prompt) - $ pkexec /home/drosenbe/secret/doesnotexist - Error getting information about /home/drosenbe/secret/doesnotexist: No such - file or directory - -I've attached my patch for the issue. I replaced the stat() call -entirely with access() using F_OK, so rather than check that the -target exists, pkexec now checks if the user has permission to verify -the existence of the program. There might be another way of doing -this, such as chdir()'ing to the parent directory of the target and -calling lstat(), but this seemed like more code than necessary to -prevent such a minor problem. I see no reason to allow pkexec to -execute targets that are not accessible to the executing user because -of directory permissions. This is such a limited use case anyway that -this doesn't really affect functionality. - -http://bugs.freedesktop.org/show_bug.cgi?id=26982 - -Signed-off-by: David Zeuthen dav...@redhat.com - src/programs/pkexec.c |5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c -index 860e665..17c191e 100644 a/src/programs/pkexec.c -+++ b/src/programs/pkexec.c -@@ -411,7 +411,6 @@ main (int argc, char *argv[]) - gchar *opt_user; - pid_t pid_of_caller; - uid_t uid_of_caller; -- struct stat statbuf; - - ret = 127; - authority = NULL; -@@ -520,9 +519,9 @@ main (int argc, char *argv[]) - g_free (path); - argv[n] = path = s; - } -- if (stat (path, statbuf) != 0) -+ if (access (path, F_OK) != 0) - { -- g_printerr (Error getting information about %s: %s\n, path, g_strerror (errno)); -+ g_printerr (Error accessing %s: %s\n, path, g_strerror (errno)); - goto out; - } - command_line = g_strjoinv ( , argv + n); --- -1.7.1 - diff --git a/patches/polkit-0.96/0002-Add-shadow-support.patch b/patches/polkit-0.96/0002-Add-shadow-support.patch deleted file mode 100644 index b9119e13fb0f.. --- a/patches/polkit-0.96/0002-Add-shadow-support.patch +++ /dev/null @@ -1,1083 +0,0 @@ -From a2edcef54d2ab1a92f729e34dfa0c183b2533c61 Mon Sep 17 00:00:00 2001 -From: Andrew Psaltis ampsal...@gmail.com -Date: Mon, 28 Jun 2010 22:04:00 -0400 -Subject: [PATCH 2/3] Add shadow support - -Added support for the shadow authentication framework instead of PAM. -Enable it by passing --with-authfw=shadow to configure. - -This is done by splitting the polkitagenthelper source into separate -parts, one that does auth with PAM, and another that does auth with -shadow, sharing functions where appropriate. - -Also, all PAM-dependendent code in all other files has been #ifdef'd. -The only affected file is src/programs/pkexec.c - -Signed-off-by: David Zeuthen dav...@redhat.com - src/polkitagent/Makefile.am|9 +- - src/polkitagent/polkitagenthelper-pam.c| 264 ++ - src/polkitagent/polkitagenthelper-shadow.c | 198 - src/polkitagent/polkitagenthelper.c| 339 - src/polkitagent/polkitagenthelperprivate.c | 106 + - src/polkitagent/polkitagenthelperprivate.h | 45 - src/programs/pkexec.c |8 + - 7 files changed, 629 insertions(+), 340 deletions(-) - create mode 100644 src/polkitagent/polkitagenthelper-pam.c - create mode 100644 src/polkitagent/polkitagenthelper-shadow.c - delete mode 100644 src/polkitagent/polkitagenthelper.c - create mode 100644 src/polkitagent/polkitagenthelperprivate.c - create mode 100644 src/polkitagent/polkitagenthelperprivate.h - -diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am -index
Re: [ptxdist] Rule execution order
On Wed, Mar 04, 2015 at 10:28:08AM +, Alan Martinovic wrote: All? Also through applications not using git or built from tarballs? Nope, just for the custom apps. What about making this package depending on all the packages you collect this information from? So far, I've only seen 'select' in KConfig behave the correct way (by that I mean actually forcing the execute in correct order). 'depends' only influenced the availability in menuconfig. However, using 'select' is two rigid because not all custom applications need to be selected for a build. You can do more or less the same manually. Just add to each package 'foo' something like this: ifdef PTXCONF_FOO $(STATEDIR)/bar.prepare: $(STATEDIR)/foo.install endif 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] libkmod: version bump 18 - 20
On Sat, Mar 07, 2015 at 10:23:05AM +0100, Uwe Kleine-König wrote: On Fri, Mar 06, 2015 at 08:54:41PM +0100, Robert Schwebel wrote: On Fri, Mar 06, 2015 at 08:39:14PM +0100, Uwe Kleine-König wrote: On Fri, Mar 06, 2015 at 07:48:10PM +0100, Robert Schwebel wrote: @@ -45,7 +45,8 @@ LIBKMOD_CONF_OPT := \ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ --without-xz \ - --$(call ptx/wwo, PTXCONF_LIBKMOD_ZLIB)-zlib + --$(call ptx/wwo, PTXCONF_LIBKMOD_ZLIB)-zlib \ + --disable-coverage If you add a \ to the coverage line it doesn't need to be touched next time a new option is added. I don't think we do this for other packages. And this is an excuse not to do it now either? If you agree that it's a good idea, not having done that before shouldn't stop you. After all we never did libkmod 20 before :-) And we rarely need it. The correct hunk looks like this: @@ -41,6 +41,7 @@ LIBKMOD_CONF_OPT := \ --$(call ptx/endis, PTXCONF_LIBKMOD_LOGGING)-logging \ --$(call ptx/endis, PTXCONF_LIBKMOD_DEBUG)-debug \ --disable-python \ + --disable-coverage \ --disable-gtk-doc \ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ Most options are added in the middle anyways. 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
[ptxdist] [ANNOUNCE] PTXdist 2015.03.0 released
Hi, I'm happy to announce that I've just released ptxdist-2015.03.0. It's a bit later than usual because I was on vacation for several weeks. We have the usual mix of new packages version bumps and bugfixes. The only thing that stands out are a bunch of NetworkManager related changes. And the OpenSSL update contains several security fixes, so you might want to cherry-pick that one, even if you stick to an oder PTXdist version. Thanks to all contributors and - as always - the shortlog below. Enjoy, Michael Olbrich Alexander Aring (1): barebox: careful handling of wildcard Andreas Pretzsch (2): gnupg: fix build breakage if ICONV is not enabled gnupg: targetinstall: make gpg/gpg2 and gpgv2 selectable Bernhard Walle (1): picocom: New package Bruno Thomsen (2): dropbear: version bump 2014.65 - 2015.67 dropbear: stronger default MAC algorithms Clemens Gruber (1): chrony: Select missing dependency libcap Enrico Jorns (1): gst-plugins-base1: Added option for installing tools Hubert Feurstein (2): util-linux-ng: add fstrim option util-linux-ng: add dmesg option Jochen Frieling (1): project-name.in: Syntax corrections and the like, mainly around pre-build - pre-built Juergen Borleis (5): libndp: add library for Neighbor Discovery Protocol NetworkManager: update package libnewt: windowing toolkit NetworkManager: add nmtui support dropbear: clean up the rule file and add bugfix Lucas Stach (1): libdrm: version bump 2.4.58 - 2.4.59 Michael Olbrich (26): systemd: version bump 218 - 219 ncurses: install terminfo for vt220 dbus: version bump 1.8.14 - 1.8.16 dbus-glib: version bump 0.100 - 0.104 gnutls: version bump 3.2.20 - 3.3.12 util-linux-ng: version bump 2.25.2 - 2.26 mtd-utils: version bump 1.5.0 - 1.5.1 ptxd_make_world_install_post: fix race condition lz4: new package systemd: add support for lz4 compression gnutls: version bump 3.3.12 - 3.3.13 libqmi: new package libmbim: new package modemmanager: new package networkmanager: add option for WWAN support networkmanager: drop dependency on dhclient usb-modeswitch: version bump 1.2.5 - 2.2.1 strace: remove old patches networkmanager: fix installing examples systemd: another patch to build host-systemd on older distros networkmanager: install NetworkManager-wait-online.service only if nm-online is installed systemd: add patches to build host-systemd on older distros systemd: fix remote systemctl canutils: don't depend on kernel-header migrate: fix gnupg rule openssl: version bump 1.0.1k - 1.0.1m Oliver Graute (1): c-ares add c-ares to ptxdist Philipp Zabel (1): trace-cmd: version bump 2.3.1 - 2.5.2 Robert Schwebel (2): rt-tests: version bump 0.87 - 0.91 libkmod: version bump 18 - 20 -- 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- | signature.asc Description: Digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 08/10] libassuan: version bump 2.0.0 - 2.2.0
On Fri, Mar 06, 2015 at 11:25:58AM +0100, Hubert Feurstein wrote: Signed-off-by: Hubert Feurstein h.feurst...@gmail.com Thanks, applied. Michael --- rules/libassuan.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libassuan.make b/rules/libassuan.make index 8ac09b1..10d7ae3 100644 --- a/rules/libassuan.make +++ b/rules/libassuan.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBASSUAN) += libassuan # # Paths and names # -LIBASSUAN_VERSION:= 2.0.0 -LIBASSUAN_MD5:= 59bc0ae7194c412d7a522029005684b2 +LIBASSUAN_VERSION:= 2.2.0 +LIBASSUAN_MD5:= a104faed3e97b9c302c5d67cc22b1d60 LIBASSUAN:= libassuan-$(LIBASSUAN_VERSION) LIBASSUAN_SUFFIX := tar.bz2 LIBASSUAN_URL:= ftp://ftp.gnupg.org/gcrypt/libassuan/$(LIBASSUAN).$(LIBASSUAN_SUFFIX) -- 2.3.0 -- 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 07/10] libksba: add license information
Thanks, applied. Michael On Fri, Mar 06, 2015 at 11:25:57AM +0100, Hubert Feurstein wrote: --- rules/libksba.make | 5 + 1 file changed, 5 insertions(+) diff --git a/rules/libksba.make b/rules/libksba.make index fb22d44..2464d4b 100644 --- a/rules/libksba.make +++ b/rules/libksba.make @@ -23,6 +23,11 @@ LIBKSBA_SUFFIX := tar.bz2 LIBKSBA_URL := ftp://ftp.gnupg.org/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX) LIBKSBA_SOURCE := $(SRCDIR)/$(LIBKSBA).$(LIBKSBA_SUFFIX) LIBKSBA_DIR := $(BUILDDIR)/$(LIBKSBA) +LIBKSBA_LICENSE := GPLv2, GPLv3, LGPLv3 +LIBKSBA_LICENSE_FILES := \ + file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.GPLv3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ + file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 # # Prepare -- 2.3.0 -- 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 03/10] util-linux-ng: add dmesg option
On Fri, Mar 06, 2015 at 11:25:53AM +0100, Hubert Feurstein wrote: Signed-off-by: Hubert Feurstein h.feurst...@gmail.com Thanks, applied (It's already in ptxdist-2015.03.0). Michael --- rules/util-linux-ng.in | 10 ++ rules/util-linux-ng.make | 3 +++ 2 files changed, 13 insertions(+) diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index 50dfbf6..55dcd38 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -77,6 +77,16 @@ config UTIL_LINUX_NG_PARTX help The partx utility. +config UTIL_LINUX_NG_DMESG + bool + depends on !BUSYBOX_DMESG || ALLYES + prompt dmesg + help + The dmesg utility. + +comment BusyBox' dmesg is selected! + depends on BUSYBOX_DMESG + config UTIL_LINUX_NG_MOUNTPOINT bool select UTIL_LINUX_NG_LIBMOUNT diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index acd3b78..bcef93e 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -171,6 +171,9 @@ endif ifdef PTXCONF_UTIL_LINUX_NG_LINE @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/line) endif +ifdef PTXCONF_UTIL_LINUX_NG_DMESG + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /bin/dmesg) +endif ifdef PTXCONF_UTIL_LINUX_NG_MOUNTPOINT @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /bin/mountpoint) endif -- 2.3.0 -- 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] libkmod: version bump 18 - 20
On Fri, Mar 06, 2015 at 07:48:10PM +0100, Robert Schwebel wrote: We have a new option for code coverage, which shall be disabled by default. Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de Thanks, applied (It's already in ptxdist-2015.03.0). Michael --- rules/libkmod.make | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/libkmod.make b/rules/libkmod.make index ab88923..d0e3c6a 100644 --- a/rules/libkmod.make +++ b/rules/libkmod.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBKMOD) += libkmod # # Paths and names # -LIBKMOD_VERSION := 19 -LIBKMOD_MD5 := a08643f814aa4efc12211c6e5909f4d9 +LIBKMOD_VERSION := 20 +LIBKMOD_MD5 := d6f4fef718a50bd88080de6a43bc64d8 LIBKMOD := kmod-$(LIBKMOD_VERSION) LIBKMOD_SUFFIX := tar.xz LIBKMOD_URL := $(call ptx/mirror, KERNEL, utils/kernel/kmod/$(LIBKMOD).$(LIBKMOD_SUFFIX)) @@ -45,7 +45,8 @@ LIBKMOD_CONF_OPT:= \ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ --without-xz \ - --$(call ptx/wwo, PTXCONF_LIBKMOD_ZLIB)-zlib + --$(call ptx/wwo, PTXCONF_LIBKMOD_ZLIB)-zlib \ + --disable-coverage # # Target-Install -- 2.1.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 02/10] util-linux-ng: add fstrim option
On Fri, Mar 06, 2015 at 11:25:52AM +0100, Hubert Feurstein wrote: Signed-off-by: Hubert Feurstein h.feurst...@gmail.com Thanks, applied (It's already in ptxdist-2015.03.0). Michael --- rules/util-linux-ng.in | 12 rules/util-linux-ng.make | 3 +++ 2 files changed, 15 insertions(+) diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index a5f51a6..50dfbf6 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -200,6 +200,18 @@ config UTIL_LINUX_NG_FSCK comment BusyBox' fsck is selected! depends on BUSYBOX_FSCK +config UTIL_LINUX_NG_FSTRIM + bool + prompt fstrim + depends on !BUSYBOX_FSTRIM || ALLYES + help + fstrim is used on a mounted filesystem to discard (or trim) + blocks which are not in use by the filesystem. This is useful + for solid-state drives (SSDs) and thinly-provisioned storage. + +comment BusyBox' fstrim is selected! + depends on BUSYBOX_FSTRIM + config UTIL_LINUX_NG_IPCS bool prompt ipcs diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index fc28c66..acd3b78 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -205,6 +205,9 @@ endif ifdef PTXCONF_UTIL_LINUX_NG_FSCK @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/fsck) endif +ifdef PTXCONF_UTIL_LINUX_NG_FSTRIM + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /sbin/fstrim) +endif ifdef PTXCONF_UTIL_LINUX_NG_IPCS @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/bin/ipcs) endif -- 2.3.0 -- 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] picocom: New package
On Tue, Feb 24, 2015 at 11:51:53AM +0100, Bernhard Walle wrote: Signed-off-by: Bernhard Walle bernh...@bwalle.de Thanks, applied (It's already in ptxdist-2015.03.0). Michael --- rules/picocom.in | 7 ++ rules/picocom.make | 64 ++ 2 files changed, 71 insertions(+) create mode 100644 rules/picocom.in create mode 100644 rules/picocom.make diff --git a/rules/picocom.in b/rules/picocom.in new file mode 100644 index 000..6023a3a --- /dev/null +++ b/rules/picocom.in @@ -0,0 +1,7 @@ +## SECTION=shell_and_console + +config PICOCOM + tristate + prompt picocom + help + picocom is a minimal dumb-terminal emulation program diff --git a/rules/picocom.make b/rules/picocom.make new file mode 100644 index 000..1f88eff --- /dev/null +++ b/rules/picocom.make @@ -0,0 +1,64 @@ +# -*-makefile-*- +# +# Copyright (C) 2015 by Bernhard Walle bernh...@bwalle.de +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PICOCOM) += picocom + +# +# Paths and names +# +PICOCOM_VERSION := 1.7 +PICOCOM_MD5 := 8eaba1d31407e8408674d6e57af447ef +PICOCOM := picocom-$(PICOCOM_VERSION) +PICOCOM_SUFFIX := tar.gz +PICOCOM_URL := https://picocom.googlecode.com/files//$(PICOCOM).$(PICOCOM_SUFFIX) +PICOCOM_SOURCE := $(SRCDIR)/$(PICOCOM).$(PICOCOM_SUFFIX) +PICOCOM_DIR := $(BUILDDIR)/$(PICOCOM) +PICOCOM_LICENSE := GPLv2+ + +# +# Prepare +# + +PICOCOM_CONF_TOOL:= NO +PICOCOM_MAKE_ENV := $(CROSS_ENV) + +# +# Install +# + +$(STATEDIR)/picocom.install: + @$(call targetinfo) + install -d $(PICOCOM_PKGDIR)/usr/bin/ + install -m0755 $(PICOCOM_DIR)/picocom $(PICOCOM_PKGDIR)/usr/bin + @$(call touch) + +# +# Target-Install +# + +$(STATEDIR)/picocom.targetinstall: + @$(call targetinfo) + + @$(call install_init, picocom) + @$(call install_fixup, picocom,PRIORITY,optional) + @$(call install_fixup, picocom,SECTION,base) + @$(call install_fixup, picocom,AUTHOR,Bernhard Walle bernh...@bwalle.de) + @$(call install_fixup, picocom,DESCRIPTION,missing) + + @$(call install_copy, picocom, 0, 0, 0755, -, /usr/bin/picocom) + + @$(call install_finish, picocom) + + @$(call touch) + +# vim: syntax=make -- 2.3.0 -- 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] util-linux-ng: version bump 2.26 - 2.26.1
On Mon, Mar 23, 2015 at 08:32:29AM +0100, Robert Schwebel wrote: This version has a new option, we --disable-colors-default by default. Patches do still apply. Thanks, applied, with a fixed URL. Michael Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- .../0001-__progname-redefinition-fix.patch | 0 patches/{util-linux-2.26 = util-linux-2.26.1}/series| 0 rules/util-linux-ng.make | 5 +++-- 3 files changed, 3 insertions(+), 2 deletions(-) rename patches/{util-linux-2.26 = util-linux-2.26.1}/0001-__progname-redefinition-fix.patch (100%) rename patches/{util-linux-2.26 = util-linux-2.26.1}/series (100%) diff --git a/patches/util-linux-2.26/0001-__progname-redefinition-fix.patch b/patches/util-linux-2.26.1/0001-__progname-redefinition-fix.patch similarity index 100% rename from patches/util-linux-2.26/0001-__progname-redefinition-fix.patch rename to patches/util-linux-2.26.1/0001-__progname-redefinition-fix.patch diff --git a/patches/util-linux-2.26/series b/patches/util-linux-2.26.1/series similarity index 100% rename from patches/util-linux-2.26/series rename to patches/util-linux-2.26.1/series diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index bcef93e..1828fcf 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_UTIL_LINUX_NG) += util-linux-ng # # Paths and names # -UTIL_LINUX_NG_VERSION:= 2.26 -UTIL_LINUX_NG_MD5:= 912c550a4e5c47c0ce9abd0733fa9a64 +UTIL_LINUX_NG_VERSION:= 2.26.1 +UTIL_LINUX_NG_MD5:= 2308850946766677f3fabe0685e85de8 UTIL_LINUX_NG:= util-linux-$(UTIL_LINUX_NG_VERSION) UTIL_LINUX_NG_SUFFIX := tar.xz UTIL_LINUX_NG_URL:= $(call ptx/mirror, KERNEL, utils/util-linux/v$(UTIL_LINUX_NG_VERSION)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX)) @@ -122,6 +122,7 @@ UTIL_LINUX_NG_CONF_OPT:= \ --disable-sulogin-emergency-mount \ --disable-makeinstall-chown \ --disable-makeinstall-setuid \ + --disable-colors-default \ --without-libiconv-prefix \ --without-libintl-prefix \ --without-selinux \ -- 2.1.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 09/10] libassuan: add license information
Thanks, applied. Michael On Fri, Mar 06, 2015 at 11:25:59AM +0100, Hubert Feurstein wrote: --- rules/libassuan.make | 4 1 file changed, 4 insertions(+) diff --git a/rules/libassuan.make b/rules/libassuan.make index 10d7ae3..97846c5 100644 --- a/rules/libassuan.make +++ b/rules/libassuan.make @@ -23,6 +23,10 @@ LIBASSUAN_SUFFIX := tar.bz2 LIBASSUAN_URL:= ftp://ftp.gnupg.org/gcrypt/libassuan/$(LIBASSUAN).$(LIBASSUAN_SUFFIX) LIBASSUAN_SOURCE := $(SRCDIR)/$(LIBASSUAN).$(LIBASSUAN_SUFFIX) LIBASSUAN_DIR:= $(BUILDDIR)/$(LIBASSUAN) +LIBASSUAN_LICENSE:= GPLv3, LGPLv2.1 +LIBASSUAN_LICENSE_FILES := \ + file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ + file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 # # Prepare -- 2.3.0 -- 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] libsoup requires host intltool
On Wed, Mar 25, 2015 at 07:14:35AM +, Matthias Fend wrote: libsoup seems to require host intltool to build Thanks, applied. Note that your mailer replaced all tabs with spaces, so I had to fix the patch. That's ok for this simple patch, but you should look into that for future patches. Michael Signed-off-by: matthias fend matthias.f...@wolfvision.net --- rules/libsoup.in |1 + 1 file changed, 1 insertion(+) diff --git a/rules/libsoup.in b/rules/libsoup.in index 72e18cc..f55428f 100644 --- a/rules/libsoup.in +++ b/rules/libsoup.in @@ -7,6 +7,7 @@ config LIBSOUP select LIBXML2 select LIBXML2_OUTPUT select LIBXML2_SAX1 + select HOST_INTLTOOL prompt libsoup help HTTP library implementation in C. -- 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] gnupg: fix build breakage if ICONV is not enabled
On Tue, Mar 17, 2015 at 10:02:36PM +0100, Andreas Pretzsch wrote: If PTXCONF_ICONV is not enabled, --without-libiconv-prefix is passed as configure option. Currently, this is done by adding the option to GNUPG_AUTOCONF, which causes ptxdist to abort with ptxdist: error: ptxd_make_world_init_compat: PKG_AUTOCONF is incompatible with PKG_CONF_OPT Fix this by adding it to GNUPG_CONF_OPT instead. Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- Attn.: Tested only with ptxdist-2014.05, but as the same logic applies in latest ptxdist, this should still work. Thanks, applied (It's already in ptxdist-2015.03.0). Michael rules/gnupg.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/gnupg.make b/rules/gnupg.make index 71e765e..67d6719 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -54,7 +54,7 @@ GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \ --disable-bzip2 ifndef PTXCONF_ICONV -GNUPG_AUTOCONF += --without-libiconv-prefix +GNUPG_CONF_OPT += --without-libiconv-prefix endif # -- 2.1.3 -- 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] barebox: careful handling of wildcard
On Sun, Mar 01, 2015 at 10:22:03PM +0100, Alexander Aring wrote: Some barebox images are not placed into barebox image directory, this will end in a failure of ls with the wildcard expression. Something like: ls: cannot access ..foobar.../barebox-2015.02.0/images/barebox-*.img: No such file or directory This patch will improve the handling with wildcard if no image is found by using find. Signed-off-by: Alexander Aring alex.ar...@gmail.com --- Please review carefully! I tested in my case with dropping targetinstall and add some dummy file into barebox image directory. Both cases works on my side (no file and some dummy barebox-*.img file). Also I can't no guarantee that the sequence of ls and find are the same and it looks like that the sequence is important because the: if [ ! -e $(IMAGEDIR)/barebox-image ]; then \ part. A general question would be is this always safe? What happens if somebody do an alias ls='ls $SORTOPTIONS' somewhere where $USED_SHELL source some general file? I suppose ptxdist has some mechanism to handle with something like that. Thanks, applied with a minor change: added 'sort' to keep the old order. (It's already in ptxdist-2015.03.0). Michael rules/barebox.make | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rules/barebox.make b/rules/barebox.make index 5c596a5..46d8e95 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -138,7 +138,9 @@ ifdef PTXCONF_BAREBOX_BAREBOXENV @$(call install_finish, barebox) endif @rm -f $(IMAGEDIR)/barebox-image - @for image in `ls $(BAREBOX_DIR)/images/barebox-*.img`; do \ + @find $(BAREBOX_DIR)/images/ -name barebox-*.img \ + | \ + while read image; do \ install -D -m644 $$image $(IMAGEDIR)/`basename $$image`; \ if [ ! -e $(IMAGEDIR)/barebox-image ]; then \ ln -sf `basename $$image` $(IMAGEDIR)/barebox-image; \ -- 2.3.0 -- 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 1/2] bash: Updated the bash shell to release 4.3.30
On Wed, Mar 04, 2015 at 12:09:36PM +0100, carsten.schl...@gmx.net wrote: 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 Thanks applied, with some changes: I removed to old upstream patches and added the new upstream patches. And I've marked BASH_SEP_HELPFILES as broken. There are some cross-compile issues there. If you need it, then it shouldn't be too hard to fix. Michael --- 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
Re: [ptxdist] [PATCH 2/2] curl: install root CA certificates option
On Fri, Jan 16, 2015 at 12:58:45PM +0100, Bruno Thomsen wrote: From: Bruno Thomsen b...@kamstrup.com Install a bundle of X.509 certificates of public Certificate Authorities (CA) in PEM format. The bundle is extracted from Mozilla's release tree by a host package called certdata. Test case 1: openssl s_client -connect www.google.com:443 -CAfile /usr/share/ca-certificates/curl/ca-bundle.crt Result: Verify return code: 0 (ok) Test case 2: openssl s_client -connect www.google.com:443 Result: Verify return code: 20 (unable to get local issuer certificate) Test case 3: curl https://www.google.com Result: HTMLHEAD... Test case 4: rm /usr/share/ca-certificates/curl/ca-bundle.crt curl https://www.google.com Result: curl: (77) error setting certificate verify locations: CAfile: /usr/share/ca-certificates/curl/ca-bundle.crt CApath: none Signed-off-by: Bruno Thomsen b...@kamstrup.com --- rules/libcurl.in | 18 -- rules/libcurl.make | 23 ++- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/rules/libcurl.in b/rules/libcurl.in index 0ad7fb4..11c3698 100644 --- a/rules/libcurl.in +++ b/rules/libcurl.in @@ -5,8 +5,10 @@ menuconfig LIBCURL prompt libcurl select LIBC_RT select ZLIB - select OPENSSL if LIBCURL_SSL - select LIBSSH2 if LIBCURL_LIBSSH2 + select HOST_SYSTEM_PERL if LIBCURL_CA_BUNDLE + select HOST_CERTDATAif LIBCURL_CA_BUNDLE + select OPENSSL if LIBCURL_SSL + select LIBSSH2 if LIBCURL_LIBSSH2 help curl is a command line tool for transferring files with URL syntax, supporting FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS and FILE. @@ -20,6 +22,18 @@ if LIBCURL config LIBCURL_CURL bool install curl program +config LIBCURL_CA_BUNDLE + bool install root CA certificates + help + Bundle of Root CA Certificates. + + This is a bundle of X.509 certificates of public Certificate Authorities (CA). + These were automatically extracted from Mozilla's root certificates + file (certdata.txt). + + It contains the certificates in PEM format and therefore + can be directly used with curl / libcurl / php_curl / strongswan. + config LIBCURL_HTTP bool http default y diff --git a/rules/libcurl.make b/rules/libcurl.make index 5babcb0..7f83ca4 100644 --- a/rules/libcurl.make +++ b/rules/libcurl.make @@ -62,7 +62,6 @@ LIBCURL_AUTOCONF := \ --without-gssapi \ --without-gnutls \ --without-nss \ - --without-ca-bundle \ --without-ca-path \ --without-libidn \ --without-axtls \ @@ -82,6 +81,25 @@ else LIBCURL_AUTOCONF += --without-ssl endif +ifdef PTXCONF_LIBCURL_CA_BUNDLE +LIBCURL_AUTOCONF += --with-ca-bundle=/usr/share/ca-certificates/curl/ca-bundle.crt +else +LIBCURL_AUTOCONF += --without-ca-bundle +endif + +# +# Compile +# + +$(STATEDIR)/libcurl.compile: + @$(call targetinfo) + +ifdef PTXCONF_LIBCURL_CA_BUNDLE + @cd $(HOST_CERTDATA_DIR) + @$(LIBCURL_DIR)/lib/mk-ca-bundle.pl -i -n -v $(LIBCURL_DIR)/ca-bundle.crt +endif This cannot work: 1. you removed the real compile, so nothing will be built 2. each line is separate, so the 'cd ...' is ignored. Also, do this in 'install' to avoid referencing LIBCURL_DIR in targetinstall: $(call world/install, LIBCURL) @cd $(PTXCONF_SYSROOT_HOST)/share/certdata $(LIBCURL_DIR)/lib/mk-ca-bundle.pl -i -n -v $(LIBCURL_PKGDIR)/usr/share/ca-certificates/curl/ca-bundle.crt Untested. You might need to create $(LIBCURL_PKGDIR)/usr/share/ca-certificates/curl/ first. + @$(call touch) + # # Target-Install # @@ -99,6 +117,9 @@ ifdef PTXCONF_LIBCURL_CURL @$(call install_copy, libcurl, 0, 0, 0755, -, /usr/bin/curl) endif @$(call install_lib, libcurl, 0, 0, 0644, libcurl) +ifdef PTXCONF_LIBCURL_CA_BUNDLE + @$(call install_copy, libcurl, 0, 0, 0444, $(LIBCURL_DIR)/ca-bundle.crt, /usr/share/ca-certificates/curl/ca-bundle.crt) @$(call install_copy, libcurl, 0, 0, 0444, -, \ /usr/share/ca-certificates/curl/ca-bundle.crt) Michael +endif @$(call install_finish, libcurl) -- 1.9.1 -- 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|
Re: [ptxdist] [PATCH 04/10] ethtool: version bump 3.0 - 3.18
On Fri, Mar 06, 2015 at 11:25:54AM +0100, Hubert Feurstein wrote: Signed-off-by: Hubert Feurstein h.feurst...@gmail.com Thanks, applied. Michael --- rules/ethtool.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/ethtool.make b/rules/ethtool.make index 0d74716..a9b936f 100644 --- a/rules/ethtool.make +++ b/rules/ethtool.make @@ -17,9 +17,9 @@ PACKAGES-$(PTXCONF_ETHTOOL) += ethtool # # Paths and names # -ETHTOOL_VERSION := 3.0 -ETHTOOL_MD5 := cb129398cbbf39859901b55ecac101da -ETHTOOL_SUFFIX := tar.bz2 +ETHTOOL_VERSION := 3.18 +ETHTOOL_MD5 := fbf1a167b88a5966a2c56a2483af68c6 +ETHTOOL_SUFFIX := tar.xz ETHTOOL := ethtool-$(ETHTOOL_VERSION) ETHTOOL_URL := $(call ptx/mirror, KERNEL, ../software/network/ethtool/$(ETHTOOL).$(ETHTOOL_SUFFIX)) ETHTOOL_SOURCE := $(SRCDIR)/$(ETHTOOL).$(ETHTOOL_SUFFIX) -- 2.3.0 -- 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 06/10] libksba: version bump 1.0.7 - 1.3.2
On Fri, Mar 06, 2015 at 11:25:56AM +0100, Hubert Feurstein wrote: Signed-off-by: Hubert Feurstein h.feurst...@gmail.com Thanks, applied. Michael --- rules/libksba.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libksba.make b/rules/libksba.make index 3a3efae..fb22d44 100644 --- a/rules/libksba.make +++ b/rules/libksba.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBKSBA) += libksba # # Paths and names # -LIBKSBA_VERSION := 1.0.7 -LIBKSBA_MD5 := eebce521a90600369c33c5fa6b9bbbd8 +LIBKSBA_VERSION := 1.3.2 +LIBKSBA_MD5 := c3c9a66e22d87fe3ae59865250b8a09c LIBKSBA := libksba-$(LIBKSBA_VERSION) LIBKSBA_SUFFIX := tar.bz2 LIBKSBA_URL := ftp://ftp.gnupg.org/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX) -- 2.3.0 -- 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 05/10] ethtool: add license information
On Fri, Mar 06, 2015 at 11:25:55AM +0100, Hubert Feurstein wrote: Signed-off-by: Hubert Feurstein h.feurst...@gmail.com Thanks, applied. Michael --- rules/ethtool.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/ethtool.make b/rules/ethtool.make index a9b936f..47bf8b2 100644 --- a/rules/ethtool.make +++ b/rules/ethtool.make @@ -25,6 +25,8 @@ ETHTOOL_URL := $(call ptx/mirror, KERNEL, ../software/network/ethtool/$(ETHTOOL) ETHTOOL_SOURCE := $(SRCDIR)/$(ETHTOOL).$(ETHTOOL_SUFFIX) ETHTOOL_DIR := $(BUILDDIR)/$(ETHTOOL) ETHTOOL_LICENSE := GPLv2 +ETHTOOL_LICENSE_FILES:= \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 # # Prepare -- 2.3.0 -- 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 01/10] chrony: version bump 1.29 - 1.31
On Fri, Mar 06, 2015 at 11:25:51AM +0100, Hubert Feurstein wrote: Signed-off-by: Hubert Feurstein h.feurst...@gmail.com Thanks, applied. Michael --- rules/chrony.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/chrony.make b/rules/chrony.make index 4b8bef5..140f468 100644 --- a/rules/chrony.make +++ b/rules/chrony.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_CHRONY) += chrony # # Paths and names # -CHRONY_VERSION := 1.29 -CHRONY_MD5 := 6e1a8ee2ce6632bedc2f8b5cdccfa69f +CHRONY_VERSION := 1.31 +CHRONY_MD5 := 04ab702fc81150db06809562a9aaed92 CHRONY := chrony-$(CHRONY_VERSION) CHRONY_SUFFIX:= tar.gz CHRONY_URL := http://download.tuxfamily.org/chrony/$(CHRONY).$(CHRONY_SUFFIX) -- 2.3.0 -- 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 1/2] host-certdata: root CA certificate bundle downloader
On Wed, Mar 18, 2015 at 11:56:33AM +, Bruno Thomsen wrote: Ping.. Are there any outstanding issues with this patch series? Sorry, it got lost. I've replied now. 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] gnupg: targetinstall: make gpg/gpg2 and gpgv2 selectable
On Tue, Mar 17, 2015 at 10:03:36PM +0100, Andreas Pretzsch wrote: Add new config options for targetinstall: GNUPG_GPG : Install gpg2 + symlink gpg = gpg2 GNUPG_GPGV : Install gpgv2 Signed-off-by: Andreas Pretzsch a...@cn-eng.de Cc: Philipp Zabel p.za...@pengutronix.de --- Based on a preliminary modification by Philipp Zabel. Option names might be debatable. Also default y might make sense. Please adapt or come back to me for a V2. Thanks, applied (It's already in ptxdist-2015.03.0). I've left it as is, but added a migrate helper to enable GNUPG_GPG during migrate. Michael rules/gnupg.in | 12 rules/gnupg.make | 5 + 2 files changed, 17 insertions(+) diff --git a/rules/gnupg.in b/rules/gnupg.in index 1f6c150..9539ff8 100644 --- a/rules/gnupg.in +++ b/rules/gnupg.in @@ -15,3 +15,15 @@ config GNUPG GnuPG is a set of programs for public key encryption and digital signatures. The program most users will want to use is the OpenPGP command line tool, named gpg. + +if GNUPG + +config GNUPG_GPG + bool + prompt Install gpg2 + symlink gpg = gpg2 + +config GNUPG_GPGV + bool + prompt Install gpgv2 + +endif diff --git a/rules/gnupg.make b/rules/gnupg.make index 67d6719..7f0270e 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -70,8 +70,13 @@ $(STATEDIR)/gnupg.targetinstall: @$(call install_fixup, gnupg,AUTHOR,Jiri Nesladek nesla...@2n.cz) @$(call install_fixup, gnupg,DESCRIPTION,missing) +ifdef PTXCONF_GNUPG_GPG @$(call install_copy, gnupg, 0, 0, 0755, -, /usr/bin/gpg2) @$(call install_link, gnupg, gpg2, /usr/bin/gpg) +endif +ifdef PTXCONF_GNUPG_GPGV + @$(call install_copy, gnupg, 0, 0, 0755, -, /usr/bin/gpgv2) +endif @$(call install_finish, gnupg) -- 2.1.3 -- 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] hackbench: remove obsolete package
On Mon, Mar 23, 2015 at 08:59:42AM +0100, Robert Schwebel wrote: Michael, On Mon, Mar 23, 2015 at 08:52:00AM +0100, Robert Schwebel wrote: +# +# from : ptxdist-2015.02.0 +# to : ptxdist-2015.03.0 +# symbol : HACKBENCH - RT_TESTS_HACKBENCH +# reason : old tool obsolete, new version is from rt-tests +# +s/^\(\(# \)PTXCONF_\)HACKBENCH/\1RT_TESTS_HACKBENCH/ +s/^PTXCONF_HACKBENCH=\([ym]\)/PTXCONF_RT_TESTS_HACKBENCH=y\nPTXCONF_RT_TESTS=\1/ I tried the trick you suggested, but I'm still not entirely happy: - I get a warning during migration: .config:2062:warning: override: reassigning to symbol RT_TESTS_HACKBENCH It' only happens once during migrate, and that's ok. - There are still cases of RT_TESTS already being set to either y or m where the migration helper does the wrong thing. Better ideas, anyone? I've simplified it a bit while applying, broke it and fixed it again. It works as I would expect it: RT_TESTS will remain as is, when it's already enabled. I don't think anything else makes sense. 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] bash: Renamed option to avoid problem with bash-completion package
On Wed, Mar 04, 2015 at 12:09:37PM +0100, carsten.schl...@gmx.net wrote: 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. Thanks, applied with an added migrate helper. Michael 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 -- 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] Problems building libnl3
On Wed, Mar 25, 2015 at 09:21:32AM -0400, Jon Ringle wrote: On Tue, Jan 27, 2015 at 11:22 PM, Jon Ringle j...@ringle.org wrote: On Mon, Jan 26, 2015 at 8:44 AM, Michael Olbrich m.olbr...@pengutronix.de wrote: On Wed, Jan 21, 2015 at 02:22:26PM -0500, Jon Ringle wrote: After updating to ptxdist-2015-01.0, I am having a problem build libnl3. I tried rebuilding host-flex, hoping this might do the trick, but it did not help. Any ideas? Jon -- target: libnl3.compile -- make[1]: Entering directory `/home/local/GRIDPOINT/jringle/code/gpec/ec1k-rootfs/platform-EC1K/build-target/libnl-3.2.25' Making all in include make[2]: Entering directory `/home/local/GRIDPOINT/jringle/code/gpec/ec1k-rootfs/platform-EC1K/build-target/libnl-3.2.25/include' make[2]: Nothing to be done for `all'. make[2]: Leaving directory `/home/local/GRIDPOINT/jringle/code/gpec/ec1k-rootfs/platform-EC1K/build-target/libnl-3.2.25/include' Making all in lib make[2]: Entering directory `/home/local/GRIDPOINT/jringle/code/gpec/ec1k-rootfs/platform-EC1K/build-target/libnl-3.2.25/lib' Is this from a clean build? I see some more stuff here: GEN route/cls/ematch_grammar.c GEN route/cls/ematch_syntax.c GEN route/pktloc_grammar.c GEN route/pktloc_syntax.c Can you send the output from ptxdist clean libnl3 ; ptxdist -v compile libnl3? Maybe we can see some more stuff there. $ ptxdist clean libnl3 ; ptxdist -v compile libnl3 [...] ptxdist: executing: PATH=/home/local/GRIDPOINT/jringle/code/gpec/ec1k-rootfs/platform-EC1K/sysroot-cross/bin:/home/local/GRIDPOINT/jringle/code/gpec/ec1k-rootfs/platform-EC1K/sysroot-cross/sbin:\/home/local/GRIDPOINT/jringle/code/gpec/ec1k-rootfs/platform-EC1K/sysroot-host/lib/wrapper:/home/local/GRIDPOINT/jringle/code/gpec/ec1k-rootfs/platform-EC1K/sysroot-host/bin:/home/local/GRIDPOINT/jringle/code/gpec/ec1k-rootfs/platform-EC1K/sysroot-host/sbin:/home/local/GRIDPOINT/jringle/code/gpec/ec1k-rootfs/selected_toolchain:/usr/local/lib/ptxdist-2015.03.0_GP/bin:/home/local/GRIDPOINT/jringle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/opt/OSELAS.Toolchain-2013.12.1/arm-v5te-linux-gnueabi/gcc-4.8.2-glibc-2.18-binutils-2.24-kernel-3.12-sanitized/bin:/opt/arm-2009q1/bin [...] make[2]: Entering directory `/home/local/GRIDPOINT/jringle/code/gpec/ec1k-rootfs/platform-EC1K/build-target/libnl-3.2.25/lib' /usr/local/lib/ptxdist-2015.03.0_GP/bin/mkdir -p route/cls; flex --header-file=route/cls/ematch_grammar.h -o route/cls/ematch_grammar.c route/cls/ematch_grammar.l /usr/local/lib/ptxdist-2015.03.0_GP/bin/mkdir -p route/cls; bison -y -d -o route/cls/ematch_syntax.c route/cls/ematch_syntax.y /usr/local/lib/ptxdist-2015.03.0_GP/bin/mkdir -p route; flex --header-file=route/pktloc_grammar.h -o route/pktloc_grammar.c route/pktloc_grammar.l /usr/local/lib/ptxdist-2015.03.0_GP/bin/mkdir -p route; bison -y -d -o route/pktloc_syntax.c route/pktloc_syntax.y flex: fatal internal error, exec failed flex: fatal internal error, exec failed If I read the code correctly, then flex is trying to execute 'm4' here. Maybe that's missing? Michael make[2]: *** [route/pktloc_grammar.c] Error 141 make[2]: *** Waiting for unfinished jobs flex: fatal internal error, exec failed flex: fatal internal error, exec failed make[2]: *** [route/cls/ematch_grammar.c] Error 141 make[2]: Leaving directory `/home/local/GRIDPOINT/jringle/code/gpec/ec1k-rootfs/platform-EC1K/build-target/libnl-3.2.25/lib' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/local/GRIDPOINT/jringle/code/gpec/ec1k-rootfs/platform-EC1K/build-target/libnl-3.2.25' make: *** [/home/local/GRIDPOINT/jringle/code/gpec/ec1k-rootfs/platform-EC1K/state/libnl3.compile] Error 2 -- 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 1/2] host-certdata: root CA certificate bundle downloader
Hi, sorry for the late reply. On Fri, Jan 16, 2015 at 12:58:44PM +0100, Bruno Thomsen wrote: From: Bruno Thomsen b...@kamstrup.com Added a new host dummy package that download a specific firefox bundle of root CA certificates. This functionality is used by libcurl package. Signed-off-by: Bruno Thomsen b...@kamstrup.com --- rules/host-certdata.in | 5 + rules/host-certdata.make | 57 2 files changed, 62 insertions(+) create mode 100644 rules/host-certdata.in create mode 100644 rules/host-certdata.make diff --git a/rules/host-certdata.in b/rules/host-certdata.in new file mode 100644 index 000..087f34c --- /dev/null +++ b/rules/host-certdata.in @@ -0,0 +1,5 @@ +## SECTION=hosttools_noprompt + +config HOST_CERTDATA + tristate + diff --git a/rules/host-certdata.make b/rules/host-certdata.make new file mode 100644 index 000..0bdccc4 --- /dev/null +++ b/rules/host-certdata.make @@ -0,0 +1,57 @@ +# -*-makefile-*- +# +# Copyright (C) 2015 by Bruno Thomsen b...@kamstrup.com +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_CERTDATA) += host-certdata + +# +# Paths and names +# +FIREFOX_MAJOR_VERSION:= 33 +FIREFOX_MINOR_VERSION:= 0 +HOST_CERTDATA_VERSION:= $(FIREFOX_MAJOR_VERSION)_$(FIREFOX_MINOR_VERSION) +HOST_CERTDATA_MD5:= c9a187ce3bcd6d5ee1f8f5f531cf97f9 +HOST_CERTDATA:= certdata +HOST_CERTDATA_SUFFIX := txt +HOST_CERTDATA_URL:= \ + http://hg.mozilla.org/releases/mozilla-release/raw-file/FIREFOX_$(HOST_CERTDATA_VERSION)_RELEASE/security/nss/lib/ckfw/builtins/$(HOST_CERTDATA).$(HOST_CERTDATA_SUFFIX) +HOST_CERTDATA_SOURCE := $(SRCDIR)/$(HOST_CERTDATA).$(HOST_CERTDATA_SUFFIX) +HOST_CERTDATA_DIR:= $(HOST_BUILDDIR)/$(HOST_CERTDATA)-$(HOST_CERTDATA_VERSION) Remove this line. + +# +# Extract +# + +$(STATEDIR)/host-certdata.extract: + @$(call targetinfo) + @$(call clean, $(HOST_CERTDATA_DIR)) Remove this line. + @mkdir -p $(HOST_CERTDATA_DIR) + @cp $(HOST_CERTDATA_SOURCE) $(HOST_CERTDATA_DIR) Move this to host-certdata.install and use $(HOST_CERTDATA_PKGDIR)/share/certdata/ We prefer to avoid referencing PKG_DIRs from other packages. + @$(call touch) + +# +# Compile +# + +$(STATEDIR)/host-certdata.compile: + @$(call targetinfo) + @$(call touch) + +# +# Install +# + +$(STATEDIR)/host-certdata.install: + @$(call targetinfo) + @$(call touch) + +# vim: syntax=make -- 1.9.1 -- 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] (no subject)
On Fri, Feb 27, 2015 at 09:24:20AM +, Rüdiger, Christoph wrote: On Fri, Feb 27, 2015 at 08:48:42AM +, Rüdiger, Christoph wrote: Am 26.02.15 um 13:23 schrieb Michael Olbrich: On Tue, Feb 24, 2015 at 09:28:29PM +, Rüdiger, Christoph wrote: Am 23.02.15 um 12:24 schrieb Michael Olbrich: On Mon, Feb 23, 2015 at 09:13:56AM +, Rüdiger, Christoph wrote: On Mon, Feb 23, 2015 at 01:38:40AM +0200, Anders Montonen wrote: You need to install a lot of GNU tools from exteranl sources (homebrew, MacPorts, Fink), so I do not see any problem in including bash into this list. My bigger problem is now, that there is no GNU linker available on OS X, so you need to use the LLVM linker which does not understand the -Wl,--as-needed flag. I need to dig deeper to understand since when GNU gcc set this flag by default and what the drawback is, if we remove this flag from the PTXDIST_HOST_LDFLAGS. Hmm, -Wl,--as-needed should not be added implicitly and ptxdist should only add it for target packages if PTXCONF_TARGET_LINKER_AS_NEEDED is set. You are right. I just cross-read an article and got the information wrong. According to the GNU ld man page [1], --as-needed affects the DT_NEEDED flag only of dynamic libraries given _after_ --as-needed. As ptxdist sets it as the very last flag (see below), it is a useless flag. Which ptxdist version are you using? For this project, I need to stick with ptxdist-2013.12.0 for building OSELAS toolchain 2013.12.2. At least for target packages we set it in the right place. For me it looks like this: [...] wrapper: /usr/bin/icecc arm-v7a-linux-gnueabihf-gcc -Wl,--as-needed -isystem [...]/platform-arm-hf/sysroot-target/include -isystem [...]/platform-arm-hf/sysroot-target/usr/include -O3 -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN -o minigzip minigzip.o -L. libz.a -L[...]/platform-arm-hf/sysroot-target/lib -L[...]/platform-arm-hf/sysroot-target/usr/lib -Wl,-rpath-link -Wl,[...]/platform-arm-hf/sysroot-target/lib -Wl,-rpath-link -Wl,[...]/platform-arm-hf/sysroot-target/usr/lib [...] The wrapper script adds it before the other options. If you start ptxdist with '-v' then all calls to the compiler and linker are logged. Look for lines starting with 'wrapper:' in the logfile. wrapper: gcc -isystem /Volumes/BlueBox/src/OSELAS.Toolchain-2013.12.2/platform-arm- cortex a8-linux-gnueabihf-gcc-4.8.3-glibc-2.18-binutils-2.24-kernel-3.12-s anitized/sysroot-host/include -O3 -DNO_FSEEKO -DNO_STRERROR -DNO_vsnprintf -o minigzip minigzip.o -L. libz.a -L/Volumes/BlueBox/src/OSELAS.Toolchain-2013.12.2/platform-arm- cort exa8-linux-gnueabihf-gcc-4.8.3-glibc-2.18-binutils-2.24-kernel-3.12 -sanitized/sysroot-host/lib -Wl,-rpath -Wl,/Volumes/BlueBox/src/OSELAS.Toolchain-2013.12.2/platform-arm- co rtexa8-linux-gnueabihf-gcc-4.8.3-glibc-2.18-binutils-2.24-kernel-3. 12-sanitized/sysroot-host/lib -Wl,-rpath -Wl,/this/is/a/long/path/to/make/host/tools/relocateable/with/chrpa th/when/using/dev/packages -Wl,--as-needed I'm not sure where the -Wl,--as-needed is comming from. The only thing that is added at the end of the command-line is PTXDIST_HOST_LDFLAGS and that's just the -L / -Wl,-rpath stuff. I've performed a simple grep and stripped out the wrapper and exec lines from the logfiles. This grep searched in the installed ptxdist, the ptxdist sources and the OSELAS sources, as I'm not quite sure, if it is coming from ptxdist or OSELAS toolchain project. But I tend to blame ptxdist ;-) Remember: The compilation of host-zlib within the OSELAS toolchain project fails. $ grep -r -- '-Wl,--as-needed' * [...] src/OSELAS.Toolchain- 2013.12.2/rules/pre/toolchain.make:PTXDIST_HOST_LDFLAGS += -Wl,--as-needed [...] Here is the source of your problem. I originally added this because it some really unnecessary dependencies for something in the toolchain. Maybe we can only add it for the GNU ld? I'm not quite sure how to test for this, because we need to check the linker called by the host compiler which may not be 'ld'. The LLVM linker is also called 'ld'. We need to check for the version string, which contains either LLVM or GNU. If somebody can point me to a few places where to add this check, I can write something in the beginning of next week. But it might not be the 'ld' in $PATH. So probably something like this is necessary: `gcc -print-prog-name=ld` -v | grep -q GNU 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-
Re: [ptxdist] (no subject)
On Fri, Feb 27, 2015 at 08:48:42AM +, Rüdiger, Christoph wrote: Am 26.02.15 um 13:23 schrieb Michael Olbrich: On Tue, Feb 24, 2015 at 09:28:29PM +, Rüdiger, Christoph wrote: Am 23.02.15 um 12:24 schrieb Michael Olbrich: On Mon, Feb 23, 2015 at 09:13:56AM +, Rüdiger, Christoph wrote: On Mon, Feb 23, 2015 at 01:38:40AM +0200, Anders Montonen wrote: You need to install a lot of GNU tools from exteranl sources (homebrew, MacPorts, Fink), so I do not see any problem in including bash into this list. My bigger problem is now, that there is no GNU linker available on OS X, so you need to use the LLVM linker which does not understand the -Wl,--as-needed flag. I need to dig deeper to understand since when GNU gcc set this flag by default and what the drawback is, if we remove this flag from the PTXDIST_HOST_LDFLAGS. Hmm, -Wl,--as-needed should not be added implicitly and ptxdist should only add it for target packages if PTXCONF_TARGET_LINKER_AS_NEEDED is set. You are right. I just cross-read an article and got the information wrong. According to the GNU ld man page [1], --as-needed affects the DT_NEEDED flag only of dynamic libraries given _after_ --as-needed. As ptxdist sets it as the very last flag (see below), it is a useless flag. Which ptxdist version are you using? For this project, I need to stick with ptxdist-2013.12.0 for building OSELAS toolchain 2013.12.2. At least for target packages we set it in the right place. For me it looks like this: [...] wrapper: /usr/bin/icecc arm-v7a-linux-gnueabihf-gcc -Wl,--as-needed -isystem [...]/platform-arm-hf/sysroot-target/include -isystem [...]/platform-arm-hf/sysroot-target/usr/include -O3 -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN -o minigzip minigzip.o -L. libz.a -L[...]/platform-arm-hf/sysroot-target/lib -L[...]/platform-arm-hf/sysroot-target/usr/lib -Wl,-rpath-link -Wl,[...]/platform-arm-hf/sysroot-target/lib -Wl,-rpath-link -Wl,[...]/platform-arm-hf/sysroot-target/usr/lib [...] The wrapper script adds it before the other options. If you start ptxdist with '-v' then all calls to the compiler and linker are logged. Look for lines starting with 'wrapper:' in the logfile. wrapper: gcc -isystem /Volumes/BlueBox/src/OSELAS.Toolchain-2013.12.2/platform-arm-cortexa8-linux-gnueabihf-gcc-4.8.3-glibc-2.18-binutils-2.24-kernel-3.12-sanitized/sysroot-host/include -O3 -DNO_FSEEKO -DNO_STRERROR -DNO_vsnprintf -o minigzip minigzip.o -L. libz.a -L/Volumes/BlueBox/src/OSELAS.Toolchain-2013.12.2/platform-arm-cortexa8-linux-gnueabihf-gcc-4.8.3-glibc-2.18-binutils-2.24-kernel-3.12-sanitized/sysroot-host/lib -Wl,-rpath -Wl,/Volumes/BlueBox/src/OSELAS.Toolchain-2013.12.2/platform-arm-cortexa8-linux-gnueabihf-gcc-4.8.3-glibc-2.18-binutils-2.24-kernel-3.12-sanitized/sysroot-host/lib -Wl,-rpath -Wl,/this/is/a/long/path/to/make/host/tools/relocateable/with/chrpath/when/using/dev/packages -Wl,--as-needed I'm not sure where the -Wl,--as-needed is comming from. The only thing that is added at the end of the command-line is PTXDIST_HOST_LDFLAGS and that's just the -L / -Wl,-rpath stuff. I've performed a simple grep and stripped out the wrapper and exec lines from the logfiles. This grep searched in the installed ptxdist, the ptxdist sources and the OSELAS sources, as I'm not quite sure, if it is coming from ptxdist or OSELAS toolchain project. But I tend to blame ptxdist ;-) Remember: The compilation of host-zlib within the OSELAS toolchain project fails. $ grep -r -- '-Wl,--as-needed' * [...] src/OSELAS.Toolchain-2013.12.2/rules/pre/toolchain.make:PTXDIST_HOST_LDFLAGS += -Wl,--as-needed [...] Here is the source of your problem. I originally added this because it some really unnecessary dependencies for something in the toolchain. Maybe we can only add it for the GNU ld? I'm not quite sure how to test for this, because we need to check the linker called by the host compiler which may not be 'ld'. 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] (no subject)
On Mon, Feb 23, 2015 at 09:13:56AM +, Rüdiger, Christoph wrote: On Mon, Feb 23, 2015 at 01:38:40AM +0200, Anders Montonen wrote: On 22 Feb 2015, at 21:17, Christoph Rüdiger christoph.ruediger@rwth- aachen.de wrote: Am 22.02.15 um 10:38 schrieb Michael Olbrich: I don't know why the bash in Max OS X cannot handle this. Maybe it's too old? What version are you using? Your assumption is right. My OS X is 10.9.5 (Mavericks) and way newer than the Ubuntu 10.04.4 which is the oldest system where I use ptxdist for my day-to-day work. That's why I didn't took the version numbers into account. But I was wrong: Ubuntu 10.04.4: bash 4.1.5(1)-release OS X 10.9.5: bash 3.2.53(1)-release As you might have guessed, Bash 3.2 was the last version to be released under the GPLv2 license, and Apple will not distribute any software covered by GPLv3. So you'll be stuck with the old version. Let's see if we can stay compatible. You need to install a lot of GNU tools from exteranl sources (homebrew, MacPorts, Fink), so I do not see any problem in including bash into this list. My bigger problem is now, that there is no GNU linker available on OS X, so you need to use the LLVM linker which does not understand the -Wl,--as-needed flag. I need to dig deeper to understand since when GNU gcc set this flag by default and what the drawback is, if we remove this flag from the PTXDIST_HOST_LDFLAGS. Hmm, -Wl,--as-needed should not be added implicitly and ptxdist should only add it for target packages if PTXCONF_TARGET_LINKER_AS_NEEDED is set. If you start ptxdist with '-v' then all calls to the compiler and linker are logged. Look for lines starting with 'wrapper:' in the logfile. 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] (no subject)
On Sat, Feb 21, 2015 at 11:07:55PM +, Rüdiger, Christoph wrote: I'm trying to use ptxdist on a Mac OS X system to get rid of the Linux VM just for compiling things. Here is the thing I stumbled upon because I don't get the intention and therefore struggle to find a patch. The git commit 0dc57566bc5a25d2b086de333844a3c00addf0e4 from 2012-12-13 changed the body of the ptxd_make_log() function in scripts/libptxdist.sh from this implementation -ptxd_make_log() { - # - # fd3 == stdout to logfile - # fd4 == stderr to logfile - # fd5 == clean stdout - # fd6 == clean stderr - # - { - export PTXDIST_FD_STDOUT=5 - export PTXDIST_FD_STDERR=6 - export PTXDIST_FD_LOGFILE=7 - { - if [ -z ${PTXDIST_QUIET} ]; then - ptxd_make ${@} 4- | - # make's stdout on fd0 - tee -a ${PTX_LOGFILE} 24 4- 5- 6- - check_pipe_status || return - else - exec 4- - ptxd_make ${@} 1 ${PTX_LOGFILE} - fi - } 21 13 3- 7 ${PTX_LOGFILE} | - # make's stderr on fd0 - tee -a ${PTX_LOGFILE} 12 3- 4- 5- 6- - check_pipe_status || return - } 31 42 51 62 -} to this implementation +ptxd_make_log() {( + # stdout only + exec {PTXDIST_FD_STDOUT}1 + # stderr only + exec {PTXDIST_FD_STDERR}2 + # logfile only + exec 9 ${PTX_LOGFILE} + export PTXDIST_FD_STDOUT + export PTXDIST_FD_STDERR + export PTXDIST_FD_LOGFILE=9 + + if [ -z ${PTXDIST_QUIET} ]; then + # stdout and logfile + exec {logout} (tee -a ${PTX_LOGFILE}) + else + # logfile only + exec {logout} ${PTX_LOGFILE} + fi + # stderr and logfile + exec {logerr} (tee -a ${PTX_LOGFILE} 2) + + ptxd_make ${@} 1${logout} 2${logerr} +)} Now, my bash is complaining at the first exec command: exec: {PTXDIST_FD_STDOUT}: not found To me, it looks fully understandable, because {PTXDIST_FD_STDOUT} is an ill-formed brace expansion and is therefore ignored. But why is the Linux (Ubuntu 12.04) not complaining about? What is the intention of this brace usage here? It's valid bash syntax. A bit of history here: The standard for sh shells says, that the file descriptors up to 9 can be used inside the shell scripts. So that's what we used originally: With 51 we create a file descriptor that we can later use to write to stdout when the normal stdout is redirected to the log file. However this solution as a problem: oder scripts can use the same file descriptor numbers and the output is send to the wrong place. This happened e.g. with configure scripts. So we changed it to: exec {PTXDIST_FD_STDOUT}1. This is valid in bash and means that a new file descriptor is opened (with a currently unused number = 10) and anything written to it is send to stdout. The file descriptor number is stored in the specified variable (PTXDIST_FD_STDOUT). I don't know why the bash in Max OS X cannot handle this. Maybe it's too old? What version are you using? Maybe something like this works: exec 71 exec 81 export PTXDIST_FD_STDOUT=7 export PTXDIST_FD_STDERR=8 Regards, 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] (no subject)
On Mon, Feb 23, 2015 at 01:38:40AM +0200, Anders Montonen wrote: On 22 Feb 2015, at 21:17, Christoph Rüdiger christoph.ruedi...@rwth-aachen.de wrote: Am 22.02.15 um 10:38 schrieb Michael Olbrich: I don't know why the bash in Max OS X cannot handle this. Maybe it's too old? What version are you using? Your assumption is right. My OS X is 10.9.5 (Mavericks) and way newer than the Ubuntu 10.04.4 which is the oldest system where I use ptxdist for my day-to-day work. That's why I didn't took the version numbers into account. But I was wrong: Ubuntu 10.04.4: bash 4.1.5(1)-release OS X 10.9.5: bash 3.2.53(1)-release As you might have guessed, Bash 3.2 was the last version to be released under the GPLv2 license, and Apple will not distribute any software covered by GPLv3. So you'll be stuck with the old version. Let's see if we can stay compatible. Christoph: does the exec with explicit fd numbers work? And what's the output of set | grep BASH_VERSINFO for the old bash? 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] (no subject)
On Tue, Feb 24, 2015 at 09:28:29PM +, Rüdiger, Christoph wrote: Am 23.02.15 um 12:24 schrieb Michael Olbrich: On Mon, Feb 23, 2015 at 09:13:56AM +, Rüdiger, Christoph wrote: On Mon, Feb 23, 2015 at 01:38:40AM +0200, Anders Montonen wrote: On 22 Feb 2015, at 21:17, Christoph Rüdiger christoph.ruediger@rwth- aachen.de wrote: Am 22.02.15 um 10:38 schrieb Michael Olbrich: I don't know why the bash in Max OS X cannot handle this. Maybe it's too old? What version are you using? Your assumption is right. My OS X is 10.9.5 (Mavericks) and way newer than the Ubuntu 10.04.4 which is the oldest system where I use ptxdist for my day-to-day work. That's why I didn't took the version numbers into account. But I was wrong: Ubuntu 10.04.4: bash 4.1.5(1)-release OS X 10.9.5: bash 3.2.53(1)-release As you might have guessed, Bash 3.2 was the last version to be released under the GPLv2 license, and Apple will not distribute any software covered by GPLv3. So you'll be stuck with the old version. Let's see if we can stay compatible. You need to install a lot of GNU tools from exteranl sources (homebrew, MacPorts, Fink), so I do not see any problem in including bash into this list. My bigger problem is now, that there is no GNU linker available on OS X, so you need to use the LLVM linker which does not understand the -Wl,--as-needed flag. I need to dig deeper to understand since when GNU gcc set this flag by default and what the drawback is, if we remove this flag from the PTXDIST_HOST_LDFLAGS. Hmm, -Wl,--as-needed should not be added implicitly and ptxdist should only add it for target packages if PTXCONF_TARGET_LINKER_AS_NEEDED is set. You are right. I just cross-read an article and got the information wrong. According to the GNU ld man page [1], --as-needed affects the DT_NEEDED flag only of dynamic libraries given _after_ --as-needed. As ptxdist sets it as the very last flag (see below), it is a useless flag. Which ptxdist version are you using? At least for target packages we set it in the right place. For me it looks like this: [...] wrapper: /usr/bin/icecc arm-v7a-linux-gnueabihf-gcc -Wl,--as-needed -isystem [...]/platform-arm-hf/sysroot-target/include -isystem [...]/platform-arm-hf/sysroot-target/usr/include -O3 -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN -o minigzip minigzip.o -L. libz.a -L[...]/platform-arm-hf/sysroot-target/lib -L[...]/platform-arm-hf/sysroot-target/usr/lib -Wl,-rpath-link -Wl,[...]/platform-arm-hf/sysroot-target/lib -Wl,-rpath-link -Wl,[...]/platform-arm-hf/sysroot-target/usr/lib [...] The wrapper script adds it before the other options. If you start ptxdist with '-v' then all calls to the compiler and linker are logged. Look for lines starting with 'wrapper:' in the logfile. wrapper: gcc -isystem /Volumes/BlueBox/src/OSELAS.Toolchain-2013.12.2/platform-arm-cortexa8-linux-gnueabihf-gcc-4.8.3-glibc-2.18-binutils-2.24-kernel-3.12-sanitized/sysroot-host/include -O3 -DNO_FSEEKO -DNO_STRERROR -DNO_vsnprintf -o minigzip minigzip.o -L. libz.a -L/Volumes/BlueBox/src/OSELAS.Toolchain-2013.12.2/platform-arm-cortexa8-linux-gnueabihf-gcc-4.8.3-glibc-2.18-binutils-2.24-kernel-3.12-sanitized/sysroot-host/lib -Wl,-rpath -Wl,/Volumes/BlueBox/src/OSELAS.Toolchain-2013.12.2/platform-arm-cortexa8-linux-gnueabihf-gcc-4.8.3-glibc-2.18-binutils-2.24-kernel-3.12-sanitized/sysroot-host/lib -Wl,-rpath -Wl,/this/is/a/long/path/to/make/host/tools/relocateable/with/chrpath/when/using/dev/packages -Wl,--as-needed I'm not sure where the -Wl,--as-needed is comming from. The only thing that is added at the end of the command-line is PTXDIST_HOST_LDFLAGS and that's just the -L / -Wl,-rpath stuff. And here is the missing BASH_VERSINFO of Apple's bash: $ set | grep BASH_VERSINFO BASH_VERSINFO=([0]=3 [1]=2 [2]=53 [3]=1 [4]=release [5]=x86_64-apple-darwin13) So we could check for the version. 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 1/1] bonnie++: Bump to version 1.97
On Tue, Apr 21, 2015 at 11:44:41AM +0200, Alexander Stein wrote: This version needs a patch for configure as it fails when cross compiling. We don't patch configure scripts. You can tell AC_TRY_RUN what to do when cross-compiling. Either use that to disable this (I think it's the large file check, right?) or wrap the whole check in a AC_CACHE_CHECK and set the correct value in the environment. And then add a autogen.sh link to the patches (like many other packages in ptxdist). Michael Signed-off-by: Alexander Stein alexander.st...@systec-electronic.com --- ...igure-Don-t-bail-out-when-cross-compiling.patch | 27 ++ patches/bonnie++-1.97/series | 4 rules/bonniexx.make| 6 ++--- 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 patches/bonnie++-1.97/0001-configure-Don-t-bail-out-when-cross-compiling.patch create mode 100644 patches/bonnie++-1.97/series diff --git a/patches/bonnie++-1.97/0001-configure-Don-t-bail-out-when-cross-compiling.patch b/patches/bonnie++-1.97/0001-configure-Don-t-bail-out-when-cross-compiling.patch new file mode 100644 index 000..45a6e72 --- /dev/null +++ b/patches/bonnie++-1.97/0001-configure-Don-t-bail-out-when-cross-compiling.patch @@ -0,0 +1,27 @@ +From: Alexander Stein alexander.st...@systec-electronic.com +Date: Tue, 21 Apr 2015 09:27:31 +0200 +Subject: [PATCH] configure: Don't bail out when cross compiling + +The configure script exits with error when cross compiling. Skipping +the tests the package can be build for target. + +Signed-off-by: Alexander Stein alexander.st...@systec-electronic.com +--- + configure | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/configure b/configure +index 4495abe..44086ed 100755 +--- a/configure b/configure +@@ -3955,9 +3955,7 @@ rm -f core conftest.err conftest.$ac_objext \ + + if test $cross_compiling = yes; then : + { { $as_echo $as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd': 5 +-$as_echo $as_me: error: in \`$ac_pwd': 2;} +-as_fn_error $? cannot run test program while cross compiling +-See \`config.log' for more details $LINENO 5 ; } ++$as_echo $as_me: error: in \`$ac_pwd': 2;} } + else + cat confdefs.h - _ACEOF conftest.$ac_ext + /* end confdefs.h. */ diff --git a/patches/bonnie++-1.97/series b/patches/bonnie++-1.97/series new file mode 100644 index 000..d83b18a --- /dev/null +++ b/patches/bonnie++-1.97/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-configure-Don-t-bail-out-when-cross-compiling.patch +# 1492c16fc3a16d9cbc1fa942482a9cf1 - git-ptx-patches magic diff --git a/rules/bonniexx.make b/rules/bonniexx.make index 440975d..921ce8d 100644 --- a/rules/bonniexx.make +++ b/rules/bonniexx.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_BONNIEXX) += bonniexx # # Paths and names # -BONNIEXX_VERSION := 1.03e -BONNIEXX_MD5 := 750aa5b5051263a99c6c195888c74968 +BONNIEXX_VERSION := 1.97 +BONNIEXX_MD5 := d6cf9703242998b2ddc2d875b028b3c6 BONNIEXX := bonnie++-$(BONNIEXX_VERSION) BONNIEXX_SUFFIX := tgz -BONNIEXX_URL := http://www.coker.com.au/bonnie++/$(BONNIEXX).$(BONNIEXX_SUFFIX) +BONNIEXX_URL := http://www.coker.com.au/bonnie++/experimental/$(BONNIEXX).$(BONNIEXX_SUFFIX) BONNIEXX_SOURCE := $(SRCDIR)/$(BONNIEXX).$(BONNIEXX_SUFFIX) BONNIEXX_DIR := $(BUILDDIR)/$(BONNIEXX) BONNIEXX_LICENSE := GPLv2 -- 2.0.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 1/1] bonnie++: Bump to version 1.97
Hi, On Mon, Apr 27, 2015 at 12:32:47PM +0200, Alexander Stein wrote: On Monday 27 April 2015 11:26:08, Michael Olbrich wrote: On Tue, Apr 21, 2015 at 11:44:41AM +0200, Alexander Stein wrote: This version needs a patch for configure as it fails when cross compiling. We don't patch configure scripts. You can tell AC_TRY_RUN what to do when cross-compiling. Either use that to disable this (I think it's the large file check, right?) or wrap the whole check in a AC_CACHE_CHECK and set the correct value in the environment. I see that AC_TRY_RUN accepts 3 parameters for sucess, fail and cross-compile. The first two are no problem, but the third should be set according to PTXCONF_GLOBAL_LARGE_FILE. How can I access that environment (?) variable. I'm no autotools expert nor regular users of that. That's what AC_CACHE_CHECK[1] is for. The cache-id can be set via environment. If the variable is set, then the command isn't executed at all: AC_CACHE_CHECK([Large file support], bonnie_cv_sys_largefile, AC_TRY_RUN...]) if [[ x$bonnie_cv_sys_largefile = xyes ]]; then ... Another method would be to use AC_SYS_LARGEFILE, but I have no idea how to set 'large_file' for large_file then. [1] http://www.gnu.org/software/autoconf/manual/autoconf-2.66/html_node/Caching-Results.html -- 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] trace-cmd: add missing host-swig dependency
On Mon, Apr 27, 2015 at 11:23:17AM +0200, Alexander Aring wrote: Hi Michael, On Mon, Apr 27, 2015 at 10:56:28AM +0200, Michael Olbrich wrote: On Mon, Apr 20, 2015 at 09:48:45AM +0200, Alexander Aring wrote: This patch adds a missing host-swig dependency which is needed by trace-cmd to generate some python bindings. Without host-swig I get the following compile error: I've changed this to just select HOST_SWIG. The others should not be necessary. Can you confirm that it still works? Maybe you didn't run 'oldconfig'? I need to admit, I was not sure about to handle this. I learned that select is in Kconfig an evil statement for doing selection on config entries which has also others select/depends on statements. Maybe this is only if the selected statement has a depends on only or ptxdist can handle this. Well, things are not quite that simple. It depends on the use-case. Using 'select' only works correctly, when the selected option does not depend on anything with 'depends on'. I the kernel that is usually a problem, so 'select' is avoided. In ptxdist, the toplevel options usually don't have any 'depends on' so we can use 'select' here. There are some exceptions and they cause problems occasionally :-) A depends on doesn't work here because it's noprompt. Now I realized that when I try to add all HOST_SWIG dependencies then this doesn't work because select doesn't give any information about the order on which dependency should be compiled at first. Anyway these thinking about that confused me and I would say that a simple select HOST_SWIG is enough than I will trust you. I tested it and after running 'oldconfig' it works, also fine with the dependencies like 'host-libpcre'. We organize the options in PTXdist in a way, so that a simple select is (usually) enough. 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] glib: add cross compile patch
Actually, just the 'autogen.sh' would 'fix' the Problem. I've commited a different workaround. Michael On Sun, Apr 19, 2015 at 08:01:27PM +0200, Robert Schwebel wrote: Otherwhise we fail with CCLD glib-compile-resources CCLD gsettings CCLD gdbus CCLD gapplication CCLD gresource arm-v5te-linux-gnueabi/4.9.2/../../../../arm-v5te-linux-gnueabi/bin/ld: warning: libgmodule-2.0.so.0, needed by ./.libs/libgio-2.0.so, not found (try using -rpath or -rpath-link) ./.libs/libgio-2.0.so: undefined reference to `g_module_error' ./.libs/libgio-2.0.so: undefined reference to `g_module_close' ./.libs/libgio-2.0.so: undefined reference to `g_module_open' ./.libs/libgio-2.0.so: undefined reference to `g_module_supported' ./.libs/libgio-2.0.so: undefined reference to `g_module_symbol' collect2: error: ld returned 1 exit status make[5]: *** [glib-compile-resources] Error 1 make[5]: *** Waiting for unfinished jobs Signed-off-by: Robert Schwebel r.schwe...@pengutronix.de --- ...e.am-fix-linker-error-for-glib-compile-re.patch | 36 ++ patches/glib-2.44.0/autogen.sh | 1 + patches/glib-2.44.0/series | 4 +++ 3 files changed, 41 insertions(+) create mode 100644 patches/glib-2.44.0/0001-gio-Makefile.am-fix-linker-error-for-glib-compile-re.patch create mode 12 patches/glib-2.44.0/autogen.sh create mode 100644 patches/glib-2.44.0/series diff --git a/patches/glib-2.44.0/0001-gio-Makefile.am-fix-linker-error-for-glib-compile-re.patch b/patches/glib-2.44.0/0001-gio-Makefile.am-fix-linker-error-for-glib-compile-re.patch new file mode 100644 index 000..a822293 --- /dev/null +++ b/patches/glib-2.44.0/0001-gio-Makefile.am-fix-linker-error-for-glib-compile-re.patch @@ -0,0 +1,36 @@ +From: Robert Schwebel r.schwe...@pengutronix.de +Date: Sun, 19 Apr 2015 19:29:08 +0200 +Subject: [PATCH] gio/Makefile.am: fix linker error for glib-compile-resources + +Linking glib-compile-resources in a cross compile environment fails with + + CCLD glib-compile-resources + CCLD gsettings + CCLD gdbus + CCLD gapplication + CCLD gresource +arm-v5te-linux-gnueabi/4.9.2/../../../../arm-v5te-linux-gnueabi/bin/ld: warning: libgmodule-2.0.so.0, needed by ./.libs/libgio-2.0.so, not found (try using -rpath or -rpath-link) +./.libs/libgio-2.0.so: undefined reference to `g_module_error' +./.libs/libgio-2.0.so: undefined reference to `g_module_close' +./.libs/libgio-2.0.so: undefined reference to `g_module_open' +./.libs/libgio-2.0.so: undefined reference to `g_module_supported' +./.libs/libgio-2.0.so: undefined reference to `g_module_symbol' +collect2: error: ld returned 1 exit status +make[5]: *** [glib-compile-resources] Error 1 +make[5]: *** Waiting for unfinished jobs +--- + gio/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gio/Makefile.am b/gio/Makefile.am +index 28aea41ae59c..8b05f62f665a 100644 +--- a/gio/Makefile.am b/gio/Makefile.am +@@ -707,6 +707,7 @@ bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gset + + glib_compile_resources_LDADD = libgio-2.0.la\ + $(top_builddir)/gobject/libgobject-2.0.la \ ++$(top_builddir)/gmodule/libgmodule-2.0.la \ + $(top_builddir)/glib/libglib-2.0.la \ + $(NULL) + diff --git a/patches/glib-2.44.0/autogen.sh b/patches/glib-2.44.0/autogen.sh new file mode 12 index 000..9f8a4cb --- /dev/null +++ b/patches/glib-2.44.0/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/glib-2.44.0/series b/patches/glib-2.44.0/series new file mode 100644 index 000..da4cbca --- /dev/null +++ b/patches/glib-2.44.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-gio-Makefile.am-fix-linker-error-for-glib-compile-re.patch +# e99fa893258dcefd38cb26350ba1d533 - git-ptx-patches magic -- 2.1.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] trace-cmd: add missing host-swig dependency
On Mon, Apr 20, 2015 at 09:48:45AM +0200, Alexander Aring wrote: This patch adds a missing host-swig dependency which is needed by trace-cmd to generate some python bindings. Without host-swig I get the following compile error: I've changed this to just select HOST_SWIG. The others should not be necessary. Can you confirm that it still works? Maybe you didn't run 'oldconfig'? Michael LD PLUGIN plugin_sched_switch.so BUILD PLUGIN plugin_mac80211.so BUILD PLUGIN plugin_function.so swig -Wall -python -noproxy ctracecmd.i BUILD PLUGIN plugin_jbd2.so make[1]: swig: Command not found Makefile:581: recipe for target 'ctracecmd.so' failed make[1]: *** [ctracecmd.so] Error 127 make[1]: *** Waiting for unfinished jobs Signed-off-by: Alexander Aring alex.ar...@gmail.com --- rules/trace-cmd.in | 4 1 file changed, 4 insertions(+) diff --git a/rules/trace-cmd.in b/rules/trace-cmd.in index 5c1d37a..d06fe25 100644 --- a/rules/trace-cmd.in +++ b/rules/trace-cmd.in @@ -5,6 +5,10 @@ config TRACE_CMD prompt trace-cmd select LIBC_DL select GCCLIBS_GCC_S + select HOST_SWIG + select HOST_ZLIB + select HOST_LIBPCRE + select HOST_PYTHON help The trace-cmd command interacts with the Ftrace tracer that is built inside the Linux kernel. It interfaces with the -- 2.3.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 v2 1/1] bonnie++: Bump to version 1.97
On Mon, Apr 27, 2015 at 01:24:33PM +0200, Alexander Stein wrote: This version needs a patch for autoconf to avoid runtime checks when cross-compiling. Thanks, applied. I did some more cleanup. Hopefully I didn't break anything... :-) Michael Signed-off-by: Alexander Stein alexander.st...@systec-electronic.com --- ...configure-cache-result-of-large-file-test.patch | 32 ++ patches/bonnie++-1.97/autogen.sh | 1 + patches/bonnie++-1.97/series | 4 +++ rules/bonniexx.make| 10 --- 4 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 patches/bonnie++-1.97/0001-configure-cache-result-of-large-file-test.patch create mode 12 patches/bonnie++-1.97/autogen.sh create mode 100644 patches/bonnie++-1.97/series diff --git a/patches/bonnie++-1.97/0001-configure-cache-result-of-large-file-test.patch b/patches/bonnie++-1.97/0001-configure-cache-result-of-large-file-test.patch new file mode 100644 index 000..adf144f --- /dev/null +++ b/patches/bonnie++-1.97/0001-configure-cache-result-of-large-file-test.patch @@ -0,0 +1,32 @@ +From: Alexander Stein alexander.st...@systec-electronic.com +Date: Mon, 27 Apr 2015 13:22:58 +0200 +Subject: [PATCH] configure: cache result of large file test + +Signed-off-by: Alexander Stein alexander.st...@systec-electronic.com +--- + configure.in | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index f92f0ab8ea8f..f156f0b8d8c5 100644 +--- a/configure.in b/configure.in +@@ -83,6 +83,7 @@ void * thread_func(void * param) { return NULL; } + , thread_ldflags=-pthread) + + AC_SUBST(large_file) ++AC_CACHE_CHECK([Large file support], bonnie_cv_sys_largefile, + AC_TRY_RUN([#ifndef _LARGEFILE64_SOURCE + #define _LARGEFILE64_SOURCE + #endif +@@ -118,8 +119,8 @@ int main () { + } + close(fd); + return 0; +-}], large_file=yes) +-if [[ -n $large_file ]]; then ++}], large_file=yes)) ++if [[ x$bonnie_cv_sys_largefile = xyes ]] || [[ -n $large_file ]]; then +large_file=#define _LARGEFILE64_SOURCE + fi + diff --git a/patches/bonnie++-1.97/autogen.sh b/patches/bonnie++-1.97/autogen.sh new file mode 12 index 000..9f8a4cb --- /dev/null +++ b/patches/bonnie++-1.97/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/bonnie++-1.97/series b/patches/bonnie++-1.97/series new file mode 100644 index 000..9b7237c --- /dev/null +++ b/patches/bonnie++-1.97/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-configure-cache-result-of-large-file-test.patch +# fed4790f562b273d16ba0fc3f085bb40 - git-ptx-patches magic diff --git a/rules/bonniexx.make b/rules/bonniexx.make index 440975d..fa35442 100644 --- a/rules/bonniexx.make +++ b/rules/bonniexx.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_BONNIEXX) += bonniexx # # Paths and names # -BONNIEXX_VERSION := 1.03e -BONNIEXX_MD5 := 750aa5b5051263a99c6c195888c74968 +BONNIEXX_VERSION := 1.97 +BONNIEXX_MD5 := d6cf9703242998b2ddc2d875b028b3c6 BONNIEXX := bonnie++-$(BONNIEXX_VERSION) BONNIEXX_SUFFIX := tgz -BONNIEXX_URL := http://www.coker.com.au/bonnie++/$(BONNIEXX).$(BONNIEXX_SUFFIX) +BONNIEXX_URL := http://www.coker.com.au/bonnie++/experimental/$(BONNIEXX).$(BONNIEXX_SUFFIX) BONNIEXX_SOURCE := $(SRCDIR)/$(BONNIEXX).$(BONNIEXX_SUFFIX) BONNIEXX_DIR := $(BUILDDIR)/$(BONNIEXX) BONNIEXX_LICENSE := GPLv2 @@ -31,7 +31,9 @@ BONNIEXX_LICENSE:= GPLv2 # BONNIEXX_PATH := PATH=$(CROSS_PATH) -BONNIEXX_ENV := $(CROSS_ENV) +BONNIEXX_ENV := \ + $(CROSS_ENV) \ + bonnie_cv_sys_largefile=$(call ptx/ifdef, PTXCONF_GLOBAL_LARGE_FILE,yes,no) # # autoconf -- 2.0.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] ptxd_lib_dgen.awk: Fix warning
On Wed, Apr 29, 2015 at 09:06:18PM +0200, Bernhard Walle wrote: After upgrading my gawk to 4.1.2 (which Arch Linux did today), I get tons of warnings like gawk: /usr/lib/ptxdist-2015.04.0/scripts/lib/ptxd_lib_dgen.awk:386: (FILENAME=/tmp/ptxdist.p1sg2M/dgen/platformconfig FNR=233) warning: gensub: third argument `' treated as 1 This patch fixes the warnings. According to the documentation https://www.gnu.org/software/gawk/manual/gawk.html#String-Functions: | gensub(regexp, replacement, how [, target]) # | ... | | If the how argument is a string that does not begin with ‘g’ or ‘G’, or | if it is a number that is less than or equal to zero, only one | substitution is performed. If how is zero, gawk issues a warning | message. So the fix should be safe. Yes, this seems to be the correct fix. Works for me[tm] anyways. Thanks, applied. Michael Signed-off-by: Bernhard Walle bernh...@bwalle.de --- scripts/lib/ptxd_lib_dgen.awk | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk index 9970953..c255706 100644 --- a/scripts/lib/ptxd_lib_dgen.awk +++ b/scripts/lib/ptxd_lib_dgen.awk @@ -89,7 +89,7 @@ $1 ~ /^[A-Z_]*PACKAGES-/ { this_PKG = gensub(/^[A-Z_]*PACKAGES-\$\(PTXCONF_([^\)]*)\)/, \\1, g, $1); this_PKG = gensub(/^[A-Z0-9_]*-\$\(PTXCONF_([^\)]*)\)/, \\1, g, this_PKG); - is_pkg = this_pkg = gensub(/^[[:space:]]*\(.*)\[[:space:]]*$/,\\1,, $2); + is_pkg = this_pkg = gensub(/^[[:space:]]*\(.*)\[[:space:]]*$/,\\1,1, $2); if (this_pkg ~ /[A-Z]+/) { print \ \n \ @@ -222,8 +222,8 @@ function write_vars_pkg_all(this_PKG, this_pkg, prefix) { print this_PKG _DEVPKG = prefix this_devpkg DGEN_DEPS_PRE; print this_PKG _SOURCES = $( this_PKG _SOURCE) DGEN_DEPS_PRE - target_PKG = gensub(/^HOST_|^CROSS_/, , , this_PKG); - PREFIX = gensub(/^(HOST_|CROSS_).*/, \\1, , this_PKG); + target_PKG = gensub(/^HOST_|^CROSS_/, , 1, this_PKG); + PREFIX = gensub(/^(HOST_|CROSS_).*/, \\1, 1, this_PKG); # define default ${PKG}, ${PKG}_SOURCE, ${PKG}_DIR if ((prefix != ) (target_PKG in PKG_to_pkg)) { @@ -352,7 +352,7 @@ function write_deps_pkg_active_image(this_PKG, this_pkg, prefix) { n = split(this_PKG_DEPS, this_DEP_array, ); for (i = 1; i = n; i++) { this_dep = PKG_to_pkg[this_DEP_array[i]] - this_dep_prefix = gensub(/^(host-|cross-|image-|).*/, \\1, , this_dep) + this_dep_prefix = gensub(/^(host-|cross-|image-|).*/, \\1, 1, this_dep) if (this_dep_prefix == ) print $( this_PKG _IMAGE): $(STATEDIR)/ this_dep .targetinstall.postDGEN_DEPS_POST; else @@ -371,7 +371,7 @@ END { # for all pkgs for (this_PKG in PKG_to_pkg) { this_pkg = PKG_to_pkg[this_PKG]; - this_pkg_prefix = gensub(/^(host-|cross-|image-|).*/, \\1, , this_pkg) + this_pkg_prefix = gensub(/^(host-|cross-|image-|).*/, \\1, 1, this_pkg) write_include(this_PKG) if (this_pkg_prefix != image-) { @@ -383,7 +383,7 @@ END { # for active pkgs for (this_PKG in active_PKG_to_pkg) { this_pkg = PKG_to_pkg[this_PKG]; - this_pkg_prefix = gensub(/^(host-|cross-|image-|).*/, \\1, , this_pkg) + this_pkg_prefix = gensub(/^(host-|cross-|image-|).*/, \\1, 1, this_pkg) if (this_pkg_prefix != image-) { write_deps_pkg_active(this_PKG, this_pkg, this_pkg_prefix) -- 2.3.7 -- 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] gcc 5.1 fixes
On Sat, May 02, 2015 at 02:42:38PM +0200, Bernhard Walle wrote: After updating my host toolchain to gcc 5.1 (it's in Arch Linux testing), I cannot compile my ptxdist BSP any more. This are the fixes required to get it working again. I've modified the patches a bit. Setting CFLAGS etc. in the environment has caused problems in the past, so I try to avoid it. It works here (Debian unstable with gcc 5.1) so hopefully I didn't break it for you. 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
[ptxdist] [ANNOUNCE] PTXdist 2015.05.0 released
Hi, I'm happy to announce that I've just released ptxdist-2015.05.0. It's another smaller release. Mostly version bumps and bug fixes. We have some fixes to build host tools with gcc-5.1 and hopefully all the necessary stuff to work certificates. Thanks to all contributors and - as always - the shortlog below. Enjoy, Michael Olbrich Alexander Aring (1): trace-cmd: add missing host-swig dependency Alexander Stein (1): bonnie++: Bump to version 1.97 Bernhard Walle (4): ptxd_lib_dgen.awk: Fix warning host-ncurses: Fix build with gcc 5.1 host-localedef: Fix build with gcc 5.1 host-mtd-utils: Fix build with gcc 5.1 Marc Kleine-Budde (4): barebox: generate tags during ptxdist tags barebox, too host-imx-cst: added rootfs: let /etc/mtab be a link to /proc/self/mounts by default dt-utils: add Michael Olbrich (20): udev: never install udev.conf for systemd bash: force broken option to 'y' systemd: always install 99-default.link glib: remove old patch rsyslog: remove old patch glib: work around broken libtool host-openssl: enable parallel building ca-certificates: new package libxkbcommon: version bump 0.4.0 - 0.5.0 libcurl: cleanup and improve CA wpa_supplicant: add upstream security fix openssl: fix improve parallel building openssl: more parallel build fixes u-boot-tools: build 'tools-only' instead of 'tools' bonnie++: cleanup host-u-boot-tools: build 'tools-only' instead of 'tools' glew: fix dependencies xawtv: fix dependencies ptxdist: whitelist KCONFIG_ALLCONFIG and KCONFIG_SEED fbv: handle options correctly Robert Schwebel (4): glib: version bump 2.42.1 - 2.44.0 glib: add gdbus tool support util-linux-ng: version bump 2.26.1 - 2.26.2 host-qemu: version bump 2.2.0 - 2.3.0 Rüdiger, Christoph (1): libcurl: Added an option set to compile libcurl with optional -- 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- | signature.asc Description: Digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Error building bash-4.3.33
On Fri, Apr 17, 2015 at 07:37:44AM -0400, Jon Ringle wrote: I'm running into the following error while building bash-4.3.33, any ideas as to what might be missing? [...] /usr/src/local/bash/bash-4.3-patched/parse.y: In function 'cond_term': /usr/src/local/bash/bash-4.3-patched/parse.y:4382:2: error: 'extended_glob' undeclared (first use in this function) [...] It seems building with PTXCONF_BASH_EXTPATTERN disabled is broken. 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
[ptxdist] [ANNOUNCE] PTXdist 2015.04.0 released
Hi, I'm happy to announce that I've just released ptxdist-2015.04.0. It's another smaller release. Mostly version bumps and bug fixes. Nothing special this time. Thanks to all contributors and - as always - the shortlog below. Enjoy, Michael Olbrich Carsten Schlote (4): bash: Updated the bash shell to release 4.3.30 bash: Renamed option to avoid problem with bash-completion package proftpd: Bumped version to 1.3.5 stunnel: Version bump to 5.02 Hubert Feurstein (7): chrony: version bump 1.29 - 1.31 ethtool: version bump 3.0 - 3.18 ethtool: add license information libksba: version bump 1.0.7 - 1.3.2 libksba: add license information libassuan: version bump 2.0.0 - 2.2.0 libassuan: add license information Juergen Borleis (2): polkit: version bump 0.96 - 0.104 bluez: version bump 4.96 - 5.30 Marc Kleine-Budde (1): barebox: add option to depend on host-openssl Matthias Fend (1): libsoup requires host intltool Michael Olbrich (19): openssl: remove obsolete patch openssl: fix parallel building libinput: version bump 0.6.0 - 0.12.0 wayland: version bump 1.6.1 - 1.7.0 weston: version bump 1.6.1 - 1.7.0 gstreamer-vaapi1: version bump 0.5.9 - 0.5.10 libva: version bump 1.5.0 - 1.5.1 libva-intel-driver: version bump 1.5.0 - 1.5.1 migrate_ptx: fix hackbench migrate helper wpa_supplicant: version bump 2.3 - 2.4 connman: version bump 1.0 - 1.28 connman-ignore: fix ignoring multiple interfaces libestr: new package rsyslog: version bump 5.8.13 - 8.8.0 connman: add missing dependency libevent: add optional OpenSSL support socat: new package socat: use global ipv6 option gst-plugins-bad1: disable bluez plugin for now Robert Schwebel (5): util-linux-ng: version bump 2.26 - 2.26.1 hackbench: remove obsolete package blspec-entry: update license information dhcp: update license information flup: update license information -- 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- | signature.asc Description: Digital signature -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] libcurl: Added an option set to compile libcurl with optional builtin CA certificate default directory or builtin CA certificate default bundle file.
On Thu, Apr 02, 2015 at 09:18:05PM +, Rüdiger, Christoph wrote: [PATCH] libcurl: Added an option set to compile libcurl with optional builtin CA certificate default directory or builtin CA certificate default bundle file. Signed-off-by: Christoph Ruediger christoph.ruedi...@thyssenkrupp.com --- rules/libcurl.in | 27 +++ rules/libcurl.make | 21 ++--- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/rules/libcurl.in b/rules/libcurl.in index 0ad7fb4..bdb0ad5 100644 --- a/rules/libcurl.in +++ b/rules/libcurl.in @@ -41,6 +41,33 @@ config LIBCURL_FILE config LIBCURL_SSL bool ssl +if LIBCURL_SSL + +choice + prompt Central CA certificate storage + + config LIBCURL_SSL_NOCA + bool No CA storage + + config LIBCURL_SSL_CAPATH + bool CA directory + + config LIBCURL_SSL_CABUNDLE + bool CA bundle +endchoice + +config LIBCURL_SSL_CAPATH_PATH + string CA directory path + depends on LIBCURL_SSL_CAPATH + default /etc/ssl/certs + +config LIBCURL_SSL_CABUNDLE_PATH + string CA bundle path + depends on LIBCURL_SSL_CABUNDLE + default /etc/ssl/certs/ca-certificates.crt Any reason, why these paths should be configurable? And we need a package that provides those files, right? Michael + +endif + config LIBCURL_CRYPTO_AUTH bool cryptographic authentication diff --git a/rules/libcurl.make b/rules/libcurl.make index 5babcb0..d6cb36c 100644 --- a/rules/libcurl.make +++ b/rules/libcurl.make @@ -62,8 +62,6 @@ LIBCURL_AUTOCONF := \ --without-gssapi \ --without-gnutls \ --without-nss \ - --without-ca-bundle \ - --without-ca-path \ --without-libidn \ --without-axtls \ --without-cyassl \ @@ -78,8 +76,25 @@ LIBCURL_AUTOCONF := \ ifdef PTXCONF_LIBCURL_SSL LIBCURL_AUTOCONF += --with-ssl=$(SYSROOT) +ifdef PTXCONF_LIBCURL_SSL_CABUNDLE +LIBCURL_AUTOCONF += \ + --with-ca-bundle=$(PTXCONF_LIBCURL_SSL_CABUNDLE_PATH) \ + --without-ca-path +else +ifdef PTXCONF_LIBCURL_SSL_CAPATH +LIBCURL_AUTOCONF += \ + --with-ca-path=$(PTXCONF_LIBCURL_SSL_CAPATH_PATH) \ + --without-ca-bundle else -LIBCURL_AUTOCONF += --without-ssl +LIBCURL_AUTOCONF += \ + --without-ca-bundle \ + --without-ca-path +endif +endif +else +LIBCURL_AUTOCONF += --without-ssl \ + --without-ca-bundle \ + --without-ca-path endif # -- 1.9.1 -- 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] Using CMake/CPack install info in targetinstall step
Hi, On Thu, Apr 09, 2015 at 11:36:08AM +0200, Dörfler Florian wrote: Thank you for the explanation! That fits well for my use case, the only thing I have to look at now are the ownerships/permissions. install_tree keeps the permissions from the original file. However, it can only handle one user/group for all of them (that's the '... 0, 0 ...' in my example. 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] libcurl: Added an option set to compile libcurl with optional builtin CA certificate default directory or builtin CA certificate default bundle file.
Added Bruno Thomsen to Cc. He had some patches about this as well. On Thu, Apr 09, 2015 at 10:05:55AM +, Rüdiger, Christoph wrote: On Thu, Apr 02, 2015 at 09:18:05PM +, Rüdiger, Christoph wrote: [PATCH] libcurl: Added an option set to compile libcurl with optional builtin CA certificate default directory or builtin CA certificate default bundle file. Signed-off-by: Christoph Ruediger christoph.ruedi...@thyssenkrupp.com --- rules/libcurl.in | 27 +++ rules/libcurl.make | 21 ++--- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/rules/libcurl.in b/rules/libcurl.in index 0ad7fb4..bdb0ad5 100644 --- a/rules/libcurl.in +++ b/rules/libcurl.in @@ -41,6 +41,33 @@ config LIBCURL_FILE config LIBCURL_SSL bool ssl +if LIBCURL_SSL + +choice + prompt Central CA certificate storage + + config LIBCURL_SSL_NOCA + bool No CA storage + + config LIBCURL_SSL_CAPATH + bool CA directory + + config LIBCURL_SSL_CABUNDLE + bool CA bundle +endchoice + +config LIBCURL_SSL_CAPATH_PATH + string CA directory path + depends on LIBCURL_SSL_CAPATH + default /etc/ssl/certs + +config LIBCURL_SSL_CABUNDLE_PATH + string CA bundle path + depends on LIBCURL_SSL_CABUNDLE + default /etc/ssl/certs/ca-certificates.crt Any reason, why these paths should be configurable? /etc/ssl/certs seems to be the most common path to store certificates in. However, we maintain RedHat servers here which use different paths by default. That's the reason why I made it configurable. Ok. And we need a package that provides those files, right? In my opinion, such a package is nothing for the general ptxdist. It is highly project depending, at least in our company. We do not deploy a set of default CAs like you have it in the general purpose desktop or server distributions. For us it is very rare to have two projects with the same set of CA certificates. Even if we add a certificates package, this should be more related to the openssl package itself than to the openssl user packages like curl. Curl runs fine even if the default path (CA path or CA bundle) does not exist. It is just not finding proper certificates to validate SSL/TLS connections. This is the same behavior as today, where curl is configured to not look anywhere for matching certificates. To create a bundle we would need the script mk-ca-bundle.pl that comes with curl, right? Bruno, if I apply this patch here, you could change your host-certdata package into a target package that installs the CA bundle itself. Would that make sense to you? 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] Scripting of Kconfig options
Hi, On Fri, Mar 27, 2015 at 08:29:31PM +0100, Tobias Schmidl wrote: I'm trying to automate a ptxdist build via Jenkins. Therefore, I need to select a (known) PTXDist menuconfig option via shell script, i.e. ptxdist menuconfig is not really an option. Right now the whole thing is done via sed, but I'm wondering if there is a more pratical way of choosing an option fron an option group#8230; By 'option group' you mean a 'choice' right? I don't think, that there is some special tool. I'd use sed and then 'fix' the ptxconfig with ptxdist oldconfig /dev/null. For a choice that would be: 1. Remove all alternatives 2. Append the option you want at the end of the file 3. Run oldconfig Kconfig will then keep the option you added and adds the others with 'is not set'. This keeps the sed magic simple and still produces a valid ptxconfig. 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