[ptxdist] Documentation: Pre-Built Toolchain installation on Ubuntu: minor glitches or outdated
Following the documentation about installation of an OSELAS.Toolchain from Pengutronix Debian Archive [1] on a (mostly) fresh Ubuntu 22.04 derived installation, I ran into some details. Don't know about stock Debian resp. apt-get instead of apt behaviour, but I assume the same applies. According to docs, added "/etc/apt/sources.list.d/pengutronix.list" as: deb https://debian.pengutronix.de/debian/ jammy main contrib non-free Result: # apt update [...] Get:11 https://debian.pengutronix.de/debian jammy InRelease [4.042 B] Err:11 https://debian.pengutronix.de/debian jammy InRelease The following signatures couldn't be verified because the public key is not available: NO_PUBKEY 69E81E916B7A3E09 NO_PUBKEY 94F58BAD054406A9 Reading package lists... Done W: GPG error: https://debian.pengutronix.de/debian jammy InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY 69E81E916B7A3E09 NO_PUBKEY 94F58BAD054406A9 E: The repository 'https://debian.pengutronix.de/debian jammy InRelease' is not signed. N: Updating from such a repository can't be done securely, and is therefore disabled by default. N: See apt-secure(8) manpage for repository creation and user configuration details. # apt install pengutronix-archive-keyring Reading package lists... Done Building dependency tree... Done Reading state information... Done E: Unable to locate package pengutronix-archive-keyring Plausible, as list was not installed above, due to missing key. So I manually fetched and installed (dpkg -i) the keyring: https://debian.pengutronix.de/debian/pool/main/p/pengutronix-archive-keyring/pengutronix-archive-keyring_2023.01.09_all.deb Now, package list is downloaded and used, but with some annoyance about missing arch in repo: # apt update [...] Get:8 https://debian.pengutronix.de/debian jammy/main amd64 Packages [14,9 kB] [...] Reading package lists... Done Building dependency tree... Done Reading state information... Done All packages are up to date. N: Skipping acquire of configured file 'main/binary-i386/Packages' as repository 'https://debian.pengutronix.de/debian jammy InRelease' doesn't support architecture 'i386' N: Skipping acquire of configured file 'contrib/binary-i386/Packages' as repository 'https://debian.pengutronix.de/debian jammy InRelease' doesn't support architecture 'i386' N: Skipping acquire of configured file 'non-free/binary-i386/Packages' as repository 'https://debian.pengutronix.de/debian jammy InRelease' doesn't support architecture 'i386' Limited "/etc/apt/sources.list.d/pengutronix.list" accordingly, by adding "[arch=amd64]", so we now have: deb [arch=amd64] https://debian.pengutronix.de/debian/ jammy main contrib non-free Final result is a working setup, without any annoying warnings. Unfortunately, I'm busy setting up a customer VM, so I'll just throw in these pointers, instead of trying to find a suitable updated wording for the docs, sorry. Best regards, Andreas [1] https://www.ptxdist.org/doc/environment.html#add-the-pengutronix-debian-archive -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)711-3908735-7 Tuebinger Strasse 63Fax: +49-(0)711-3908735-9 70178 Stuttgart, Germanyemail: a...@cn-eng.de
[ptxdist] arm-memspeed: official download site www.kreuzholzen.de is gone, request for ptx mirror
Package: arm-memspeed The arm-memspeed rule refers to download URL http://www.kreuzholzen.de/src/arm-memspeed/arm-memspeed-1.0.tar.bz2 which fails, as kreuzholzen.de is gone. According to DENIC, the domain is free. Package is also not mirrored by PTX, therefore download fails. I found a copy of the source at https://download.phytec.de/Software/Linux/Yocto/SourceMirror/arm-memspeed-1.0.tar.bz2 with matching MD5. Might I ask Pengutronix to add this package to their mirror? Respectively host it? After a quick search, I did not find any other source, let alone some official place. Thanks in advance, Andreas target: arm-memspeed-1.0.tar.bz2 --2023-04-17 21:18:19-- http://www.kreuzholzen.de/src/arm-memspeed/arm-memspeed-1.0.tar.bz2 Resolving www.kreuzholzen.de (www.kreuzholzen.de)... failed: Name or service not known. wget: unable to resolve host address 'www.kreuzholzen.de' --2023-04-17 21:18:19-- https://www.pengutronix.de/software/ptxdist/temporary-src/arm-memspeed-1.0.tar.bz2 Resolving www.pengutronix.de (www.pengutronix.de)... 2a01:4f9:2a:2c17:5054:ff:fe65:8c93, 95.216.103.100 Connecting to www.pengutronix.de (www.pengutronix.de)|2a01:4f9:2a:2c17:5054:ff:fe65:8c93|:443... connected. HTTP request sent, awaiting response... 307 Temporary Redirect Location: https://public.pengutronix.de/mirror/software/ptxdist/temporary-src/arm-memspeed-1.0.tar.bz2 [following] --2023-04-17 21:18:19-- https://public.pengutronix.de/mirror/software/ptxdist/temporary-src/arm-memspeed-1.0.tar.bz2 Resolving public.pengutronix.de (public.pengutronix.de)... 2a01:4f9:2a:2c17:5054:ff:fe65:8c93, 95.216.103.100 Connecting to public.pengutronix.de (public.pengutronix.de)|2a01:4f9:2a:2c17:5054:ff:fe65:8c93|:443... connected. HTTP request sent, awaiting response... 404 Not Found 2023-04-17 21:18:19 ERROR 404: Not Found. Could not download package URL: http://www.kreuzholzen.de/src/arm-memspeed/arm-memspeed-1.0.tar.bz2 -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)711-3908735-7 Tuebinger Strasse 63Fax: +49-(0)711-3908735-9 70178 Stuttgart, Germanyemail: a...@cn-eng.de
[ptxdist] [PATCH 2/2] haveged: systemd service: move from multi-user.target to sysinit.target
For devices with no or defective HW RNG, it takes quite long until the kernel random device is seeded, up to several 10 seconds. See kernel "random: crng init done" message for this. As a consequence, anything using /dev/random will block accordingly. This is even true for "ssh-keygen -l" invocations, which should just show the fingerprint of a pubkey. Which can be used e.g. to check for valid keys to be present. One way to expedite this is to run haveged, of course at the cost of reduced quality of the random numbers. But this start has to happen rather early in the boot process. By default (based upon this (old) haveged package), haveged is started late as user service in multi-user.target. So move the start of haveged from multi-user.target to sysinit.target. Also add a service dependency on after systemd-random-seed.service (responsible to seed from a stored random pool, if enabled) and systemd-tmpfiles-setup-dev.service (responsible to setup the dev files). Comparable is done within Fedora and SuSE. Signed-off-by: Andreas Pretzsch --- projectroot/usr/lib/systemd/system/haveged.service | 3 ++- rules/haveged.make | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projectroot/usr/lib/systemd/system/haveged.service b/projectroot/usr/lib/systemd/system/haveged.service index 81070ca8b..5fab8c665 100644 --- a/projectroot/usr/lib/systemd/system/haveged.service +++ b/projectroot/usr/lib/systemd/system/haveged.service @@ -1,6 +1,7 @@ [Unit] Description=Entropy Daemon based on the HAVEGE algorithm Documentation=man:haveged(8) http://www.issihosts.com/haveged/ +After=systemd-random-seed.service systemd-tmpfiles-setup-dev.service [Service] Type=simple @@ -8,4 +9,4 @@ ExecStart=/usr/sbin/haveged -w 1024 -v 1 --Foreground SuccessExitStatus=143 [Install] -WantedBy=multi-user.target +WantedBy=sysinit.target diff --git a/rules/haveged.make b/rules/haveged.make index 80d1910f3..0c880b191 100644 --- a/rules/haveged.make +++ b/rules/haveged.make @@ -73,10 +73,10 @@ endif endif ifdef PTXCONF_HAVEGED_SYSTEMD_UNIT - @$(call install_copy, haveged, 0, 0, 0644, -, \ + @$(call install_alternative, haveged, 0, 0, 0644, \ /usr/lib/systemd/system/haveged.service) @$(call install_link, haveged, ../haveged.service, \ - /usr/lib/systemd/system/multi-user.target.wants/haveged.service) + /usr/lib/systemd/system/sysinit.target.wants/haveged.service) endif @$(call install_finish, haveged) -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] haveged: systemd service: import haveged.service from haveged 1.9.2 source
Signed-off-by: Andreas Pretzsch --- projectroot/usr/lib/systemd/system/haveged.service | 11 +++ 1 file changed, 11 insertions(+) create mode 100644 projectroot/usr/lib/systemd/system/haveged.service diff --git a/projectroot/usr/lib/systemd/system/haveged.service b/projectroot/usr/lib/systemd/system/haveged.service new file mode 100644 index 0..81070ca8b --- /dev/null +++ b/projectroot/usr/lib/systemd/system/haveged.service @@ -0,0 +1,11 @@ +[Unit] +Description=Entropy Daemon based on the HAVEGE algorithm +Documentation=man:haveged(8) http://www.issihosts.com/haveged/ + +[Service] +Type=simple +ExecStart=/usr/sbin/haveged -w 1024 -v 1 --Foreground +SuccessExitStatus=143 + +[Install] +WantedBy=multi-user.target -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 0/2] haveged: systemd service: move earlier in startup
On a device with defective HW RNG here, it takes quite long until the bootup is finished, as kernel random is not seeded. Leading to blockings for anything needing /dev/random. As kind of a workaround (until I fixed the HW RNG driver), I pulled in haveged. To work as expected, I needed to move haveged startup in systemd to a more earlier point. This patch series is probably NOT for inclusion to PTXdist mainline. In a first step, haveged should be updated to the latest 1.9.8 release. Also, all of this here is NOT really tested or well thought out. It just works for me (tm). I send it, in case somebody else has the same trouble to workaround. Andreas Pretzsch (2): haveged: systemd service: import haveged.service from haveged 1.9.2 source haveged: systemd service: move from multi-user.target to sysinit.target projectroot/usr/lib/systemd/system/haveged.service | 12 rules/haveged.make | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 projectroot/usr/lib/systemd/system/haveged.service -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [ANNOUNCE] PTXdist 2019.10.0 released
On Tue, 2019-10-15 at 12:41 +0200, Michael Olbrich wrote: > On Tue, Oct 15, 2019 at 08:11:10AM +0200, Michael Olbrich wrote: > > I'm happy to announce that I've just released ptxdist-2019.10.0. > > Right, and 'ptxdist images' is broken in most cases, unless '-q -- > progress' > is used :-/. There will be a 2019.10.1 release in the near future... In this case, todays patch "sudo: version bump 1.8.22 -> 1.8.28" from Roland Hieber should probably also sneek in. With 1.8.28, a quite relevant security fix is included, see: https://www.sudo.ws/alerts/minus_1_uid.html About the "mosquitto: version bump 1.6.4 -> 1.6.7" change, well, there is one security fix (mosquitto mainline 1.6.6, their ticket #1412) for an outside triggerable segv / stack overflow. So while debatable if this qualifies for inclusion in a ptxdist point release, I'd suggest every user to at least include this one locally... Best regards, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] libnl3: fix license information
On Tue, 2019-10-15 at 09:51 +0200, Michael Olbrich wrote: > On Thu, Oct 10, 2019 at 01:56:24PM +0200, Andreas Pretzsch wrote: > > On Thu, 2019-10-10 at 11:25 +0200, Michael Olbrich wrote: > > > Let's stick with the GPL-2.0-only for the tools that still have > > > this > > > in the > > > header but make it clear that this does not apply to the library > > > by > > > making > > > it conditional. > > > Also add the missing BSD-3-Clause identifiery and file. > > > > > > Signed-off-by: Michael Olbrich > > > --- > > > > Acked-by: Andreas Pretzsch > > Right, so I messed up and accidentally didn't apply this Acked-by, > just the others. Sorry about that and thanks anyways. No worries. It's the content that matters, not the person. And thanks for caring about the license fix. Best regards, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] mosquitto: version bump 1.6.4 -> 1.6.7
On Thu, 2019-10-10 at 20:58 +0200, Andreas Pretzsch wrote: > Signed-off-by: Andreas Pretzsch > --- > No tests beside compile test done. Customer tested on ARM target, works successful. And solved their issues (sporadic packet loss). So I'd say this can / should go in. -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] mosquitto: version bump 1.6.4 -> 1.6.7
>From official ChangeLog.txt: 1.6.7 - 20190925 Broker: - Add workaround for working with libwebsockets 3.2.0. - Fix potential crash when reloading config. Closes #1424, #1425. Client library: - Don't use `/` in autogenerated client ids, to avoid confusing with topics. - Fix `mosquitto_max_inflight_messages_set()` and `mosquitto_int_option(..., MOSQ_OPT_*_MAX, ...)` behaviour. Closes #1417. - Fix regression on use of `mosquitto_connect_async()` not working. Closes #1415 and #1422. Clients: - mosquitto_sub: Fix `-E` incorrectly not working unless `-d` was also specified. Closes #1418. - Updated documentation around automatic client ids. 1.6.6 - 20190917 Security: - Restrict topic hierarchy to 200 levels to prevent possible stack overflow. Closes #1412. Broker: - Restrict topic hierarchy to 200 levels to prevent possible stack overflow. Closes #1412. - mosquitto_passwd now returns 1 when attempting to update a user that does not exist. Closes #1414. 1.6.5 - 20190912 Broker: - Fix v5 DISCONNECT packets with remaining length == 2 being treated as a protocol error. Closes #1367. - Fix support for libwebsockets 3.x. - Fix slow websockets performance when sending large messages. Closes #1390. - Fix bridges potentially not connecting on Windows. Closes #478. - Fix clients authorised using `use_identity_as_username` or `use_subject_as_username` being disconnected on SIGHUP. Closes #1402. - Improve error messages in some situations when clients disconnect. Reduces the number of "Socket error on client X, disconnecting" messages. - Fix Will for v5 clients not being sent if will delay interval was greater than the session expiry interval. Closes #1401. - Fix CRL file not being reloaded on HUP. Closes #35. - Fix repeated "Error in poll" messages on Windows when only websockets listeners are defined. Closes #1391. Client library: - Fix reconnect backoff for the situation where connections are dropped rather than refused. Closes #737. - Fix missing locks on `mosq->state`. Closes #1374. Documentation: - Improve details on global/per listener options in the mosquitto.conf man page. Closes #274. - Clarify behaviour when clients exceed the `message_size_limit`. Closes #448. - Improve documentation for `max_inflight_bytes`, `max_inflight_messages`, and `max_queued_messages`. Build: - Fix missing function warnings on NetBSD. - Fix WITH_STATIC_LIBRARIES using CMake on Windows. Closes #1369. - Guard ssize_t definition on Windows. Closes #522. Signed-off-by: Andreas Pretzsch --- No tests beside compile test done. rules/mosquitto.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/mosquitto.make b/rules/mosquitto.make index 8a4967606..3f3f967ce 100644 --- a/rules/mosquitto.make +++ b/rules/mosquitto.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MOSQUITTO) += mosquitto # # Paths and names # -MOSQUITTO_VERSION := 1.6.4 -MOSQUITTO_MD5 := c89df444afb121d795f8af5b4fd97d78 +MOSQUITTO_VERSION := 1.6.7 +MOSQUITTO_MD5 := ec9074c4f337f64eaa9a4320c6dab020 MOSQUITTO := mosquitto-$(MOSQUITTO_VERSION) MOSQUITTO_SUFFIX := tar.gz MOSQUITTO_URL := https://mosquitto.org/files/source/$(MOSQUITTO).$(MOSQUITTO_SUFFIX) -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] libnl3: fix license information
On Thu, 2019-10-10 at 11:25 +0200, Michael Olbrich wrote: > Let's stick with the GPL-2.0-only for the tools that still have this > in the > header but make it clear that this does not apply to the library by > making > it conditional. > Also add the missing BSD-3-Clause identifiery and file. > > Signed-off-by: Michael Olbrich > --- Acked-by: Andreas Pretzsch > So if had forgotten about the old discussion when I applied the > patch. How > about this patch. I don't really care about the kernel headers. It > makes no > difference if they are shipped with the package or the toolchain. The > result is the same. > And with the condition below, we still mention the GPL-2.0-only but > make it > more obvious that this does not apply to libnl itself. Looks good, and esp. the conditional. Thanks for the fix ! Best regards, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] libnl3: fix license identifier (GPL-2.0-only -> LGPL-2.1-only)
On Wed, 2019-10-09 at 10:36 +0200, Alexander Dahl wrote: > Am Mittwoch, 9. Oktober 2019, 10:22:02 CEST schrieb Roland Hieber: > > On Tue, Oct 08, 2019 at 10:01:50PM +0200, Andreas Pretzsch wrote: > > > One of the changes 3.4.0 -> 3.5.0 was to add SPDX tags all > > > across the source files. They are now tagged as LGPL-2.1-only. > > > > > > The lib code itself had written LGPL-2.1-only headers already, > > > as did most of the commandline tools (src/nf-* and src/nl-*). > > > Very few of the cli tools have written GPL-2.0-only headers > > > even now, but the LGPL-2.1-only SPDX tag was added there also. > > > But given the use of those cli tools, and the meaning of LGPL > > > for regular executables, they are probably fine as LGPL, too. > > I would consider that as a bug, which should be filed there. True. > > > For details, see https://github.com/thom311/libnl/pull/219 > > > It was accepted mainline as commit cee0b1b 'Add SPDX > > > identifiers'. > > This should not have been accepted that way upstream. :-/ Well, yes. Guess they decided to have a life beside license tags ;-) > [ file and license debate ] > > FWIW, I created a ticket [1] back in May 2019 after the discussion > starting here: > > https://www.mail-archive.com/ptxdist@pengutronix.de/msg14394.html > [1] https://github.com/thom311/libnl/issues/215 Missed this. Thanks for the pointer, and esp. all the work ! Unfortunately, it somehow got lost / came to no conclusion :-( > Maybe someone wants to add the correct SPDX identifiers and license > texts and > sent PR to upstream? As far as I could see in upstream PR #219 > already, the > maintainer would happily apply those? Well, guess he will. But for the example code, he has to get the active permission of Thomas Graf Joe Damato as the relevant authors of the code for relicensing. git log shows no other relevant contributors. The BSD-3 code, honestly, I have no idea if there is an official route of just relicensing all this under LGPL-2.1-only, solely for this specific code distribution. There might be, in the way of dual-licensing (in this case, add another, more restrictive license), as long as the original one is still preserved (and hence the end user has the freedom of choice to also use the more permissive BSD-3). And choosing LGPL for ones own usage (and distribution). But this would be up to lawyers to answer, not me. And trying to convince a coorporation to relicense, good luck. Question is, who's volunteering ? I won't, sorry. Prefer life time over this... If anything, I'd keep the mess, add the half of dozen license tags, and call it a night. Best regards, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] libnl3: fix license identifier (GPL-2.0-only -> LGPL-2.1-only)
On Wed, 2019-10-09 at 10:22 +0200, Roland Hieber wrote: > On Tue, Oct 08, 2019 at 10:01:50PM +0200, Andreas Pretzsch wrote: > > One of the changes 3.4.0 -> 3.5.0 was to add SPDX tags all > > across the source files. They are now tagged as LGPL-2.1-only. > > > > The lib code itself had written LGPL-2.1-only headers already, > > as did most of the commandline tools (src/nf-* and src/nl-*). > > Very few of the cli tools have written GPL-2.0-only headers > > even now, but the LGPL-2.1-only SPDX tag was added there also. > > But given the use of those cli tools, and the meaning of LGPL > > for regular executables, they are probably fine as LGPL, too. > > > > For details, see https://github.com/thom311/libnl/pull/219 > > It was accepted mainline as commit cee0b1b 'Add SPDX identifiers'. > > > > Therefore update the license tag in the rule to follow mainline. > > > > Signed-off-by: Andreas Pretzsch > > --- > > rules/libnl3.make | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/rules/libnl3.make b/rules/libnl3.make > > index 153c7b80e..5b3af0065 100644 > > --- a/rules/libnl3.make > > +++ b/rules/libnl3.make > > @@ -22,7 +22,7 @@ LIBNL3_SUFFIX := tar.gz > > LIBNL3_URL := > > https://github.com/thom311/libnl/releases/download/$(LIBNL3_RELEASE)/$(LIBNL3).$(LIBNL3_SUFFIX > > ) > > LIBNL3_SOURCE := $(SRCDIR)/$(LIBNL3).$(LIBNL3_SUFFIX) > > LIBNL3_DIR := $(BUILDDIR)/$(LIBNL3) > > -LIBNL3_LICENSE := GPL-2.0-only > > +LIBNL3_LICENSE := LGPL-2.1-only > > It's also a good idea to add > LIBNL3_LICENSE_FILES:= > file://COPYING;md5=4fbd65380cdd255951079008b364516c > so we get a hint where the license is and when it changes again. Well, this won't help here. As we have seen with this mixup. Which is why I am not a fan of this approach for the normal case, redundant at best, misleading at worst, like here... > I threw licensecheck [1] at the code. There a few files which have > comments identifying them as GPL-2.0-only, but also now have a > "SPDX-License-Identifier: LGPL-2.1-only" tag: > > ./src/idiag-socket-details.c GPL (v2) > ./src/nl-addr-add.c GPL (v2) > ./src/nl-addr-delete.cGPL (v2) > ./src/nl-addr-list.c GPL (v2) > ./src/nl-cls-add.cGPL (v2) Essentially, these are short examples feeding command line arguments into library functions or dumps their result verbatim, using lib calls. So the threshold of originality is questionable anyway. But in a strict view, they are GPLv2-only, not LGPL, correct. And yes, they are installed and usable on the system. Still, from a ptxdist point of view, the result is quite the same. Components distributed are under a copyleft license, with the known consequences. Which are the same in this case. For ptxdist users. If somebody takes above example/cli code and modifies it / includes it in own code, different story. The first thing to note (and care about) for this person would be the header in the source. Not ptxdist's issue. Which is why I went the way of repeating upstreams pragmatic (and somewhat sloppy, given) solution. Of course, an upstream fix would be best. > as well as several files in ./include/linux-private/linux/, which are > GPL-2.0 WITH Linux-syscall-note or GPL-2.0+ WITH Linux-syscall-note > (obviously copied from the kernel, although I don't understand why). Which essentially says "This is an API. You need it to use Linux. Take it and use it, it has no license effect on your code.". Whatever Oracle dreamed of, back in the days... So I tend to not mention these extra, for a ptxdist package license tag. But again, I'm not authoritative here. Neither by legal expertise (I am not a lawyer, esp. not an IP one), not by decision. > ./lib/xfrm and ./include/netlink/ are BSD-3-Clause. > Sorry, I meant ./lib/xfrm/* and ./include/netlink/xfrm/* Ok, these are really annoying. And we probably need to care. While BSD-3 can be included in GPL just fine, the copyright notice has to be included in the distributed license book. Including the copyright holder (here: Texas Instruments), to my knowledge. At least we did so before. And this is probably nothing upstream can easily fix (like the GPL/LGPL mixup), I guess. Didn't see those, thanks for bringing it up ! > So I guess until we can argue that those files don't make it into a > compiled binary, They will. They are installed as libnl-xfrm-3 as far as I can see. > the license statement should be > LGPL-2.1-only AND GPL-2.0-only AND GPL-2.0 WITH Linux-syscall-note > and GPL-2.0+ WITH Linux-syscall-note and BSD-3-Clause. Plus a LIBNL3_LICENSE_FILES tag for at least one of the BSD-3 files. If we want to go this route. What a PITA... Someone please remind m
[ptxdist] [PATCH] bluez: version bump 5.50 -> 5.51
Update BlueZ 5.50 (Jun 2018) to BlueZ 5.51 (Sep 2019). Quoting the announcement: "There are too many fixes to cover them in the release announcement, but feature-wise the two notable things are improved Bluetooth Mesh support as well as support for the GATT Database Hash feature." There are no relevant new configure options. Explicitly set the new configure option "external-ell" to disabled. It is connected to mesh and/or btpclient, which are already both explicitly disabled. In this context, order them together. The now settable "runstatedir" (default LOCALSTATEDIR/run) should be fine. There are new test programs "test-mesh" and "agent.py". Install them like the rest, if enabled. Both python with shebang. While at it, fix the double-install of the python scripts, with and without executable permissions. The change e6c2932 "bluez: the python tests have no shebang so don't make them executable" was not fully minded in caa56e6 "bluez: version bump 5.30 -> 5.50". There are no bluez patches, so nothing to merge. Signed-off-by: Andreas Pretzsch --- Quick test with scanning and l2ping (still) works. No further tests. rules/bluez.make | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/rules/bluez.make b/rules/bluez.make index 39f8f6bbf..0ac2fad49 100644 --- a/rules/bluez.make +++ b/rules/bluez.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BLUEZ) += bluez # # Paths and names # -BLUEZ_VERSION := 5.50 -BLUEZ_MD5 := 860349d2afebf130f772c0f2943b5a27 +BLUEZ_VERSION := 5.51 +BLUEZ_MD5 := ce74914edba5ddfb49a8e6d85d600d22 BLUEZ := bluez-$(BLUEZ_VERSION) BLUEZ_SUFFIX := tar.gz BLUEZ_URL := $(call ptx/mirror, KERNEL, bluetooth/$(BLUEZ).$(BLUEZ_SUFFIX)) @@ -56,10 +56,11 @@ BLUEZ_CONF_OPT := $(CROSS_AUTOCONF_USR) \ --$(call ptx/endis, PTXCONF_BLUEZ_TOOLS)-monitor \ --enable-udev \ --disable-cups \ - --disable-mesh \ --disable-midi \ --enable-obex \ + --disable-mesh \ --disable-btpclient \ + --disable-external-ell \ --$(call ptx/endis, PTXCONF_BLUEZ_CLIENT)-client \ --enable-systemd \ --enable-datafiles \ @@ -120,14 +121,13 @@ ifdef PTXCONF_BLUEZ_INSTALL_TESTSCRIPTS $(call install_copy, bluez, 0, 0, 0644, -, \ /usr/lib/bluez/test/$(testdata))$(ptx/nl)) - @$(foreach testprog, bluezutils.py dbusdef.py example-advertisement \ - example-gatt-client example-gatt-server ftp-client \ - list-devices map-client monitor-bluetooth opp-client \ - pbap-client sap_client.py simple-agent simple-endpoint \ - simple-player test-adapter test-device test-discovery \ - test-gatt-profile test-health test-health-sink test-hfp \ - test-manager test-nap test-network test-profile \ - test-sap-server, \ + @$(foreach testprog, agent.py example-advertisement example-gatt-client \ + example-gatt-server ftp-client list-devices map-client \ + monitor-bluetooth opp-client pbap-client simple-agent \ + simple-endpoint simple-player test-adapter test-device \ + test-discovery test-gatt-profile test-health \ + test-health-sink test-hfp test-manager test-mesh \ + test-nap test-network test-profile test-sap-server, \ $(call install_copy, bluez, 0, 0, 0755, -, \ /usr/lib/bluez/test/$(testprog))$(ptx/nl)) @$(foreach testprog, bluezutils.py dbusdef.py sap_client.py, \ -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] libnl: move to staging (superseded by libnl3)
The version 1 of libnl is long outdated and deprecated, with the last release 1.1.4 from 2013. Inside ptxdist, iw 3.14 was the last official user of LIBNL, all other packages use LIBNL3. With the update to iw 5.3, this was switched to LIBNL3, too. All other packages already switched to libnl version 3 (ptxdist rule "libnl3") for a long time, and so is the year-old recommendation of libnl mainline. Therefore move libnl to staging, and schedule for removal. Signed-off-by: Andreas Pretzsch --- Please check, didn't verify, just changed tags by ptx example. rules/libnl.in | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rules/libnl.in b/rules/libnl.in index 535af5cbe..0ea25f034 100644 --- a/rules/libnl.in +++ b/rules/libnl.in @@ -1,4 +1,6 @@ -## SECTION=system_libraries +## SECTION=staging +## old section: +### SECTION=system_libraries menuconfig LIBNL tristate @@ -11,6 +13,10 @@ menuconfig LIBNL netlink messaging and various netlink family specific interfaces. + STAGING: remove in ptxdist-2020.10.0 + Outdated version that is no longer maintained, and has been superseded + by libnl3. + if LIBNL config LIBNL_MONITOR -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] libnl3: fix license identifier (GPL-2.0-only -> LGPL-2.1-only)
One of the changes 3.4.0 -> 3.5.0 was to add SPDX tags all across the source files. They are now tagged as LGPL-2.1-only. The lib code itself had written LGPL-2.1-only headers already, as did most of the commandline tools (src/nf-* and src/nl-*). Very few of the cli tools have written GPL-2.0-only headers even now, but the LGPL-2.1-only SPDX tag was added there also. But given the use of those cli tools, and the meaning of LGPL for regular executables, they are probably fine as LGPL, too. For details, see https://github.com/thom311/libnl/pull/219 It was accepted mainline as commit cee0b1b 'Add SPDX identifiers'. Therefore update the license tag in the rule to follow mainline. Signed-off-by: Andreas Pretzsch --- rules/libnl3.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/libnl3.make b/rules/libnl3.make index 153c7b80e..5b3af0065 100644 --- a/rules/libnl3.make +++ b/rules/libnl3.make @@ -22,7 +22,7 @@ LIBNL3_SUFFIX := tar.gz LIBNL3_URL := https://github.com/thom311/libnl/releases/download/$(LIBNL3_RELEASE)/$(LIBNL3).$(LIBNL3_SUFFIX) LIBNL3_SOURCE := $(SRCDIR)/$(LIBNL3).$(LIBNL3_SUFFIX) LIBNL3_DIR := $(BUILDDIR)/$(LIBNL3) -LIBNL3_LICENSE := GPL-2.0-only +LIBNL3_LICENSE := LGPL-2.1-only # # autoconf -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 0/2] libnl3: version bump 3.4.0 -> 3.5.0 and license fix
Split in two patches, to keep license change clearly visible in history. To me, the license tag update looks legit, but please review and decide. For details, see commit comment. The version bump itself should be fine. Short test done here on a quite up-to-date system (kernel 5.3) with iw and tcpdump. Andreas Pretzsch (2): libnl3: version bump 3.4.0 -> 3.5.0 libnl3: fix license identifier (GPL-2.0-only -> LGPL-2.1-only) rules/libnl3.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] libnl3: version bump 3.4.0 -> 3.5.0
Update from libnl 3.4.0 (Oct 2017) to latest 3.5.0 (Sep 2019). On a first glance, just a lot of fixes and some added features. Plus updated copies and new imports of kernel headers (4.19.66). Signed-off-by: Andreas Pretzsch --- rules/libnl3.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libnl3.make b/rules/libnl3.make index 5b664f37b..153c7b80e 100644 --- a/rules/libnl3.make +++ b/rules/libnl3.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBNL3) += libnl3 # # Paths and names # -LIBNL3_VERSION := 3.4.0 -LIBNL3_MD5 := 8f71910c03db363b41e2ea62057a4311 +LIBNL3_VERSION := 3.5.0 +LIBNL3_MD5 := 74ba57b1b1d6f9f92268aa8141d8e8e4 LIBNL3 := libnl-$(LIBNL3_VERSION) LIBNL3_RELEASE := libnl$(subst .,_,$(LIBNL3_VERSION)) LIBNL3_SUFFIX := tar.gz -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] libnl: request to move to staging
Given that with the version bump of iw (3.14 -> 5.3) the last official user of libnl version 1 (ptxdist rule "libnl") is gone, I suggest it should be moved to staging. It is long outdated and deprecated, with the last official release 1.1.4 from 2013. In ptxdist, there is release 1.1. All other packages already switched to libnl version 3 (ptxdist rule "libnl3") for a long time, and so is the year-old recommendation of libnl mainline. Drop me a note (incl. removal date) if you want me to send a patch. Best regards, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] iw: version bump 3.14 -> 5.3
Update from iw 3.14 (Jan 2014) to latest 5.3 (Aug 2019). Since iw 3.5, it links against the newest version of libnl found, with libnl-3 preferred (at least version 3.2). Therefore switch from LIBNL to LIBNL3. The version 1 of libnl is long outdated and deprecated, with the last release 1.1.4 from 2013. Inside ptxdist, iw was the last official user of LIBNL, all other packages use LIBNL3. While at it, update URL to https (HSTS policy on www.kernel.org). Signed-off-by: Andreas Pretzsch --- rules/iw.in | 2 +- rules/iw.make | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/iw.in b/rules/iw.in index 2e3dbfbb2..19235d2ad 100644 --- a/rules/iw.in +++ b/rules/iw.in @@ -2,7 +2,7 @@ config IW tristate - select LIBNL + select LIBNL3 prompt "iw (wireless tools replacement)" help iw is a new nl80211 based CLI configuration utility for wireless devices. diff --git a/rules/iw.make b/rules/iw.make index 187c8beb6..efcab0ebe 100644 --- a/rules/iw.make +++ b/rules/iw.make @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_IW) += iw # # Paths and names # -IW_VERSION := 3.14 -IW_MD5 := 66e41053f6fc0781b683b5b688442de6 +IW_VERSION := 5.3 +IW_MD5 := b65bb6dc3b9474c55f6107a25469d8cf IW := iw-$(IW_VERSION) IW_SUFFIX := tar.xz -IW_URL := http://www.kernel.org/pub/software/network/iw/$(IW).$(IW_SUFFIX) +IW_URL := https://www.kernel.org/pub/software/network/iw/$(IW).$(IW_SUFFIX) IW_SOURCE := $(SRCDIR)/$(IW).$(IW_SUFFIX) IW_DIR := $(BUILDDIR)/$(IW) IW_LICENSE := ISC -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] rauc: select on-target tools depending on bootloader
RAUC relies on tools on the target to interact with the bootloader. As the bootloader selection is not part of ptxconfig, but platformconfig, have the user select the bootloader used on the target. Based on this, auto-select the appropriate package: barebox: dt-utils (barebox-state) U-Boot: u-boot-tools (fw_printenv, fw_setenv) EFI: efibootmgr (efibootmgr) Regarding GRUB support, grub-editenv from GRUB2 is required. Currently, there is no "GRUB2" package in ptxdist, so no active option for it. Signed-off-by: Andreas Pretzsch --- Changes v1->v2: - add "if RUNTIME", as these are runtime dependencies - reorder down to the other runtime dependencies - omit RAUC_GRUB (no GRUB2 in ptxdist), but keep as comment - do not use choice, but single selections Reason for single selections: Beside possible use cases where no specific bootloader support at all is desired, symbols might be used later for other decisions, even with multi-bootloader support. rules/rauc.in | 29 + 1 file changed, 29 insertions(+) diff --git a/rules/rauc.in b/rules/rauc.in index 213a1211e..3c5f64b00 100644 --- a/rules/rauc.in +++ b/rules/rauc.in @@ -14,6 +14,10 @@ menuconfig RAUC select JSON_GLIBif RAUC_JSON select SQUASHFS_TOOLS if RUNTIME select SQUASHFS_TOOLS_UNSQUASHFSif RUNTIME + select DT_UTILS if RUNTIME && RAUC_BAREBOX + select U_BOOT_TOOLS if RUNTIME && RAUC_U_BOOT + #select GRUB2 if RUNTIME && RAUC_GRUB + select EFIBOOTMGR if RUNTIME && RAUC_EFI help Robust Auto-Update Controller. RAUC controls the update process on embedded linux systems. @@ -78,4 +82,29 @@ config RAUC_BUNDLE_VERSION endif +config RAUC_BAREBOX + bool "barebox support" + help + To interact with barebox, barebox-state from dt-utils is used. + Auto-select this package for installation on the target. +config RAUC_U_BOOT + bool "U-Boot support" + help + To interact with U-Boot, fw_printenv and fw_setenv from + u-boot-tools are used. + Auto-select this package for installation on the target. +# Currently, there is no "GRUB2" package in ptxdist. Even with depends +# on BROKEN, ptxdist will complain about undefined symbol GRUB2. +# Still, keep this as reference, to have a complete bootloader list. +#config RAUC_GRUB +# bool "GRUB support" +# help +#To interact with GRUB2, grub-editenv from grub is used. +#Auto-select this package for installation on the target. +config RAUC_EFI + bool "EFI support" + help + To interact with EFI, efibootmgr from efibootmgr is used. + Auto-select this package for installation on the target. + endif -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] rauc: version bump 1.0 -> 1.1
Release 1.1 (released Jun 5, 2019) Enhancements * Check that we do not generate a bundle inside a source directory * Added full GRUB2 support, including status and primary slot readback (by Vitaly Ogoltsov and Beralt Meppelink) * Allow passing a slot's name via commandline instead of it's bootname * Show each slot's name in Booted from line of rauc status to simplify identification * Add resize option for ext4 slots to let RAUC run resize2fs on an ext4 slot after copying the image. * Allow dumping the signer certificate (--dump-cert) without verification * Allow specifying a keyring directory with multiple files to support non-conflicting installations of certificates from different packages (by Evan Edstrom) * Add a bootloader option efi-use-bootnext (only valid when bootloader is 'efi') to disable usage of BootNext for marking slots primary. * Support setting a system variant in the system-info handler via RAUC_SYSTEM_VARIANT * D-Bus "mountpoint" property now also exports external mount point * Made slot state, compatible and variant available as environment variables for slot hooks * Made system variant variable available as an environment variable for bundle hooks Bug fixes * Fix memory leaks in D-Bus notification callbacks (by Michael Heimpold) * Fix memory leaks in resolve_bundle_path (by Michael Heimpold) * Do not print misleading status dump when calling mark-* subcommands * Avoid mmap'ing potentially huge files (by Rasmus Villemoes) * Fix and cleanup checksum verification and handling (by Rasmus Villemoes) * Avoid assertion error caused by unconditional slot status hash table freeing * Make a-month-from-now validity check in signature verification more robust (by Rasmus Villemoes) Testing * Enable lgtm analysis for tests * Restructure signature tests with set_up and tear_down (by Evan Edstrom) * Move from gcc-6 to gcc-7 * Build environment fixes and workarounds Code * A failure in calling barebox_state bootchooser implementation should be propagated * Update to latest git-version-gen upstream version * Tail-call real rauc suprocess in rauc-service.sh (by Angus Lees) * Consistently return newly-allocated objects in resolve_path() * Enforce space between if and ( via uncrustify Documentation * Added an initial version of a man page (by Michael Heimpold) * Extended D-Bus API documentation * Improve description of how RAUC detects the booted slot * Added lgtm badge * Add hints on library dependencies * Clarifications on how to build and install RAUC * Add note on basic RAUC buildroot support * Clarification on usage of RAUC on host and target side * Clarified documentation of 'use-bundle-signing-time' option (by Michael Heimpold) * Typos fixed Contributions from: Angus Lees, Arnaud Rebillout, Beralt Meppelink, Enrico Joerns, Evan Edstrom, Ian Abbott, Jan Luebbe, Michael Heimpold, Rasmus Villemoes, Ulrich Oelmann, Vitaly Ogoltsov Signed-off-by: Andreas Pretzsch --- rules/rauc.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/rauc.make b/rules/rauc.make index 88817da78..cf305cdaa 100644 --- a/rules/rauc.make +++ b/rules/rauc.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc # # Paths and names # -RAUC_VERSION := 1.0 -RAUC_MD5 := f800eae12063b0004980581aeb4932c0 +RAUC_VERSION := 1.1 +RAUC_MD5 := c81644f96b14304b6bb9f2ac2de9d4fd RAUC := rauc-$(RAUC_VERSION) RAUC_SUFFIX:= tar.xz RAUC_URL := https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX) -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] alsa-utils: version bump 1.1.7 -> 1.1.9
http mirror dl.ambiweb.de for ftp.alsa-project.org is gone. Replace it with official 'FTP via HTTP (web) access' mirror at 'https://www.alsa-project.org/files/pub/'. As far as I can see from git commit log, no spectacular changes. Beside some small fixes and documentation improvements, the main thing is the addition of the new 'axfer' utility. This one is intended to replace current aplay/arecord in the long run. This commit only bumps the version, but does not targetinstall the new axfer (or any aplay/arecord symlinks to it). Signed-off-by: Andreas Pretzsch --- I have some rule updates for alsa-utils in the queue, like adding alsabat, axfer, and a bit of cleanup. But as they need some more polishing, they will be probably for-next. Especially alsabat inclusion needs rework of the fftw rule. In case anybody has a need for them today, write me. rules/alsa-utils.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make index a742e1015..f2d0387f7 100644 --- a/rules/alsa-utils.make +++ b/rules/alsa-utils.make @@ -17,12 +17,12 @@ PACKAGES-$(PTXCONF_ALSA_UTILS) += alsa-utils # # Paths and names # -ALSA_UTILS_VERSION := 1.1.7 -ALSA_UTILS_MD5 := 2b88796c6b05520e59eec6049de02f64 +ALSA_UTILS_VERSION := 1.1.9 +ALSA_UTILS_MD5 := 5ed21c3e296c06046cc986e732f625f6 ALSA_UTILS := alsa-utils-$(ALSA_UTILS_VERSION) ALSA_UTILS_SUFFIX := tar.bz2 ALSA_UTILS_URL := \ - http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/utils/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX) \ + https://www.alsa-project.org/files/pub/utils/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX) \ ftp://ftp.alsa-project.org/pub/utils/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX) ALSA_UTILS_SOURCE := $(SRCDIR)/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX) ALSA_UTILS_DIR := $(BUILDDIR)/$(ALSA_UTILS) -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] alsa-lib: version bump 1.1.7 -> 1.1.9
http mirror dl.ambiweb.de for ftp.alsa-project.org is gone.
Replace it with official 'FTP via HTTP (web) access' mirror
at 'https://www.alsa-project.org/files/pub/'.
Patch '0001-add-largefile-support.patch' is still required,
but should be refreshed someday by PTX:
Applying patch 0001-add-largefile-support.patch
patching file configure.ac
Hunk #2 succeeded at 709 (offset 43 lines).
As far as I can see from git commit log, no spectacular changes.
User visible target changes 1.1.7 -> 1.1.9:
- some minor bugfixes and improvements
- conf: pcm dmix - add CHANNELS argument
- a lot of UCM config file changes, additions, include updates
User visible build changes 1.1.7 -> 1.1.9:
- deprecated header /usr/include/asoundlib.h is gone
- deprecated header /usr/include/sys/asoundlib.h is still there
- deprecated (backward compatibility due to old mistake) extra
include path '-I${includedir}/alsa' in alsa.pc is gone.
See alsa-lib commit fc0e54c.
Replace '#include ' with '#include '
in faulty code, as it should have been right from the start.
Signed-off-by: Andreas Pretzsch
---
PTX, please feel free to refresh the largefile-support patch
from Lucas Stach and adapt the commit message accordingly.
I didn't refresh it, as I don't know if you track them somewhere.
.../0001-add-largefile-support.patch| 0
patches/{alsa-lib-1.1.7 => alsa-lib-1.1.9}/autogen.sh | 0
patches/{alsa-lib-1.1.7 => alsa-lib-1.1.9}/series | 0
rules/alsa-lib.in | 4 +++-
rules/alsa-lib.make | 6 +++---
5 files changed, 6 insertions(+), 4 deletions(-)
rename patches/{alsa-lib-1.1.7 =>
alsa-lib-1.1.9}/0001-add-largefile-support.patch (100%)
rename patches/{alsa-lib-1.1.7 => alsa-lib-1.1.9}/autogen.sh (100%)
rename patches/{alsa-lib-1.1.7 => alsa-lib-1.1.9}/series (100%)
diff --git a/patches/alsa-lib-1.1.7/0001-add-largefile-support.patch
b/patches/alsa-lib-1.1.9/0001-add-largefile-support.patch
similarity index 100%
rename from patches/alsa-lib-1.1.7/0001-add-largefile-support.patch
rename to patches/alsa-lib-1.1.9/0001-add-largefile-support.patch
diff --git a/patches/alsa-lib-1.1.7/autogen.sh
b/patches/alsa-lib-1.1.9/autogen.sh
similarity index 100%
rename from patches/alsa-lib-1.1.7/autogen.sh
rename to patches/alsa-lib-1.1.9/autogen.sh
diff --git a/patches/alsa-lib-1.1.7/series b/patches/alsa-lib-1.1.9/series
similarity index 100%
rename from patches/alsa-lib-1.1.7/series
rename to patches/alsa-lib-1.1.9/series
diff --git a/rules/alsa-lib.in b/rules/alsa-lib.in
index 7361f1226..ec5134d32 100644
--- a/rules/alsa-lib.in
+++ b/rules/alsa-lib.in
@@ -103,7 +103,9 @@ config ALSA_LIB_UCM
config ALSA_LIB_ALISP
bool
default y
- # necessary files missing in the tarball for version 1.1.7
+ # alisp itself broken in 1.1.7 builds now (alsa-lib commit 639d404),
+ # but then targets SI7018/sndo[cp]-mixer.alisp in src/conf/cards/
+ # fail (missing in tarball, present in git tree).
depends on BROKEN
prompt "alisp"
help
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index b8e1105a8..698b232aa 100644
--- a/rules/alsa-lib.make
+++ b/rules/alsa-lib.make
@@ -20,11 +20,11 @@ PACKAGES-$(PTXCONF_ALSA_LIB) += alsa-lib
ALSA_LIB_SUFFIX:= tar.bz2
ifdef PTXCONF_ALSA_LIB_FULL
-ALSA_LIB_VERSION := 1.1.7
-ALSA_LIB_MD5 := 51ca1283e27e7dc10207ccce33919cf2
+ALSA_LIB_VERSION := 1.1.9
+ALSA_LIB_MD5 := e6d429dbdcfaa0f034d907fa6dc3735e
ALSA_LIB := alsa-lib-$(ALSA_LIB_VERSION)
ALSA_LIB_URL := \
-
http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX)
\
+
https://www.alsa-project.org/files/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) \
ftp://ftp.alsa-project.org/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX)
endif
--
2.19.1
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] libpopt: add mirror URL (rpm5.org dead, use Gentoo as mirror)
rpm5.org seems to be gone for quite some time, or at least unreliable. The domain maps to dyn.com, and their nameservers don't know about it. Internet search shows this seems to be the case at least since May 2018, permanent or not. Therefore add a mirror URL, referring to Gentoo source archives: http://distfiles.gentoo.org/distfiles/popt-1.16.tar.gz Remark: Despite from 2010 (for the last 1.16 release), it still seems to be in use today by some packages. A grep over the ptxdist rules reveals "cryptsetup", "efibootmgr", "logrotate", "oprofile" and "samba". Signed-off-by: Andreas Pretzsch --- It might also be helpful to add this package to the ptxdist mirror. rules/libpopt.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/libpopt.make b/rules/libpopt.make index 06e6d896f..a96aa9be3 100644 --- a/rules/libpopt.make +++ b/rules/libpopt.make @@ -21,7 +21,8 @@ LIBPOPT_VERSION := 1.16 LIBPOPT_MD5:= 3743beefa3dd6247a73f8f7a32c14c33 LIBPOPT:= popt-$(LIBPOPT_VERSION) LIBPOPT_SUFFIX := tar.gz -LIBPOPT_URL:= http://rpm5.org/files/popt/$(LIBPOPT).$(LIBPOPT_SUFFIX) +LIBPOPT_URL:= http://rpm5.org/files/popt/$(LIBPOPT).$(LIBPOPT_SUFFIX) \ + http://distfiles.gentoo.org/distfiles/$(LIBPOPT).$(LIBPOPT_SUFFIX) LIBPOPT_SOURCE := $(SRCDIR)/$(LIBPOPT).$(LIBPOPT_SUFFIX) LIBPOPT_DIR:= $(BUILDDIR)/$(LIBPOPT) LIBPOPT_LICENSE:= MIT -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] rauc: select on-target tools depending on bootloader
On Fri, 2019-05-31 at 19:01 +0200, Andreas Pretzsch wrote: > RAUC relies on tools on the target to interact with the bootloader. > As the bootloader selection is not part of ptxconfig, but > platformconfig, > have the user select the bootloader used on the target. Had this on a new system (DistroKit based) using barebox, where dt- utils was not selected. Therefore, no barebox-state present on the target. RAUC relies on it to interact with barebox, so it should be automatically selected. Also the standard way (select DT_UTILS if BAREBOX) did not trigger, presumably as PTXCONF_BAREBOX is part of platformconfig, not ptxconfig. So I introduced a choice. Or is there any way to achieve this using simple if-conditions ? > Based on this choice, auto-select the appropriate packages: > barebox: dt-utils (barebox-state) Well, this works. > U-Boot: u-boot-tools (fw_printenv, fw_setenv) I suppose this is sufficient, but didn't check. @PTX: please verify. > GRUB: none (grub-editenv already part of GRUB package) I suppose this true, but didn't check. @PTX: please verify. > EFI: efibootmgr (efibootmgr) I suppose this make sense, but didn't check. @PTX: please verify. Any sense to also add a "none", like rauc supports it (via 'noop') ? What about a default, now 'barebox' is implicit default. Suggestions ? Anything to look into for host-rauc ? Target will most likely only have one type of bootloader, host tool might be used for several different targets. Or do you see any use in not making this a choice, but allow to select multiple bootloaders (here: for auto-dependencies on target, but maybe in future, those config options be used for other things, too) ? > Signed-off-by: Andreas Pretzsch Feel free to adapt patch by your own discretion. Of course, I can always also send in a V2. > --- > rules/rauc.in | 15 +++ > 1 file changed, 15 insertions(+) > > diff --git a/rules/rauc.in b/rules/rauc.in > index 213a1211e..62977a0cb 100644 > --- a/rules/rauc.in > +++ b/rules/rauc.in > @@ -7,6 +7,9 @@ menuconfig RAUC > select GLIB > select GLIB_LIBMOUNT > select HOST_GLIB > + select DT_UTILS if RAUC_BAREBOX > + select U_BOOT_TOOLS if RAUC_U_BOOT > + select EFIBOOTMGR if RAUC_EFI > select BUSYBOX_FEATURE_TAR_LONG_OPTIONS if BUSYBOX_TAR > select BUSYBOX_FEATURE_TAR_AUTODETECT if BUSYBOX_TAR > select BUSYBOX_FEATURE_SEAMLESS_XZ if > BUSYBOX_TAR > @@ -19,6 +22,18 @@ menuconfig RAUC > > if RAUC > > +choice > + prompt "Bootloader used on target" > + config RAUC_BAREBOX > + bool "barebox" > + config RAUC_U_BOOT > + bool "U-Boot " > + config RAUC_GRUB > + bool "GRUB " > + config RAUC_EFI > + bool "EFI " > +endchoice > + > config RAUC_SERVICE > bool > prompt "Enable service (D-Bus) support" -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] rauc: select on-target tools depending on bootloader
RAUC relies on tools on the target to interact with the bootloader. As the bootloader selection is not part of ptxconfig, but platformconfig, have the user select the bootloader used on the target. Based on this choice, auto-select the appropriate packages: barebox: dt-utils (barebox-state) U-Boot: u-boot-tools (fw_printenv, fw_setenv) GRUB: none (grub-editenv already part of GRUB package) EFI: efibootmgr (efibootmgr) Signed-off-by: Andreas Pretzsch --- rules/rauc.in | 15 +++ 1 file changed, 15 insertions(+) diff --git a/rules/rauc.in b/rules/rauc.in index 213a1211e..62977a0cb 100644 --- a/rules/rauc.in +++ b/rules/rauc.in @@ -7,6 +7,9 @@ menuconfig RAUC select GLIB select GLIB_LIBMOUNT select HOST_GLIB + select DT_UTILS if RAUC_BAREBOX + select U_BOOT_TOOLS if RAUC_U_BOOT + select EFIBOOTMGR if RAUC_EFI select BUSYBOX_FEATURE_TAR_LONG_OPTIONS if BUSYBOX_TAR select BUSYBOX_FEATURE_TAR_AUTODETECT if BUSYBOX_TAR select BUSYBOX_FEATURE_SEAMLESS_XZ if BUSYBOX_TAR @@ -19,6 +22,18 @@ menuconfig RAUC if RAUC +choice + prompt "Bootloader used on target" + config RAUC_BAREBOX + bool "barebox" + config RAUC_U_BOOT + bool "U-Boot " + config RAUC_GRUB + bool "GRUB " + config RAUC_EFI + bool "EFI" +endchoice + config RAUC_SERVICE bool prompt "Enable service (D-Bus) support" -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] squashfs-tools: include sysmacros.h for recent systems (glibc 2.28)
Since glibc 2.28 (and deprecated since 2.25), sys/sysmacros.h is no longer included from sys/types.h. Explicitly include it, to have minor(), major() and makedev() defined. Strictly speaking, it might make sense to replace these calls also with gnu_dev_minor() et al., as the above #define's are historical shortcuts, too... Signed-off-by: Andreas Pretzsch --- Hit me when building an old BSP (ptxdist 2016.01 based) on a recent machine (Ubuntu 18.10) with glibc 2.28. But as squashfs-tools in current ptxdist is the same, pretty sure it will bite there, too. Guess there should be no side-effects (with previous glibc versions) and on other build hosts (like BSD, MacOS, etc.), but didn't check. @ PTX: Probably better check before applying to mainline. @ PTX: Feel free to adapt patch in any way. ...cros-h-for-recent-systems-glibc-2-28.patch | 39 +++ patches/squashfs4.3/series| 1 + 2 files changed, 40 insertions(+) create mode 100644 patches/squashfs4.3/include-sysmacros-h-for-recent-systems-glibc-2-28.patch create mode 100644 patches/squashfs4.3/series diff --git a/patches/squashfs4.3/include-sysmacros-h-for-recent-systems-glibc-2-28.patch b/patches/squashfs4.3/include-sysmacros-h-for-recent-systems-glibc-2-28.patch new file mode 100644 index 0..f635af637 --- /dev/null +++ b/patches/squashfs4.3/include-sysmacros-h-for-recent-systems-glibc-2-28.patch @@ -0,0 +1,39 @@ +include sysmacros.h for recent systems (glibc 2.28) + +Since glibc 2.28 (and deprecated since 2.25), sys/sysmacros.h +is no longer included from sys/types.h. Explicitly include it, +to have minor(), major() and makedev() defined. +Strictly speaking, it might make sense to replace these calls +also with gnu_dev_minor() et al., as the above #define's are +historical shortcuts, too... + +Signed-off-by: Andreas Pretzsch +--- + squashfs-tools/mksquashfs.c |1 + + squashfs-tools/unsquashfs.c |1 + + 2 files changed, 2 insertions(+) + +Index: b/squashfs-tools/mksquashfs.c +=== +--- a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include + #include + #include +Index: b/squashfs-tools/unsquashfs.c +=== +--- a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c +@@ -33,6 +33,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/patches/squashfs4.3/series b/patches/squashfs4.3/series new file mode 100644 index 0..63fad652c --- /dev/null +++ b/patches/squashfs4.3/series @@ -0,0 +1 @@ +include-sysmacros-h-for-recent-systems-glibc-2-28.patch -- 2.17.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] squashfs-tools: remove old patches for v3.4 (version removed)
In commit ccf3982 (part of ptxdist-2018.08.0), support for old squashfs-tools 3.4 was dropped. Remove leftover patches. Signed-off-by: Andreas Pretzsch --- patches/squashfs3.4/series | 1 - patches/squashfs3.4/squashfs_libs.diff | 34 -- 2 files changed, 35 deletions(-) delete mode 100644 patches/squashfs3.4/series delete mode 100644 patches/squashfs3.4/squashfs_libs.diff diff --git a/patches/squashfs3.4/series b/patches/squashfs3.4/series deleted file mode 100644 index de458cdb8..0 --- a/patches/squashfs3.4/series +++ /dev/null @@ -1 +0,0 @@ -squashfs_libs.diff diff --git a/patches/squashfs3.4/squashfs_libs.diff b/patches/squashfs3.4/squashfs_libs.diff deleted file mode 100644 index b70a5088d..0 --- a/patches/squashfs3.4/squashfs_libs.diff +++ /dev/null @@ -1,34 +0,0 @@ -Subject: Add way to change linker settings -From: Erwin Rol - -When cross compiling the linker can not find libz, this patch -adds a LIBS variable that makes it possible to pass the right -linker flags. - -Signed-off-by: Erwin Rol - squashfs3.4/squashfs-tools/Makefile.orig 2010-02-27 00:01:56.0 +0100 -+++ squashfs3.4/squashfs-tools/Makefile2010-02-27 00:02:46.0 +0100 -@@ -4,10 +4,12 @@ - - CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 - -+LIBS := -lz -lpthread -lm -+ - all: mksquashfs unsquashfs - - mksquashfs: mksquashfs.o read_fs.o sort.o -- $(CC) mksquashfs.o read_fs.o sort.o -lz -lpthread -lm -o $@ -+ $(CC) mksquashfs.o read_fs.o sort.o $(LIBS) $(LDFLAGS) -o $@ - - mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h - -@@ -16,7 +18,7 @@ - sort.o: sort.c squashfs_fs.h global.h sort.h - - unsquashfs: unsquashfs.o -- $(CC) unsquashfs.o -lz -lpthread -lm -o $@ -+ $(CC) unsquashfs.o $(LIBS) $(LDFLAGS) -o $@ - - unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h - -- 2.17.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] bzip2: fix URL (bzip.org archive gone, use Gentoo as mirror)
As of 22 September 2018, bzip2 sources are not longer available on http://www.bzip.org/. They state "Find the latest version on SourceForge", just I cannot find it there. Only as part of some other projects, which would be unreliable. So for now, refer to Gentoo source archives, i.e. http://distfiles.gentoo.org/distfiles/bzip2-1.0.6.tar.gz This should be revised as soon as there is another (official) source location. Signed-off-by: Andreas Pretzsch --- PTX: Please add source archive to Pengutronix local mirror. PTX: Feel free to revise / replace / drop patch, with a better location and/or different URL setup. rules/bzip2.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/bzip2.make b/rules/bzip2.make index 87434a664..53ddd3ed5 100644 --- a/rules/bzip2.make +++ b/rules/bzip2.make @@ -21,7 +21,7 @@ BZIP2_VERSION := 1.0.6 BZIP2_MD5 := 00b516f4704d4a7cb50a1d97e6e8e15b BZIP2 := bzip2-$(BZIP2_VERSION) BZIP2_SUFFIX := tar.gz -BZIP2_URL := http://www.bzip.org/$(BZIP2_VERSION)/$(BZIP2).$(BZIP2_SUFFIX) +BZIP2_URL := http://distfiles.gentoo.org/distfiles/$(BZIP2).$(BZIP2_SUFFIX) BZIP2_SOURCE := $(SRCDIR)/$(BZIP2).$(BZIP2_SUFFIX) BZIP2_DIR := $(BUILDDIR)/$(BZIP2) BZIP2_LICENSE := bzip2-1.0.6 -- 2.17.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [ANNOUNCE] OSELAS.Toolchain() 2018.02.0 released - host-m4 build error on Ubuntu 18.10
During build of the toolchain (at least in configs arm-v7a-linux- gnueabihf, arm-v7m-eabi, arm-v7em-eabihf) on an Ubuntu 18.10-beta host, build stopped here with an host-m4 error: fseeko.c: In function 'rpl_fseeko': fseeko.c:110:4: error: #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib." #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib." ^ GEN charset.alias make[4]: *** [Makefile:1910: fseeko.o] Error 1 make[4]: *** Waiting for unfinished jobs CC vasprintf.o freadahead.c: In function 'freadahead': freadahead.c:92:3: error: #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread, ungetc on your system, then report this to bug-gnulib." #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread, ungetc on your system, then report this to bug-gnulib." ^ make[4]: *** [Makefile:1910: freadahead.o] Error 1 Reason is the glibc 2.28 on the build host (libc6:amd64 2.28-0ubuntu1). Same probably applies to other distributions. In up-to-date ptxdist, there is a patch included fixing this issue: commit cba1e28 "m4/coreutil: add gnulib patches for GLibc-2.28" from Rouven Czerwinski, dating 2018-08-23. With this, m4 is patched accordingly, and build succeeds. The OSELAS.Toolchain-2018.02.0 ptxdist project refers to ptxdist- 2018.02.0 by default. Above patch is part of ptxdist-2018.09.0. So until there is a revised version of OSELAS.Toolchain, either use ptxdist-2018.09.0 or later for building, or include the patch in the toolchain project. @ PTX: This might be worth mentioning in the building instructions or at a similar place. Thanks for providing OSELAS.Toolchain, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Failed to compile gdbserver
On Mon, 2018-07-30 at 13:44 +0200, Michael Olbrich wrote: > On Mon, Jul 30, 2018 at 11:29:04AM +, Denis OSTERLAND wrote: > > I try to compile gdbserver with OSELAS.Toolchain-2018.02.0 on > > armv5te + armv7a, but it fails. > > I tried the default version 7.6.1: Just hit me too, same setup. Well, with ptxdist-2018.09, but same topic. > You need to use the same version as the gdb in the toolchain. That's > 8.1, if I remember correctly. Correct, there gdb 8.1 is used. Build is successful with PTXCONF_GDB_VERSION="8.1" PTXCONF_GDB_MD5="0c85ecbb43569ec43b1c9230622e84ab" Might be worth to check this, like it's done with gcc and glibc. Their versions are set in platformconfig (and checked), in this case: PTXCONF_CROSSCHAIN_CHECK="7.3.1" PTXCONF_GLIBC_VERSION="2.27" And so kind of centralizing toolchain version dependencies. But gdb version (which gdbserver follows) is set in ptxconfig, as PTXCONF_GDB_VERSION and PTXCONF_GDB_MD5. Where it belongs to, as those are installed to the target. Either gdbserver or even full gdb. Thinking of ways to improve this, I could imagine 1.) keep PTXCONF_GDB_* in ptxconfig, but add some "use version from toolchain" config flag, which will in turn take the data setup in platformconfig (probably new options there) 2.) add it somehow to "ptxdist migrate" (sensible / doable ?) 3.) at least add a comment to the config options For #3 I could send in a patch, for #1 or #2 I'd need some assistance from PTX side. Michael, what do you think, and prefer ? Best regards, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] license-csv: Add rules to generate CSV license report.
On Do, 2018-03-29 at 12:46 +, Denis OSTERLAND wrote: > > But I would refrain from including the URL (for now), simply as it > will > > include all sorts of characters, which then will require proper > > escaping. > > [...] > > > > Denis, what do you think ? > You are right, URL tend to be brittle. > We use it as input for an overview page on embedded web server. > This will need some refactoring. H... Based on research and quite some debates with lawyers, I'd say to have "only" the URL in a package list is critical at least. For a solid conformance with the various FOSS licenses, you should include most (if not all) of the content of the ptxdist license report. The one from "license-compliance-distribution" would be enough, but I'd suggest just to include the complete one. My suggestion here would be to omit the URL in the overview page, and also link to the license-blah.pdf (on the embedded webserver). Given you have the storage space available. So you provide everything in the device, and need no special hacks. Of course, you could always add a (modified) version of scripts/lib/ptxd_make_license_report.sh scripts/lib/ptxd_make_world_license.sh to your BSP folder under "scripts/lib/". Those will override the ones from "official" PTXdist. > By the way, is it possible depend on your csv report from make? > I guess I will need to add some wrapper target to call sh function. About adding a wrapper called from make, see "rules/post/ptxd_make_license_report.make". Maybe as an additional step to "license-compliance-distribution". Having something special for CSV, well, I just included it in the normal flow, beside the TeX/PDF generation. Would say, that's a good place. Of course, some hook to generate such a page would be nice, too. But this is something Michael has to decide, mainly from a conceptual point of view. Best regards, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] scripts/lib: also create CSV lists on "ptxdist make license-report"
On Do, 2018-03-29 at 11:46 +0200, Michael Olbrich wrote:
> Please create separate ptxd_make_license_report_tex /
> ptxd_make_license_report_csv functions that are called by
> ptxd_make_license_report.
Ok.
> > +ptxd_make_world_license_write_csv_header() {
> > + local -r STRING_QUOTE='"'
> > + local -r CSV_SEPARATOR='|'
>
> Lower case for local variables.
Ok.
> Also, I think a helper to write one line
> makes sense. Untested:
>
> helper() {
> string_quote='"'
> csv_separator='|'
> while [ ${#} -gt 0 ]; do
> if [ -n "${1}" ]; then
> echo -n "${string_quote}${1}${string_quote}"
> fi
> shift
> if [ [ ${#} -gt 0 ]; do
> echo -n ${csv_separator}"
> fi
> done
> echo
> }
Good point. Will do.
> > +ptxd_make_world_license_write_csv() {
> > + local -r STRING_QUOTE='"'
> > + local -r CSV_SEPARATOR='|'
> > + local -a flags=( "${!pkg_license_flags[@]}" )
> > + local l
> > +
> > + # not required, seems to be filtered before:
> > + #case "${pkg_license}" in
> > + #*ignore*)
> > + # # ignore this package, e.g. do not list it in the report
> > + # return 0
> > + # ;;
> > + #esac
Any comment on this commented section ?
Back then, I copied the logic from somewhere, but filtering was not
required in a real run. Still, kept it as reference.
I'll rework the patch as above over Easter time, plus
- include section tag (see Denis' patch)
- squash it into one with "add suffix _tex"
Best regards,
Andreas
--
carpe noctem engineering
Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch
Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1
Lange Strasse 28a Fax: +49-(0)7307-936088-9
89250 Senden, Germany email: a...@cn-eng.de
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] license-csv: Add rules to generate CSV license report.
On Do, 2018-03-29 at 07:29 +, Denis OSTERLAND wrote:
> +++ b/scripts/lib/ptxd_make_license_csv.sh
> @@ -0,0 +1,16 @@
> +#! /bin/bash
> +#
> +# Copyright (C) 2017 by Denis Osterland <denis.osterl...@diehl.com>
> +#
> +
> +ptxd_make_license_csv() {
> + declare -A pkg_license_flags
> + ptxd_make_world_license_init || return
> +
> + if [ "${pkg_section}" != "ignore" ]
> + then
> + echo "${pkg_label};${pkg_version};${pkg_section};
> ${pkg_license};${pkg_url}" > ${pkg_license_dir}/report.csv
> + fi
> +}
> +export -f ptxd_make_license_csv
Extending the field list by section is a good point, thanks. Will do.
But I would refrain from including the URL (for now), simply as it will
include all sorts of characters, which then will require proper
escaping. And in 20+ years, I've seen way too many broken parsers (and
escapers)...
Beside, the key point of the CSV list (to me / customers) is to have a
diff'able list of included packages (which ones, version, license),
beside the full fledged report. To see if one needs to look into
something. So URL is nice, but not mandatory.
Last, about the CSV separator, I chose | out of experience, avoiding
most collisions. Both , and ; show up often in text and even version
tags. Yes, they are marked as string with "", but back to "broken
parsers"...
So I still tend to a CSV output like:
"name"|"version"|"section"|"licenses"|"flags"
"somepackage"|"1.2.3"|"osi-conform"|"Apache-2.0"|"attribution"
[...]
Denis, what do you think ?
Michael, any experience/opinion on this ?
Best regards,
Andreas
--
carpe noctem engineering
Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch
Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1
Lange Strasse 28a Fax: +49-(0)7307-936088-9
89250 Senden, Germany email: a...@cn-eng.de
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] How to generate license report?
On Di, 2018-03-27 at 09:26 +, Alm, Michael wrote: > Also, it would be helpful to have a short-list with the package name, version > and license > type only, without all the license text. Maybe like this: > > 'ptxdist license-report target short' > > foo, 1.0, BSD > bar, 2.8.1.5, GPLv2 > ... Have a look at my patchset "license-report: also create CSV lists" just sent to the list. It adds CSV generation to the regular process (triggered by "ptxdist make license-report"). It might already solve your task. Best regards, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] scripts/lib: make_world_license: add suffix "_tex" to ptxd_make_world_license_write
Rename "function ptxd_make_world_license_write" to
"ptxd_make_world_license_write_tex", to be clear about
what it creates (LaTeX file, then a PDF from it).
This change is purely cosmetic.
But we will add other generation functions later,
similiar to this. Therefore rename it.
Signed-off-by: Andreas Pretzsch <a...@cn-eng.de>
---
Tested with PTXdist 2016.01.0, but given the minimal differences
against PTXdist 2018.03.0, I assume this is still fine.
scripts/lib/ptxd_make_world_license.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/lib/ptxd_make_world_license.sh
b/scripts/lib/ptxd_make_world_license.sh
index 1a79387..bba8ca3 100644
--- a/scripts/lib/ptxd_make_world_license.sh
+++ b/scripts/lib/ptxd_make_world_license.sh
@@ -125,7 +125,7 @@ export -f ptxd_make_latex_escape
# $pkg_license = the license string
# $pkg_license_texts/$pkg_license_texts_guessed = license text files
#
-ptxd_make_world_license_write() {
+ptxd_make_world_license_write_tex() {
local guess
local brl='{' brr='}'
local pkg_chapter="$(ptxd_make_latex_escape ${pkg_label})"
@@ -207,7 +207,7 @@ ptxd_make_world_license_write() {
EOF
done
}
-export -f ptxd_make_world_license_write
+export -f ptxd_make_world_license_write_tex
# Copy all patches according to the series file
# $1 full path to the series file
@@ -461,7 +461,7 @@ changed: ${md5} -> $(md5sum "${lic}" | sed 's/ .*//')
ptxd_bailout "Failed to copy '$(ptxd_print_path "${file}")'"
done &&
-ptxd_make_world_license_write | \
+ptxd_make_world_license_write_tex | \
sed -e 's/%/\\%/g' > "${pkg_license_dir}/license-report.tex" &&
check_pipe_status &&
--
2.9.3
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] scripts/lib: also create CSV lists on "ptxdist make license-report"
When calling "ptxdist make license-report", license reports for
both the target- and the host-tools-packages are created.
Based upon the license info files created during the regular build
process, LaTeX files are generated, which are then converted into
matching PDFs, containing package informations, license tags as well
as the licenses themselves.
These are called "report/license-report.pdf" respectively
"report/license-report-tools.pdf".
Extend this process to also create a list of these packages with the
most basic fields as CSV:
"name"|"version"|"licenses"|"flags"
"somepackage"|"1.2.3"|"Apache-2.0"|"attribution"
[...]
These are called "report/license-report.csv" respectively
"report/license-report-tools.csv".
The compliance report and distribution creation, trigger via
"ptxdist make license-compliance-distribution", is not modified,
as it essentially contains just a subset of the above packages,
namely all the Free and Open Source Software.
This could be extended by a CSV file, too, but it will not aid
in any verification of the overall distribution, as this has to
be checked in total, not only with respect to the FOSS parts.
Signed-off-by: Andreas Pretzsch <a...@cn-eng.de>
---
Tested with PTXdist 2016.01.0, but given the minimal differences
against PTXdist 2018.03.0, I assume this is still fine.
scripts/lib/ptxd_make_license_report.sh | 21
scripts/lib/ptxd_make_world_license.sh | 59 +
2 files changed, 80 insertions(+)
diff --git a/scripts/lib/ptxd_make_license_report.sh
b/scripts/lib/ptxd_make_license_report.sh
index a6410d1..d6570ca 100644
--- a/scripts/lib/ptxd_make_license_report.sh
+++ b/scripts/lib/ptxd_make_license_report.sh
@@ -194,6 +194,27 @@ ptxd_make_license_report() {
ptxd_make_license_report_footer
) > "${ptx_license_target_tex}"
+ptx_license_target_csv="${ptx_report_dir}/${pkg_section}/$(basename
"${ptx_license_target%.pdf}.csv")"
+(
+ local pkg_csv_file
+ ptxd_make_world_license_write_csv_header
+ for pkg in ${@}; do
+ pkg_lic="${ptxd_package_license_association[${pkg}]}"
+ if [ -z ${pkg_lic} ]; then
+ continue
+ fi
+ pkg_lic="${pkg_lic}/${pkg}"
+
+ pkg_csv_file="${ptx_report_dir}/${pkg_lic}/license-report.csv"
+ if [ -r "${pkg_csv_file}" ]; then
+ cat "${pkg_csv_file}"
+ else
+ ptxd_bailout "no $(ptxd_print_path "${pkg_csv_file}")"
+ fi
+ done
+ ptxd_make_world_license_write_csv_footer
+) > "${ptx_license_target_csv}"
+
ptxd_make_license_report_build
#mv "${ptx_license_target_tex%.tex}.pdf" "${ptx_license_target}"
}
diff --git a/scripts/lib/ptxd_make_world_license.sh
b/scripts/lib/ptxd_make_world_license.sh
index bba8ca3..39c696c 100644
--- a/scripts/lib/ptxd_make_world_license.sh
+++ b/scripts/lib/ptxd_make_world_license.sh
@@ -209,6 +209,63 @@ ptxd_make_world_license_write_tex() {
}
export -f ptxd_make_world_license_write_tex
+#
+# echo header for generated CSV:
+# "name"|"version"|"licenses"|"flags"
+#
+ptxd_make_world_license_write_csv_header() {
+ local -r STRING_QUOTE='"'
+ local -r CSV_SEPARATOR='|'
+ local l
+ l="${STRING_QUOTE}name${STRING_QUOTE}"
+ l="${l}${CSV_SEPARATOR}"
+ l="${l}${STRING_QUOTE}version${STRING_QUOTE}"
+ l="${l}${CSV_SEPARATOR}"
+ l="${l}${STRING_QUOTE}licenses${STRING_QUOTE}"
+ l="${l}${CSV_SEPARATOR}"
+ l="${l}${STRING_QUOTE}flags${STRING_QUOTE}"
+ l="${l}\n"
+ echo -ne "${l}"
+}
+export -f ptxd_make_world_license_write_csv_header
+#
+# generate a CSV for the package:
+# "somepackage"|"1.2.3"|"Apache-2.0"|"attribution"
+#
+ptxd_make_world_license_write_csv() {
+ local -r STRING_QUOTE='"'
+ local -r CSV_SEPARATOR='|'
+ local -a flags=( "${!pkg_license_flags[@]}" )
+ local l
+
+ # not required, seems to be filtered before:
+ #case "${pkg_license}" in
+ #*ignore*)
+ # # ignore this package, e.g. do not list it in the report
+ # return 0
+ # ;;
+ #esac
+
+ l="${STRING_QUOTE}${pkg_label}${STRING_QUOTE}"
+ l="${l}${CSV_SEPARATOR}"
+ [ -n "${pkg_version}" ] &&
l="${l}${STRING_QUOTE}${pkg_version}${STRING_QUOTE}"
+ l="${l}${CSV_SEPARATOR}&quo
[ptxdist] [PATCH 0/2] license-report: also create CSV lists
When calling "ptxdist make license-report", license reports for both the target- and the host-tools-packages are created. Based upon the license info files created during the regular build process, LaTeX files are generated, which are then converted into matching PDFs, containing package informations, license tags as well as the licenses themselves. These are called "report/license-report.pdf" respectively "report/license-report-tools.pdf". Extend this process to also create a list of these packages with the most basic fields as CSV: "name"|"version"|"licenses"|"flags" "somepackage"|"1.2.3"|"Apache-2.0"|"attribution" [...] These are called "report/license-report.csv" respectively "report/license-report-tools.csv". This minimal report is much more suited for a comparison of different builds resp. releases, and can be easily imported into some spreadsheet. Which in turn is useful both for developers and legal department. Keeping it minimal (e.g. no URL) most likely avoids CSV escaping hell. Tested with PTXdist 2016.01.0, but given the minimal differences against PTXdist 2018.03.0, I assume this is still fine. Albeit I did not test it. It is split into two commits (to ease local maintenance), but of course could be squashed into one. Also the commit subjects could be adapted, removing "scripts/lib", or if squashed even simply to "license-report: also create CSV lists". While all of this is working (and sufficient for my use case), it is also a bit of a RFC. Just don't expect I'll do some _substantial_ rework or improvement in a timely fashion... So, feel free to squash and/or fixup at your own discretion. Last, sorry for having this one delayed a year and a half before sending mainline... Andreas Pretzsch (2): scripts/lib: make_world_license: add suffix "_tex" to ptxd_make_world_license_write scripts/lib: also create CSV lists on "ptxdist make license-report" scripts/lib/ptxd_make_license_report.sh | 21 +++ scripts/lib/ptxd_make_world_license.sh | 65 +++-- 2 files changed, 83 insertions(+), 3 deletions(-) -- 2.9.3 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] libfaketime: new package for libfaketime 0.9.7
libfaketime intercepts various system calls that programs use to retrieve the current date and time. It then reports modified (faked) dates and times (as specified by you, the user) to these programs. This means you can modify the system time a program sees without having to change the time system-wide. libfaketime allows you to specify both absolute dates (e.g. 01/01/2004) and relative dates (e.g., 10 days ago). libfaketime might be used for various purposes, for example - deterministic build processes - debugging time-related issues, such as expired SSL certificates - testing software for year-2038 compliance libfaketime ships with a command line wrapper called "faketime" that makes it easier to use, but does not expose all of libfaketime's functionality. If your use case is not covered by the faketime command, make sure to look in this documentation whether it can be achieved by using libfaketime directly. For more information, see https://github.com/wolfcw/libfaketime Signed-off-by: Andreas Pretzsch <a...@cn-eng.de> --- Tested with PTXdist 2016.01.0, but simple, so should work for PTXdist upstream. rules/libfaketime.in | 27 ++ rules/libfaketime.make | 62 ++ 2 files changed, 89 insertions(+) create mode 100644 rules/libfaketime.in create mode 100644 rules/libfaketime.make diff --git a/rules/libfaketime.in b/rules/libfaketime.in new file mode 100644 index 000..87c42c0 --- /dev/null +++ b/rules/libfaketime.in @@ -0,0 +1,27 @@ +## SECTION=debug_tools + +config LIBFAKETIME + tristate + prompt "libfaketime" + help + libfaketime intercepts various system calls that programs use to + retrieve the current date and time. It then reports modified (faked) + dates and times (as specified by you, the user) to these programs. + This means you can modify the system time a program sees without + having to change the time system-wide. + + libfaketime allows you to specify both absolute dates (e.g. 01/01/2004) + and relative dates (e.g., 10 days ago). + + libfaketime might be used for various purposes, for example + - deterministic build processes + - debugging time-related issues, such as expired SSL certificates + - testing software for year-2038 compliance + + libfaketime ships with a command line wrapper called "faketime" that + makes it easier to use, but does not expose all of libfaketime's + functionality. If your use case is not covered by the faketime command, + make sure to look in this documentation whether it can be achieved by + using libfaketime directly. + + For more information, see https://github.com/wolfcw/libfaketime diff --git a/rules/libfaketime.make b/rules/libfaketime.make new file mode 100644 index 000..3736904 --- /dev/null +++ b/rules/libfaketime.make @@ -0,0 +1,62 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Andreas Pretzsch <a...@cn-eng.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. +# + +PACKAGES-$(PTXCONF_LIBFAKETIME) += libfaketime + +LIBFAKETIME_VERSION:= 0.9.7 +LIBFAKETIME_MD5:= 8617e2c6caf0977b3ce9a271f867302c +LIBFAKETIME:= libfaketime-$(LIBFAKETIME_VERSION) +LIBFAKETIME_SUFFIX := tar.gz +LIBFAKETIME_URL:= https://github.com/wolfcw/libfaketime/archive/v$(LIBFAKETIME_VERSION).$(LIBFAKETIME_SUFFIX) +LIBFAKETIME_SOURCE := $(SRCDIR)/$(LIBFAKETIME).$(LIBFAKETIME_SUFFIX) +LIBFAKETIME_DIR:= $(BUILDDIR)/$(LIBFAKETIME) +LIBFAKETIME_LICENSE:= GPL-2.0 + +# +# Prepare +# + +LIBFAKETIME_CONF_TOOL := NO + +# +# Compile +# + +LIBFAKETIME_MAKE_ENV := $(CROSS_ENV) +LIBFAKETIME_MAKE_OPT := PREFIX=/usr + +# +# Install +# + +LIBFAKETIME_INSTALL_OPT:= PREFIX=/usr install + +# +# Target-Install +# + +$(STATEDIR)/libfaketime.targetinstall: + @$(call targetinfo) + + @$(call install_init, libfaketime) + @$(call install_fixup, libfaketime,PRIORITY,optional) + @$(call install_fixup, libfaketime,SECTION,base) + @$(call install_fixup, libfaketime
Re: [ptxdist] [PATCH] add initial version of host-openocd package
On Di, 2017-01-17 at 15:56 +0100, Roland Hieber wrote: > On 17.01.2017 14:22, fixed-term.oleksij.rem...@de.bosch.com wrote: > > From: Oleksij Rempel <li...@rempel-privat.de> > > > > openocd 0.10.0-rc2 > > > > Signed-off-by: Oleksij Rempel <li...@rempel-privat.de> > > --- > > rules/host-openocd.in | 8 > > rules/host-openocd.make | 37 + > > [...] > > > > Well, that was short and easy :) But I see various enable/disable flags > in the configure help that default to "auto" and are not handled here in > the Makefile. These flags should be included for the build to be > reproducible, or have you checked that they don't depend on the build > order of the system? In any case, it is probably a good idea to include > any configure options in the menu to let the user choose the feature set > (i.e., memory footprint, and additional dependencies, if any). Back in 2014, I prepared a host package for openocd 0.8.0, which you might use as a template. Essentially the same as the target one (which got included mainline), just in a host variant. The host package was not really needed by anyone (me included), so it did not went in. You can find the threads on the mailinglist resp. there: [ptxdist] [PATCH] openocd: new package for openocd-0.8.0 (host, target) https://www.mail-archive.com/ptxdist@pengutronix.de/msg08936.html [ptxdist] [PATCH v2 2/2] host-openocd: new package for openocd-0.8.0 https://www.mail-archive.com/ptxdist@pengutronix.de/msg08969.html Best regards, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] license-report: extend to generate textual list of package + licenses
On Di, 2016-10-04 at 15:02 +0200, Michael Olbrich wrote: > > > [ptxdist make license-report] > > > > First, this one is wonderful, and works like a charm. Thanks a lot. > > > > What I am missing is an overview. > > Mainly as an external list, but maybe also in the reports. > > > > I'm talking about e.g. a simple CSV, listing all the included packages, > > like in "pkgname | pkgversion | licenses". So something like > > [...] > > busybox|1.24.2|GPL-2.0 > > [...] > > Sensible escaping would be something to look at, but anyway. > > [...] > > > > Has anyone already (partly) implemented this ? > > Would be happy to pick up the pieces and also mainline it. Just asking, > > before I start hacking things twice... > > I don't think there are any implementations like this. > > If we do something like this, then I'd like to take this a step further. I > think there are more use-cases for data like this. And there a probably > conflicting requirements for the different files and output formats. For sure. Both. Just, I'd like to start with a simple one, to have something. Or to be more precise, I have to, due to customer requirement. So in any case, I'll hack something the next few days. In case I'll hook it into the ptxdist scripts, I'll CC the list, as a RFC. Of course, I'm happy about any pointers where to put my fingers on in the scripts ;-) Out of my experience with these topics (license compliance, due diligence by laywer), the todays report is wonderful ! And sufficient here. Maybe it could be condensed in some points (like referencing fixed texts as the GPL instead of copying each time), but even this is not necessary. And/or converted to some other format (text, html), to be included in a product delivery itself (menu item, web interface, whatever). But to ease everyones task, and esp. have both developers and lawyers easily check what changed, we need a simple list. In whatever format, and included in the report or not. > The main issue with PTXdist is that we cannot just iterate over all > packages is one script. So what I'd like to see is something like the > current report stage to aggregate all possibly interesting data about the > packages and later convert an filter that into the required output. > What would be a good intermediate format for this? Sounds like the best way to do it. About an intermediate format, hmmm, good question. Not sure if there is one per se. Or from an pragmatic point of view, we already have one, the information in the report generation scripts. > I'd like to avoid escaping problems if possible. Me too :-) CSV is always fun... Looking at the minimal information (package name, version, license tags, maybe flags), I think we will not run into encoding and escaping issues here. As long as we leave out the URL. And stick with western package names. Just take everything as a string, and use | as separator. Should be good for now. At least, this would be my first try. And even if the format changes some day, this could be converted externally with minimal effort. -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] zip: add license information and license file for report generation
License information is pretty much the same as with unzip, just a newer revision of the (BSD-like) Info-ZIP license (here: version 2007-Mar-4). Add license tag and reference to license text. Signed-off-by: Andreas Pretzsch <a...@cn-eng.de> --- v1 -> v2: remove descriptive "BSD-like" in license tag rules/zip.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/zip.make b/rules/zip.make index 09ba4a0..239b11f 100644 --- a/rules/zip.make +++ b/rules/zip.make @@ -26,6 +26,8 @@ ZIP := zip$(ZIP_AVERSION) ZIP_URL:= $(call ptx/mirror, SF, infozip/$(ZIP_ARCHIVE)) ZIP_SOURCE := $(SRCDIR)/$(ZIP_ARCHIVE) ZIP_DIR:= $(BUILDDIR)/$(ZIP) +ZIP_LICENSE:= Info-ZIP +ZIP_LICENSE_FILES := file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d # # Compile -- 2.9.3 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] unzip: fix license information (remove descriptive "BSD-like")
license tags shall only contain SPDX identifiers. While the Info-ZIP license is BSD-like, this information comes from the license text resp. SPDX references. Therefore remove this comment. Signed-off-by: Andreas Pretzsch <a...@cn-eng.de> --- rules/unzip.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/unzip.make b/rules/unzip.make index ecd99e0..47380ba 100644 --- a/rules/unzip.make +++ b/rules/unzip.make @@ -25,7 +25,7 @@ UNZIP := unzip-$(UNZIP_VERSION) UNZIP_URL := $(call ptx/mirror, SF, infozip/$(UNZIP_ARCHIVE)) UNZIP_SOURCE := $(SRCDIR)/$(UNZIP_ARCHIVE) UNZIP_DIR := $(BUILDDIR)/$(UNZIP) -UNZIP_LICENSE := Info-ZIP, BSD-like +UNZIP_LICENSE := Info-ZIP UNZIP_LICENSE_FILES := file://LICENSE;md5=28dcc51d0d279f531e4be676efb0071f # -- 2.9.3 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] libmd: specification of license tags
On Di, 2016-10-04 at 16:19 +0200, Michael Olbrich wrote: > In this case, I'd say, let's just move the package to staging and not use > it at all. As I noted in my other mail, even ntp is not using it any more, > so it is no longer needed. ACK. Just sent a patch, with some information why: "libmd: move to staging (license issues and no more users inside ptxdist)" Not tested, but... Feel free to adapt as you like, e.g. by adding some remove-by date. -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] libmd: move to staging (license issues and no more users inside ptxdist)
libmd provides MD2, MD4, MD5, SHA-1 and RIPEMD-160 message digest algorithms. Each of the respective implementations includes different license statements, with wrappers under beer-ware license. None of them is specified or extracted in the ptxdist rule. In addition, to handle esp. the RSA license on MD2 and MD4, some build config parameters should be introduced to be able to remove them. In ptxdist, ntp was the only direct user of libmd, but provides its internal MD5 implementation by now. This one is used if no libmd or similar is found. From an incomplete check, libarchive can also make use of libmd, but prefers OpenSSL/libcrypto, as being more complete. Last, package seems to be not updated since 2009. So instead of fixing all of the above, move to staging, so it can be removed some day, unless somebody needs it and picks up above tasks. Signed-off-by: Andreas Pretzsch <a...@cn-eng.de> --- rules/libmd.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rules/libmd.in b/rules/libmd.in index 7e8e0e1..6b19ad8 100644 --- a/rules/libmd.in +++ b/rules/libmd.in @@ -1,4 +1,6 @@ -## SECTION=system_libraries +## SECTION=staging +## old section: +### SECTION=system_libraries menuconfig LIBMD tristate prompt "libmd " -- 2.9.3 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] ntp: remove dependency on libmd (ntp has internal MD5 code)
On Di, 2016-10-04 at 15:57 +0200, Michael Olbrich wrote: > > > diff --git a/rules/ntp.in b/rules/ntp.in > > > index a1aa6d9..9f85406 100644 > > > --- a/rules/ntp.in > > > +++ b/rules/ntp.in > > > @@ -8,7 +8,6 @@ menuconfig NTP > > > select LIBC_M > > > select LIBC_RT > > > select GCCLIBS_GCC_S > > > - select LIBMD > > > help > > > Build the standard NTP Daemon Process and supplementary programs. > > > This conflicts with BSD openntpd. > > > > Michael, you added this dependency with the commit 3ad9148 from > > 2011-01-18 called "[ntp] fix dependencies". Guess you don't remember > > exactly why, do you ? ;-) > > I think the version we used back then didn't have the internal > implementation. And if I read the code correctly, then the current version > doesn't even check any more and always used the internal version, so this > patch looks good. Depending on what is found, it will define its MD5 functions to match the internal or an external one. I think the old version I'm using even used the one from libmd when found, but well, it takes its internal one when there is no libmd or similar. And the internal one looks as good as the one from libmd, from a very short check. Anyway, I'd say lets drop the dependency. Best way to handle it. -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 4/4] zip: add license information and license file for report generation
On Di, 2016-10-04 at 15:30 +0200, Michael Olbrich wrote:
> On Mon, Oct 03, 2016 at 09:01:24PM +0200, Andreas Pretzsch wrote:
> > License information is pretty much the same as with unzip, just a newer
> > revision of the (BSD-like) Info-ZIP license (here: version 2007-Mar-4).
> >
> > Signed-off-by: Andreas Pretzsch <a...@cn-eng.de>
> > ---
> > rules/zip.make | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/rules/zip.make b/rules/zip.make
> > index 09ba4a0..ec59e72 100644
> > --- a/rules/zip.make
> > +++ b/rules/zip.make
> > @@ -26,6 +26,8 @@ ZIP := zip$(ZIP_AVERSION)
> > ZIP_URL:= $(call ptx/mirror, SF, infozip/$(ZIP_ARCHIVE))
> > ZIP_SOURCE := $(SRCDIR)/$(ZIP_ARCHIVE)
> > ZIP_DIR:= $(BUILDDIR)/$(ZIP)
> > +ZIP_LICENSE:= Info-ZIP, BSD-like
>
> Nothing with ',' here please. I think only 'Info-ZIP' is correct here, the
> 'BSD-like' is just a different description for the same license, right? And
> 'Info-ZIP' ist the correct SPDX identifiere.
All correct. Just followed the way it is stated in unzip.
But true, descriptive texts ("BSD-like") do not belong here, but should
come out of the real license, resp. from a link/addition to it, on
another place. Not from above tag.
I'll make a V2 of the patch, this time both for unzip and zip packages.
You prefer this patch combined or separate ?
--
carpe noctem engineering
Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch
Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1
Lange Strasse 28a Fax: +49-(0)7307-936088-9
89250 Senden, Germany email: a...@cn-eng.de
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] license-report: extend to generate textual list of package + licenses
On Mi, 2015-02-11 at 12:19 +0100, Juergen Borleis wrote: > Hi, > > 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. First, this one is wonderful, and works like a charm. Thanks a lot. What I am missing is an overview. Mainly as an external list, but maybe also in the reports. I'm talking about e.g. a simple CSV, listing all the included packages, like in "pkgname | pkgversion | licenses". So something like [...] busybox|1.24.2|GPL-2.0 [...] Sensible escaping would be something to look at, but anyway. Point is, this list would be easily diff'able between releases. And lawyers tend to be more expensive than developers... Also, one can sort it and make matrices of any kind, e.g. sort by GPLv3, and so on. Above would be the minimum information, for anything else, one can look into the big report. Maybe the flags like "attribution" and "choice" would be interessting, too. Now, this can be done with some shell scripting, outside of the build process. But as there is already the license-report generation, this would be the perfect place for it. Has anyone already (partly) implemented this ? Would be happy to pick up the pieces and also mainline it. Just asking, before I start hacking things twice... -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] ntp: fix license info (include reference to NTP license text)
Signed-off-by: Andreas Pretzsch <a...@cn-eng.de> --- rules/ntp.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/ntp.make b/rules/ntp.make index 3a9677a..5c3edb9 100644 --- a/rules/ntp.make +++ b/rules/ntp.make @@ -25,6 +25,7 @@ NTP_URL := http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$(NTP).$(NTP_S NTP_SOURCE := $(SRCDIR)/$(NTP).$(NTP_SUFFIX) NTP_DIR:= $(BUILDDIR)/$(NTP) NTP_LICENSE:= ntp +NTP_LICENSE_FILES := file://COPYRIGHT;md5=f41fedb22dffefcbfafecc85b0f79cfa # # Prepare -- 2.9.3 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] ntp: remove dependency on libmd (ntp has internal MD5 code)
On Mo, 2016-10-03 at 21:27 +0200, Andreas Pretzsch wrote: > libmd provides various message digest algorithms. > From these, ntp only uses MD5. > In case there is no system-wide MD5 (e.g. from libmd), ntp will use > its own implementation from lib/isc/md5.c instead. > Therefore, external dependency on libmd can be removed. Main reason I did this is that libmd license tagging is not that easy. See my parallel mail "libmd: specification of license tags". Beside, having an external lib just to externalize MD5, esp. one that seems to be not touched since 2009, might be a bit overkill. > Signed-off-by: Andreas Pretzsch <a...@cn-eng.de> > --- > build-tested with ntp-4.2.6p5, but code still present in ntp-4.2.8p7, so > I expect this will still work. Same applies for only using MD5 from libmd. Would be great if someone could check with a more recent ntp, i.e. the one in ptxdist mainline. On the concerned BSP here, I have some local work-around-ntp-tools-behaviour hacks, which I'm not keen on investing the time for porting... > > rules/ntp.in | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/rules/ntp.in b/rules/ntp.in > index a1aa6d9..9f85406 100644 > --- a/rules/ntp.in > +++ b/rules/ntp.in > @@ -8,7 +8,6 @@ menuconfig NTP > select LIBC_M > select LIBC_RT > select GCCLIBS_GCC_S > - select LIBMD > help > Build the standard NTP Daemon Process and supplementary programs. > This conflicts with BSD openntpd. Michael, you added this dependency with the commit 3ad9148 from 2011-01-18 called "[ntp] fix dependencies". Guess you don't remember exactly why, do you ? ;-) -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] libmd: specification of license tags
n call MD5Final, which * will fill a supplied 16-byte array with the digest. */ /* md5hl.c * * "THE BEER-WARE LICENSE" (Revision 42): * <p...@login.dkuug.dk> wrote this file. As long as you retain this notice you * can do whatever you want with this stuff. If we meet some day, and you think * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * * * $Id: md5hl.c,v 1.8.2.1 1998/02/18 02:24:05 jkh Exp $ * */ RIPEMD160 = /* * RIPEMD160.c - European RIPE Message Digest, 160 bit (RIPEMD-160) * * The algorithm is by Hans Dobbertin, Antoon Bosselaers, and Bart Preneel. * * The code below is based on the reference implementation by Bosselaers. * It is available at the time of writing from * http://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html * * Hacked for use in libmd by Martin Hinner <m...@penguin.cz> */ /* rmd160hl.c * * "THE BEER-WARE LICENSE" (Revision 42): * <p...@login.dkuug.dk> wrote this file. As long as you retain this notice you * can do whatever you want with this stuff. If we meet some day, and you think * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * * * $Id: rmd160hl.c,v 1.8.2.1 1998/02/18 02:24:05 jkh Exp $ * */ SHA-1 = /* * sha.c - NIST Secure Hash Algorithm, FIPS PUB 180 and 180.1. * The algorithm is by spook(s) unknown at the U.S. National Security Agency. * * Written 2 September 1992, Peter C. Gutmann. * This implementation placed in the public domain. * * Modified 1 June 1993, Colin Plumb. * Modified for the new SHS based on Peter Gutmann's work, * 18 July 1994, Colin Plumb. * * Renamed to SHA and comments updated a bit 1 November 1995, Colin Plumb. * These modifications placed in the public domain. * * Comments to pg...@cs.aukuni.ac.nz * * Hacked for use in libmd by Martin Hinner <m...@penguin.cz> */ /* shahl.c * * "THE BEER-WARE LICENSE" (Revision 42): * <p...@login.dkuug.dk> wrote this file. As long as you retain this notice you * can do whatever you want with this stuff. If we meet some day, and you think * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * * * $Id: shahl.c,v 1.8.2.1 1998/02/18 02:24:05 jkh Exp $ * */ -- carpe noctem engineering Ingenieurbuero fuer Hard- & Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas PretzschTel. +49-(0)7307-936088-1 Lange Strasse 28a Fax: +49-(0)7307-936088-9 89250 Senden, Germany email: a...@cn-eng.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] ntp: remove dependency on libmd (ntp has internal MD5 code)
libmd provides various message digest algorithms. From these, ntp only uses MD5. In case there is no system-wide MD5 (e.g. from libmd), ntp will use its own implementation from lib/isc/md5.c instead. Therefore, external dependency on libmd can be removed. Signed-off-by: Andreas Pretzsch <a...@cn-eng.de> --- build-tested with ntp-4.2.6p5, but code still present in ntp-4.2.8p7, so I expect this will still work. Same applies for only using MD5 from libmd. rules/ntp.in | 1 - 1 file changed, 1 deletion(-) diff --git a/rules/ntp.in b/rules/ntp.in index a1aa6d9..9f85406 100644 --- a/rules/ntp.in +++ b/rules/ntp.in @@ -8,7 +8,6 @@ menuconfig NTP select LIBC_M select LIBC_RT select GCCLIBS_GCC_S - select LIBMD help Build the standard NTP Daemon Process and supplementary programs. This conflicts with BSD openntpd. -- 2.9.3 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/4] gnupg: add license information (GPL-3.0+)
Nearly all of the code is licensed under GPL version 3 or later. There are a few pieces which are either GPLv2+, LGPLv2.1+, LGPLv3+: common/localename.c : LGPL-2.1+ gl/allocsa.c : GPL-2+ jnlib : LGPL-2.1+ ; LGPL-3+ All of these are only used internally (linked into gpg). So all in all, gnupg is GPL version 3 or later. Signed-off-by: Andreas Pretzsch <a...@cn-eng.de> --- rules/gnupg.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/gnupg.make b/rules/gnupg.make index 7f0270e..15e78eb 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -23,6 +23,7 @@ GNUPG_SUFFIX := tar.bz2 GNUPG_URL := ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX) GNUPG_SOURCE := $(SRCDIR)/$(GNUPG).$(GNUPG_SUFFIX) GNUPG_DIR := $(BUILDDIR)/$(GNUPG) +GNUPG_LICENSE := GPL-3.0+ # # Prepare -- 2.9.3 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 4/4] zip: add license information and license file for report generation
License information is pretty much the same as with unzip, just a newer revision of the (BSD-like) Info-ZIP license (here: version 2007-Mar-4). Signed-off-by: Andreas Pretzsch <a...@cn-eng.de> --- rules/zip.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/zip.make b/rules/zip.make index 09ba4a0..ec59e72 100644 --- a/rules/zip.make +++ b/rules/zip.make @@ -26,6 +26,8 @@ ZIP := zip$(ZIP_AVERSION) ZIP_URL:= $(call ptx/mirror, SF, infozip/$(ZIP_ARCHIVE)) ZIP_SOURCE := $(SRCDIR)/$(ZIP_ARCHIVE) ZIP_DIR:= $(BUILDDIR)/$(ZIP) +ZIP_LICENSE:= Info-ZIP, BSD-like +ZIP_LICENSE_FILES := file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d # # Compile -- 2.9.3 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/4] screen: add license information (GPL-2.0+)
Signed-off-by: Andreas Pretzsch <a...@cn-eng.de> --- rules/screen.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/screen.make b/rules/screen.make index 954463a..f9d7869 100644 --- a/rules/screen.make +++ b/rules/screen.make @@ -23,6 +23,7 @@ SCREEN_SUFFIX := tar.gz SCREEN_URL := $(call ptx/mirror, GNU, screen/$(SCREEN).$(SCREEN_SUFFIX)) SCREEN_SOURCE := $(SRCDIR)/$(SCREEN).$(SCREEN_SUFFIX) SCREEN_DIR := $(BUILDDIR)/$(SCREEN) +SCREEN_LICENSE := GPL-2.0+ # # Prepare -- 2.9.3 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 0/4] gnupg, screen, squashfs-tools, zip: add license tags
Add missing license tags for packages gnupg, screen, squashfs-tools, zip.
gnupg and screen are straightforward.
For squashfs-tools, there is already an old patch on the list
From: Oliver Graute <oliver.gra...@gmail.com>
Subject:[ptxdist] [PATCH] squashfs-tools: fix license information tag
Date: Fri, 18 Sep 2015 13:01:52 +0200
which never got picked up. Nearly same content ("GPLv2", but code is GPLv2+),
but old (non-SPDX) names. So suggest you take mine.
About zip, it is essentially the same license as for the unzip package,
just a newer revision. So I followed the statement in the unzip package
and called it "Info-ZIP, BSD-like", too. If SPDX provides a better way,
please feel free to fix both ;-)
Last, feel free to squash and/or fixup at your own discretion.
Andreas Pretzsch (4):
gnupg: add license information (GPL-3.0+)
screen: add license information (GPL-2.0+)
squashfs-tools: add license information (GPL-2.0+)
zip: add license information and license file for report generation
rules/gnupg.make | 1 +
rules/screen.make | 1 +
rules/squashfs-tools.make | 2 +-
rules/zip.make| 2 ++
4 files changed, 5 insertions(+), 1 deletion(-)
--
2.9.3
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] sox: new package for SoX 14.4.2
On Mo, 2015-04-27 at 11:43 +0200, Michael Olbrich wrote: On Sat, Apr 18, 2015 at 02:40:51AM +0200, Andreas Pretzsch wrote: SoX is the Swiss Army Knife of sound processing utilities. It can convert audio files to other popular audio file types and also apply sound effects and filters during the conversion. See http://sox.sourceforge.net/ for more information. In addition to libsox, optionally the command-line tool sox and its shortcuts soxi, play, rec can be installed. Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- The --disable-openmp is required, as sox configure detects OpenMP support.yes, -fopenmp but won't run on targets without libgomp (GCC OpenMP) or similar. As I don't care about this here (probably like most users), just disable it, like some other packages in ptxdist do it. Regarding other configure options (like mp3 support and whatnot), rely on configure auto-detection, instead of adding with/without options by the dozen. Whoever needs this is welcome to step in. rules/sox.in | 46 +++ rules/sox.make | 62 ++ 2 files changed, 108 insertions(+) create mode 100644 rules/sox.in create mode 100644 rules/sox.make diff --git a/rules/sox.in b/rules/sox.in new file mode 100644 index 000..0622f3e --- /dev/null +++ b/rules/sox.in @@ -0,0 +1,46 @@ +## SECTION=multimedia_sound + +menuconfig SOX + tristate + prompt sox + help + SoX is the Swiss Army Knife of sound processing utilities. + It can convert audio files to other popular audio file types + and also apply sound effects and filters during the conversion. + See http://sox.sourceforge.net/ for more information. + +if SOX + +config SOX_SOX + bool + default y + prompt Install sox command-line tool + help + Install command-line tool providing all libSoX functionality. + Note: libsox is installed regardless of this option. + +config SOX_SOXI + bool + depends on SOX_SOX + prompt Install symlink soxi = sox + help + Add soxi command to display sound file metadata. + Same effect can be achieved with sox --info. I think we can just install this with sox Ok. Fixed in v2. + +config SOX_PLAY + bool + depends on SOX_SOX + prompt Install symlink play = sox + help + Add play command to use sox for basic playing. + Same effect can be achieved with sox file -d. + +config SOX_REC + bool + depends on SOX_SOX + prompt Install symlink rec = sox + help + Add rec command to use sox for basic recording. + Same effect can be achieved with sox -d file. Same for these two, or maybe one option for both. One option for both. I like to see this as an optional thing, esp. given the naming. play and rec are to global for my taste... + +endif diff --git a/rules/sox.make b/rules/sox.make new file mode 100644 index 000..bd03bdc --- /dev/null +++ b/rules/sox.make @@ -0,0 +1,62 @@ +# -*-makefile-*- +# +# Copyright (C) 2015 by Andreas Pretzsch a...@cn-eng.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. +# + +PACKAGES-$(PTXCONF_SOX) += sox + +SOX_VERSION:= 14.4.2 +SOX_MD5:= ba804bb1ce5c71dd484a102a5b27d0dd +SOX:= sox-$(SOX_VERSION) +SOX_SUFFIX := tar.bz2 +SOX_URL:= $(call ptx/mirror, SF, sox/$(SOX).$(SOX_SUFFIX)) +SOX_SOURCE := $(SRCDIR)/$(SOX).$(SOX_SUFFIX) +SOX_DIR:= $(BUILDDIR)/$(SOX) +SOX_LICENSE:= GPLv2+ (tools), LGPLv2.1+ (libs) + +# +# Prepare +# + +SOX_CONF_TOOL := autoconf +SOX_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-openmp You're missing a lot of options here and probably some depencencies in the .in file as well. Use the global largefile option, --disable-dl-*, --ensable-symlinks, and either disable, enable (with correct dependency) or add an option (use ptx/wwo for configure) for each exernal dependency. Regarding largefile, correct, missed that, sorry. Fixed in v2. Regarding enable-symlinks and disable-dl-*, these are default in configure, so passing them is redundant IMHO. And will miss future new options in this field. But as they won't harm (and are sox local), I add these by your request. Also added a comment that these are default, in case somebody wonders why they are in there. About the external dependencies, strictly speaking, there are none. But there are options to stop sox trying to use libraries
[ptxdist] [PATCH v2] sox: new package for SoX 14.4.2
SoX is the Swiss Army Knife of sound processing utilities. It can convert audio files to other popular audio file types and also apply sound effects and filters during the conversion. See http://sox.sourceforge.net/ for more information. In addition to libsox, optionally the command-line tool sox and its shortcuts soxi, play, rec can be installed. Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/sox.in | 91 ++ rules/sox.make | 85 ++ 2 files changed, 176 insertions(+) create mode 100644 rules/sox.in create mode 100644 rules/sox.make diff --git a/rules/sox.in b/rules/sox.in new file mode 100644 index 000..abaffc3 --- /dev/null +++ b/rules/sox.in @@ -0,0 +1,91 @@ +## SECTION=multimedia_sound + +menuconfig SOX + tristate + prompt sox + select FILE if SOX_MAGIC + select LIBPNG if SOX_PNG + # no LADSPA in PTXdist + select LIBMAD if SOX_MAD + select LIBID3TAGif SOX_ID3TAG + select LAME if SOX_LAME + select TWOLAME if SOX_TWOLAME + help + SoX is the Swiss Army Knife of sound processing utilities. + + It can convert audio files to other popular audio file types + and also apply sound effects and filters during the conversion. + See http://sox.sourceforge.net/ for more information. + + Selecting this option installs libsox. For sox binary, see menu. + +if SOX + +# features using external libraries +# - + +config SOX_MAGIC + bool + prompt MAGIC support + help + Include support for libmagic based file type autodetection. + libmagic is part of file utils. + +config SOX_PNG + bool + prompt PNG support + help + Include support for libpng based PNG generation. + Used in sox for spectrogram generation. + +# no LADSPA in PTXdist + +config SOX_MAD + bool + prompt MAD support + help + Include support for libmad based MP3 decoding. + +config SOX_ID3TAG + bool + prompt ID3TAG support + help + Include support for libid3tag based ID3 tag handling. + +config SOX_LAME + bool + prompt LAME support + help + Include support for libmp3lame based MP3 encoding. + +config SOX_TWOLAME + bool + prompt TWOLAME support + help + Include support for libtwolame based MP2 encoding. + + +# sox command-line tools +# -- + +config SOX_TOOLS_SOX_SOXI + bool + default y + prompt Install sox command-line tools sox, soxi + help + Install command-line tool 'sox' providing all libSoX functionality. + Also install symlink 'soxi' pointing to 'sox'. soxi displays + sound file metadata and is a shortcut for sox --info. + +config SOX_TOOLS_PLAY_REC + bool + depends on SOX_TOOLS_SOX_SOXI + prompt Install sox command-line tools play, rec + help + Install symlinks 'play' and 'rec' pointing to 'sox'. + play will use sox for basic playing and is a shortcut + for sox file -d. + rec will use sox for basic recording and is a shortcut + for sox -d file. + +endif diff --git a/rules/sox.make b/rules/sox.make new file mode 100644 index 000..b3c4e87 --- /dev/null +++ b/rules/sox.make @@ -0,0 +1,85 @@ +# -*-makefile-*- +# +# Copyright (C) 2015 by Andreas Pretzsch a...@cn-eng.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. +# + +PACKAGES-$(PTXCONF_SOX) += sox + +SOX_VERSION:= 14.4.2 +SOX_MD5:= ba804bb1ce5c71dd484a102a5b27d0dd +SOX:= sox-$(SOX_VERSION) +SOX_SUFFIX := tar.bz2 +SOX_URL:= $(call ptx/mirror, SF, sox/$(SOX).$(SOX_SUFFIX)) +SOX_SOURCE := $(SRCDIR)/$(SOX).$(SOX_SUFFIX) +SOX_DIR:= $(BUILDDIR)/$(SOX) +SOX_LICENSE:= GPLv2+ (tools), LGPLv2.1+ (libs) + +# +# Prepare +# + +SOX_CONF_TOOL := autoconf + +SOX_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + $(GLOBAL_LARGE_FILE_OPTION) + +# --disable-openmp : configure detects OpenMP support but won't run on +# targets without libgomp (GCC OpenMP) or similar +SOX_CONF_OPT += \ + --disable-openmp + +# --disable-dl-*: configure default ; link instead if Dlopen library +# --enable-symlinks : configure default ; for soxi, play, rec +SOX_CONF_OPT += \ + --disable-dl-mad \ + --disable-dl-lame \ + --disable-dl-twolame \ + --disable-dl-amrwb \ + --disable-dl-amrnb
Re: [ptxdist] [PATCH 1/2] libsamplerate: add package
On Mo, 2013-09-09 at 10:44 +0200, Michael Olbrich wrote: On Fri, Aug 23, 2013 at 06:04:47PM +0200, Andreas Pretzsch wrote: Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio. It is used e.g. by alsaloop from alsa-utils. More information, source and docs: http://www.mega-nerd.com/SRC/ Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/libsamplerate.in |7 + rules/libsamplerate.make | 71 ++ 2 files changed, 78 insertions(+) create mode 100644 rules/libsamplerate.in create mode 100644 rules/libsamplerate.make diff --git a/rules/libsamplerate.in b/rules/libsamplerate.in new file mode 100644 index 000..4bdc265 --- /dev/null +++ b/rules/libsamplerate.in @@ -0,0 +1,7 @@ +## SECTION=multimedia_libs + +config LIBSAMPLERATE + bool + prompt libsamplerate + help + Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio. diff --git a/rules/libsamplerate.make b/rules/libsamplerate.make new file mode 100644 index 000..a1ccf60 --- /dev/null +++ b/rules/libsamplerate.make @@ -0,0 +1,71 @@ +# -*-makefile-*- +# +# Copyright (C) 2013 by Andreas Pretzsch a...@cn-eng.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_LIBSAMPLERATE) += libsamplerate + +# +# Paths and names +# +LIBSAMPLERATE_VERSION := 0.1.8 +LIBSAMPLERATE_MD5 := 1c7fb25191b4e6e3628d198a66a84f47 +LIBSAMPLERATE := libsamplerate-$(LIBSAMPLERATE_VERSION) +LIBSAMPLERATE_SUFFIX := tar.gz +LIBSAMPLERATE_URL := http://www.mega-nerd.com/SRC/$(LIBSAMPLERATE).$(LIBSAMPLERATE_SUFFIX) +LIBSAMPLERATE_SOURCE := $(SRCDIR)/$(LIBSAMPLERATE).$(LIBSAMPLERATE_SUFFIX) +LIBSAMPLERATE_DIR := $(BUILDDIR)/$(LIBSAMPLERATE) +LIBSAMPLERATE_LICENSE := GPLv2+ + +# +# Extract +# + +$(STATEDIR)/libsamplerate.extract: + @$(call targetinfo) + @$(call clean, $(LIBSAMPLERATE_DIR)) + @$(call extract, LIBSAMPLERATE) + cd $(LIBSAMPLERATE_DIR) [ -f configure ] || sh autogen.sh + @$(call patchin, LIBSAMPLERATE) + @$(call touch) remove this. Will do in v2. + +# +# Prepare +# + +#LIBSAMPLERATE_CONF_ENV:= $(CROSS_ENV) remove Will do in v2. +# +# autoconf +# +LIBSAMPLERATE_CONF_TOOL:= autoconf +#LIBSAMPLERATE_CONF_OPT:= $(CROSS_AUTOCONF_USR) Add some defaults, for fftw and sndfile at least. Finally took the time to look into this. Compiled and tested without sndfile and fftw, with sndfile enabled, and with sndfile and fftw enabled. Result: The autodetect of libsamplerate configure works well here. All we have here from configure is: --disable-fftw disable usage of FFTW --disable-sndfile disable support for sndfile [...] SNDFILE_CFLAGS C compiler flags for SNDFILE, overriding pkg-config SNDFILE_LIBS linker flags for SNDFILE, overriding pkg-config FFTW3_CFLAGS C compiler flags for FFTW3, overriding pkg-config FFTW3_LIBS linker flags for FFTW3, overriding pkg-config build with both disabled: [...] checking for SNDFILE... no checking for FFTW3... no [...] Extra tools required for testing and examples : Use FFTW : no Have libsndfile : . no [...] build with sndfile enabled: [...] checking for SNDFILE... yes checking for FFTW3... no [...] Extra tools required for testing and examples : Use FFTW : no Have libsndfile : . yes [...] build with sndfile and fftw enabled: [...] checking for SNDFILE... yes checking for FFTW3... yes [...] Extra tools required for testing and examples : Use FFTW : yes Have libsndfile : . yes [...] Now, libsamplerate-0.1.8/INSTALL states that sndfile are fftw are only required for some examples and some tests. None of which are installed here. By sure some sweet pieces of code, for everyone interessted in using libsamplerate in an own project. But at least for my usage (alsaloop), this is not the case. Same applies for fixing pkg-config troubles by passing flags. Last, forcefully disabling one or both with a configure option - despite being enabled in ptxconfig and hence found - won't buy us much. Just, libsamplerate won't link against them. Not worth a ptx option, in my opinion. Bottom line: I don't see any
Re: [ptxdist] [PATCH 2/2] package alsa-utils: alsaloop requires libsamplerate, so autoselect it
On Mo, 2013-09-09 at 10:45 +0200, Michael Olbrich wrote: On Fri, Aug 23, 2013 at 06:04:48PM +0200, Andreas Pretzsch wrote: Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/alsa-utils.in |1 + 1 file changed, 1 insertion(+) diff --git a/rules/alsa-utils.in b/rules/alsa-utils.in index c24bbf6..c924ec6 100644 --- a/rules/alsa-utils.in +++ b/rules/alsa-utils.in @@ -50,6 +50,7 @@ config ALSA_UTILS_ALSAMIXER config ALSA_UTILS_ALSALOOP bool prompt alsaloop + select LIBSAMPLERATE This won't work. You're not getting the correct build-time dependencies like this. Correct is this: config ALSA_UTILS [...] select LIBSAMPLERATE if ALSA_UTILS_ALSAMIXER [...] Will fix in v2. -- carpe noctem engineering Ingenieurbuero fuer Hard- Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas Pretzsch Tel. +49-(0)731-5521572 Hahnengasse 3 Fax: +49-(0)731-5521571 89073 Ulm, Germanyemail: a...@cn-eng.de -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] alsa-utils: autoselect libsamplerate for alsaloop
alsaloop will bail out with No libsamplerate support. when not linked against libsamplerate, as it defaults to sincfastest from libsamplerate (equal to -A 3). While this can be bypassed with an (undocumented) -A -1, just autoselect libsamplerate for alsaloop. Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/alsa-utils.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/alsa-utils.in b/rules/alsa-utils.in index c24bbf6..d360e00 100644 --- a/rules/alsa-utils.in +++ b/rules/alsa-utils.in @@ -4,6 +4,7 @@ menuconfig ALSA_UTILS tristate prompt alsa utils select NCURSES if ALSA_UTILS_ALSAMIXER + select LIBSAMPLERATE if ALSA_UTILS_ALSALOOP select ALSA_LIB # alsa-utils fails with the salsa-lib select ALSA_LIB_FULL -- 2.1.3 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] libsamplerate: new package for libsamplerate 0.1.8
Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio. It is used e.g. by alsaloop from alsa-utils. More information, source and docs: http://www.mega-nerd.com/SRC/ Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/libsamplerate.in | 8 +++ rules/libsamplerate.make | 58 2 files changed, 66 insertions(+) create mode 100644 rules/libsamplerate.in create mode 100644 rules/libsamplerate.make diff --git a/rules/libsamplerate.in b/rules/libsamplerate.in new file mode 100644 index 000..82030e4 --- /dev/null +++ b/rules/libsamplerate.in @@ -0,0 +1,8 @@ +## SECTION=multimedia_libs + +config LIBSAMPLERATE + bool + prompt libsamplerate + help + Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio. + More information, source and docs: http://www.mega-nerd.com/SRC/ diff --git a/rules/libsamplerate.make b/rules/libsamplerate.make new file mode 100644 index 000..ff23cfd --- /dev/null +++ b/rules/libsamplerate.make @@ -0,0 +1,58 @@ +# -*-makefile-*- +# +# Copyright (C) 2015 by Andreas Pretzsch a...@cn-eng.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. +# + +PACKAGES-$(PTXCONF_LIBSAMPLERATE) += libsamplerate + +LIBSAMPLERATE_VERSION := 0.1.8 +LIBSAMPLERATE_MD5 := 1c7fb25191b4e6e3628d198a66a84f47 +LIBSAMPLERATE := libsamplerate-$(LIBSAMPLERATE_VERSION) +LIBSAMPLERATE_SUFFIX := tar.gz +LIBSAMPLERATE_URL := http://www.mega-nerd.com/SRC/$(LIBSAMPLERATE).$(LIBSAMPLERATE_SUFFIX) +LIBSAMPLERATE_SOURCE := $(SRCDIR)/$(LIBSAMPLERATE).$(LIBSAMPLERATE_SUFFIX) +LIBSAMPLERATE_DIR := $(BUILDDIR)/$(LIBSAMPLERATE) +LIBSAMPLERATE_LICENSE := GPLv2+ + +# +# Prepare +# + +# --disable-cpu-clip disable tricky cpu specific clipper +# CPU clipping would allow src_float_to_short_array() to omit overflow +# and underflow checks. But the configure check for this CPU feature runs +# on the build host, not on the target. So it might be false-positive. +# Not the case on my build host here (x86_64, Intel Core2), as detected +# as no (= disabled), but to be safe, forcefully disable it. +# Note: There is no force enable counterpart. + +LIBSAMPLERATE_CONF_TOOL:= autoconf +LIBSAMPLERATE_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-cpu-clip + +# +# Target-Install +# + +$(STATEDIR)/libsamplerate.targetinstall: + @$(call targetinfo) + + @$(call install_init, libsamplerate) + @$(call install_fixup, libsamplerate,PRIORITY,optional) + @$(call install_fixup, libsamplerate,SECTION,base) + @$(call install_fixup, libsamplerate,AUTHOR,Andreas Pretzsch a...@cn-eng.de) + @$(call install_fixup, libsamplerate,DESCRIPTION,libsamplerate aka Secret Rabbit Code, a Sample Rate Converter for audio) + + @$(call install_lib, libsamplerate, 0, 0, 0644, libsamplerate) + + @$(call install_finish, libsamplerate) + + @$(call touch) + +# vim: syntax=make -- 2.1.3 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] sox: new package for SoX 14.4.2
SoX is the Swiss Army Knife of sound processing utilities. It can convert audio files to other popular audio file types and also apply sound effects and filters during the conversion. See http://sox.sourceforge.net/ for more information. In addition to libsox, optionally the command-line tool sox and its shortcuts soxi, play, rec can be installed. Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- The --disable-openmp is required, as sox configure detects OpenMP support.yes, -fopenmp but won't run on targets without libgomp (GCC OpenMP) or similar. As I don't care about this here (probably like most users), just disable it, like some other packages in ptxdist do it. Regarding other configure options (like mp3 support and whatnot), rely on configure auto-detection, instead of adding with/without options by the dozen. Whoever needs this is welcome to step in. rules/sox.in | 46 +++ rules/sox.make | 62 ++ 2 files changed, 108 insertions(+) create mode 100644 rules/sox.in create mode 100644 rules/sox.make diff --git a/rules/sox.in b/rules/sox.in new file mode 100644 index 000..0622f3e --- /dev/null +++ b/rules/sox.in @@ -0,0 +1,46 @@ +## SECTION=multimedia_sound + +menuconfig SOX + tristate + prompt sox + help + SoX is the Swiss Army Knife of sound processing utilities. + It can convert audio files to other popular audio file types + and also apply sound effects and filters during the conversion. + See http://sox.sourceforge.net/ for more information. + +if SOX + +config SOX_SOX + bool + default y + prompt Install sox command-line tool + help + Install command-line tool providing all libSoX functionality. + Note: libsox is installed regardless of this option. + +config SOX_SOXI + bool + depends on SOX_SOX + prompt Install symlink soxi = sox + help + Add soxi command to display sound file metadata. + Same effect can be achieved with sox --info. + +config SOX_PLAY + bool + depends on SOX_SOX + prompt Install symlink play = sox + help + Add play command to use sox for basic playing. + Same effect can be achieved with sox file -d. + +config SOX_REC + bool + depends on SOX_SOX + prompt Install symlink rec = sox + help + Add rec command to use sox for basic recording. + Same effect can be achieved with sox -d file. + +endif diff --git a/rules/sox.make b/rules/sox.make new file mode 100644 index 000..bd03bdc --- /dev/null +++ b/rules/sox.make @@ -0,0 +1,62 @@ +# -*-makefile-*- +# +# Copyright (C) 2015 by Andreas Pretzsch a...@cn-eng.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. +# + +PACKAGES-$(PTXCONF_SOX) += sox + +SOX_VERSION:= 14.4.2 +SOX_MD5:= ba804bb1ce5c71dd484a102a5b27d0dd +SOX:= sox-$(SOX_VERSION) +SOX_SUFFIX := tar.bz2 +SOX_URL:= $(call ptx/mirror, SF, sox/$(SOX).$(SOX_SUFFIX)) +SOX_SOURCE := $(SRCDIR)/$(SOX).$(SOX_SUFFIX) +SOX_DIR:= $(BUILDDIR)/$(SOX) +SOX_LICENSE:= GPLv2+ (tools), LGPLv2.1+ (libs) + +# +# Prepare +# + +SOX_CONF_TOOL := autoconf +SOX_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-openmp + +# +# Target-Install +# + +$(STATEDIR)/sox.targetinstall: + @$(call targetinfo) + + @$(call install_init, sox) + @$(call install_fixup, sox,PRIORITY,optional) + @$(call install_fixup, sox,SECTION,base) + @$(call install_fixup, sox,AUTHOR,Andreas Pretzsch a...@cn-eng.de) + @$(call install_fixup, sox,DESCRIPTION,Sound eXchange, the Swiss Army knife of audio manipulation) + + @$(call install_lib, sox, 0, 0, 0644, libsox) +ifdef PTXCONF_SOX_SOX + @$(call install_copy, sox, 0, 0, 0755, -, /usr/bin/sox) +endif +ifdef PTXCONF_SOX_SOXI + @$(call install_link, sox, sox, /usr/bin/soxi) +endif +ifdef PTXCONF_SOX_PLAY + @$(call install_link, sox, sox, /usr/bin/play) +endif +ifdef PTXCONF_SOX_REC + @$(call install_link, sox, sox, /usr/bin/rec) +endif + + @$(call install_finish, sox) + + @$(call touch) + +# vim: syntax=make -- 2.1.3 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] gnupg: fix build breakage if ICONV is not enabled
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. 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
[ptxdist] [PATCH] gnupg: targetinstall: make gpg/gpg2 and gpgv2 selectable
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. 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
[ptxdist] [PATCH] triggerhappy: new package for triggerhappy (thd) version 0.3.4+git
thd - triggerhappy global hotkey daemon
Triggerhappy is a hotkey daemon developed with small and embedded
systems in mind, e.g. linux based routers. It attaches to the input
device files and interprets the event data received and executes
scripts configured in its configuration.
Import release 0.3.4 + patches [release/0.3.4..master (cb3ed9b..aac9f35)]
and a fix for cross-compiling.
Signed-off-by: Andreas Pretzsch a...@cn-eng.de
---
generic/etc/init.d/triggerhappy| 74 +
...larify-licence-information-GPLv3-or-later.patch | 347 +
...ault-SIGCHLD-handler-for-spawned-processe.patch | 38 +++
...CE-environment-variable-so-that-triggers-.patch | 25 ++
...ve-leading-whitespaces-from-command-lines.patch | 27 ++
...-detect-linux-input.h-path-with-gcc-4.8.0.patch | 30 ++
...-detect-linux-input.h-path-with-cross-gcc.patch | 28 ++
patches/triggerhappy-0.3.4/series | 9 +
rules/triggerhappy-bbinit.in | 7 +
rules/triggerhappy.in | 82 +
rules/triggerhappy.make| 79 +
11 files changed, 746 insertions(+)
create mode 100644 generic/etc/init.d/triggerhappy
create mode 100644
patches/triggerhappy-0.3.4/0001-clarify-licence-information-GPLv3-or-later.patch
create mode 100644
patches/triggerhappy-0.3.4/0002-Restore-default-SIGCHLD-handler-for-spawned-processe.patch
create mode 100644
patches/triggerhappy-0.3.4/0003-Set-TH_DEVICE-environment-variable-so-that-triggers-.patch
create mode 100644
patches/triggerhappy-0.3.4/0004-remove-leading-whitespaces-from-command-lines.patch
create mode 100644
patches/triggerhappy-0.3.4/0005-fix-failure-to-detect-linux-input.h-path-with-gcc-4.8.0.patch
create mode 100644
patches/triggerhappy-0.3.4/0006-fix-failure-to-detect-linux-input.h-path-with-cross-gcc.patch
create mode 100644 patches/triggerhappy-0.3.4/series
create mode 100644 rules/triggerhappy-bbinit.in
create mode 100644 rules/triggerhappy.in
create mode 100644 rules/triggerhappy.make
diff --git a/generic/etc/init.d/triggerhappy b/generic/etc/init.d/triggerhappy
new file mode 100644
index 000..d475751
--- /dev/null
+++ b/generic/etc/init.d/triggerhappy
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin
+NAME=thd
+PNAME=triggerhappy
+DAEMON=/usr/sbin/thd
+PIDFILE=/var/run/$NAME.pid
+DAEMON_ARGS=--daemon --pidfile $PIDFILE --socket /var/run/thd.socket
+DAEMON_ARGS=$DAEMON_ARGS --triggers @TRIGGERS@
+DAEMON_ARGS=$DAEMON_ARGS --user @USER@
+DAEMON_ARGS=$DAEMON_ARGS @INPUT_DEV@
+
+[ -r /etc/default/$PNAME ] . /etc/default/$PNAME
+
+case $1 in
+ start)
+ echo -n starting $PNAME...
+ start-stop-daemon -S -x $DAEMON -p $PIDFILE -- $DAEMON_ARGS
/dev/null 21
+ if [ $? = 0 ]; then
+ echo done
+ else
+ echo failed
+ exit 1
+ fi
+ ;;
+
+ stop)
+ echo -n stopping $PNAME...
+ start-stop-daemon -K -p $PIDFILE /dev/null 21
+ if [ $? = 0 ]; then
+ echo done
+ else
+ echo failed
+ exit 1
+ fi
+ ;;
+
+ restart|force-reload)
+ echo -n restarting $PNAME...
+ start-stop-daemon -K -x $DAEMON -p $PIDFILE /dev/null 21
+ if [ $? = 0 ]; then
+ echo done
+ else
+ echo failed
+ exit 1
+ fi
+ sleep 1
+ start-stop-daemon -S -x $DAEMON -p $PIDFILE /dev/null 21
+ if [ $? = 0 ]; then
+ echo done
+ else
+ echo failed
+ exit 1
+ fi
+ ;;
+
+ reload)
+ echo -n reloading $PNAME...
+ start-stop-daemon -K -x $DAEMON -p $PIDFILE -s 1 /dev/null
21
+ if [ $? = 0 ]; then
+ echo done
+ else
+ echo failed
+ exit 1
+ fi
+ ;;
+
+ *)
+ echo Usage: $0 {start|stop|restart|force-reload|reload} 2
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git
a/patches/triggerhappy-0.3.4/0001-clarify-licence-information-GPLv3-or-later.patch
b/patches/triggerhappy-0.3.4/0001-clarify-licence-information-GPLv3-or-later.patch
new file mode 100644
index 000..72774f5
--- /dev/null
+++
b/patches/triggerhappy-0.3.4/0001-clarify-licence-information-GPLv3-or-later.patch
@@ -0,0 +1,347 @@
+From 649bf670a012558393d7c41f3660d0a017edd982 Mon Sep 17 00:00:00 2001
+From: Stefan Tomanek stefan.toma...@wertarbyte.de
+Date: Tue, 10 May 2011 22:37:35 +0200
+Subject: [PATCH 1/4] clarify
Re: [ptxdist] [PATCH v2 1/2] openocd: new package for openocd-0.8.0
On Do, 2014-11-13 at 17:46 +0100, Michael Olbrich wrote: On Tue, Oct 07, 2014 at 01:18:18AM +0200, Andreas Pretzsch wrote: Signed-off-by: Andreas Pretzsch a...@cn-eng.de I've fixed some issued and blacklisted one driver: it fails to build here. Please check if things still work for you as expected. Looks good to me, thanks for fixing. What irritates me a bit is the license tag in the rules file: # License: OpenOCD: GPLv2+, jimtcl: BSD OPENOCD_LICENSE := LGPLv2+, BSD While I screwed this up in the original patch (had LGPLv2, BSD there instead of GPLv2+, BSD, see my mail from Sun, 26 Oct 2014 18:24:23 +0100 on the list about fixing), you changed it to LGPLv2+, BSD. As far as I can see, the whole (relevant) OpenOCD codebase is GPLv2+, but not LGPL. Was this intentional or did you just follow my example of cutwaste errors ? ;-) Thanks, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas Pretzsch Tel. +49-(0)731-5521572 Hahnengasse 3 Fax: +49-(0)731-5521571 89073 Ulm, Germanyemail: a...@cn-eng.de -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2 1/2] openocd: new package for openocd-0.8.0
On Do, 2014-11-13 at 17:46 +0100, Michael Olbrich wrote: On Tue, Oct 07, 2014 at 01:18:18AM +0200, Andreas Pretzsch wrote: Signed-off-by: Andreas Pretzsch a...@cn-eng.de I've fixed some issued and blacklisted one driver: it fails to build here. Please check if things still work for you as expected. Will do. Nothing yet in official ptxdist repo (makes sense), so could you please put your changes on the list (or send it to me directly) ? Thanks, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas Pretzsch Tel. +49-(0)731-5521572 Hahnengasse 3 Fax: +49-(0)731-5521571 89073 Ulm, Germanyemail: a...@cn-eng.de -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2 2/2] host-openocd: new package for openocd-0.8.0
On Do, 2014-11-13 at 17:48 +0100, Michael Olbrich wrote: On Tue, Oct 07, 2014 at 01:18:25AM +0200, Andreas Pretzsch wrote: Signed-off-by: Andreas Pretzsch a...@cn-eng.de I think the host package should just enable all drivers. The two mini drivers that cannot be enabled with the rest are either broken, or just a dummy driver, so I think it's ok. Well, there is some more-or-less default in the official OpenOCD, configure will enable about half of them based on what is found on the system (usb libs, and so on). Won't fit for anyone. One could use this. Or more likely, just set all not marked as broken to default y. Just, I honestly didn't bother to care about it, and test under what circumstances which is compiling, as probably everyone using OpenOCD will enable the ones they need. Which is why I put it the way it is now. Developer tool, in the end. As said before, the host-package is just a by-product of the target package. One could build it out of ptxdist or externally, the latter would be more common. This is why we talked about even including the host package in ptxdist. So, I leave the choice up to you: A) I update the patch with default y to all non-broken drivers, and do a quick compile test here. Will take a few days. B) We keep it as it is, as a reference on the list for anyone who might find it useful. Best regards, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas Pretzsch Tel. +49-(0)731-5521572 Hahnengasse 3 Fax: +49-(0)731-5521571 89073 Ulm, Germanyemail: a...@cn-eng.de -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] rng-tools: new package for rng-tools (rngd) version 5
On Do, 2014-11-13 at 17:52 +0100, Michael Olbrich wrote: On Sun, Oct 26, 2014 at 06:02:04PM +0100, Andreas Pretzsch wrote: random number generator daemon - seed kernel random from hwrng This daemon feeds data from a random number generator to the kernel's random number entropy pool, after first checking the data to ensure that it is properly random. By default, a hardware rng at /dev/hwrng is used as entropy source. This daemon is part of the rng-tools, which can be found at http://sourceforge.net/projects/gkernel/ git://git.kernel.org/pub/scm/utils/kernel/rng-tools/rng-tools.git Signed-off-by: Andreas Pretzsch a...@cn-eng.de Thanks, applied. I've changed the prefix to /usr. That's what Debian is using and I didn't see a reason not to use that as well. Fine with me. Choosing /sbin was more a traditionalist thing. And as even Debian is going with /usr/sbin, lets welcome this new epoch ;-) Thanks for applying, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas Pretzsch Tel. +49-(0)731-5521572 Hahnengasse 3 Fax: +49-(0)731-5521571 89073 Ulm, Germanyemail: a...@cn-eng.de -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] fcgi: targetinstall: also install libfcgi++
FastCGI package provides a C++ stream abstraction as libfcgi++. Install this library on the target, too. Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- Above wrapper lib is installed by default by the package Makefile. As it is about 10k on a modern ARM target, just install it always, without an extra config option. rules/fcgi.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/fcgi.make b/rules/fcgi.make index 209a72d..b17aff0 100644 --- a/rules/fcgi.make +++ b/rules/fcgi.make @@ -42,6 +42,7 @@ $(STATEDIR)/fcgi.targetinstall: @$(call install_copy, fcgi, 0, 0, 0755, -, /usr/bin/cgi-fcgi) @$(call install_lib, fcgi, 0, 0, 0644, libfcgi) + @$(call install_lib, fcgi, 0, 0, 0644, libfcgi++) @$(call install_finish, fcgi) @$(call touch) -- 2.1.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] rng-tools: new package for rng-tools (rngd) version 5
random number generator daemon - seed kernel random from hwrng
This daemon feeds data from a random number generator to the kernel's
random number entropy pool, after first checking the data to ensure
that it is properly random.
By default, a hardware rng at /dev/hwrng is used as entropy source.
This daemon is part of the rng-tools, which can be found at
http://sourceforge.net/projects/gkernel/
git://git.kernel.org/pub/scm/utils/kernel/rng-tools/rng-tools.git
Signed-off-by: Andreas Pretzsch a...@cn-eng.de
---
Start script is kept as simple as possible, as this one runs rather
early and does not need much.
The link default of S00 in rc.d is intentional. rc-once is S01 by
default and triggers things like ssh key generation. So while in
other cases I would have set rngd to something around S10, it has to
squeeze in before rc-once. As there are no udev depends (the other
S00), being a kernel provided device, this should be ok.
Placing the daemon in /sbin also follows this fact, beside its
very system-near function.
generic/etc/init.d/rngd | 40 +
rules/rng-tools-bbinit.in | 10 +
rules/rng-tools.in| 23 +++
rules/rng-tools.make | 57 +++
4 files changed, 130 insertions(+)
create mode 100644 generic/etc/init.d/rngd
create mode 100644 rules/rng-tools-bbinit.in
create mode 100644 rules/rng-tools.in
create mode 100644 rules/rng-tools.make
diff --git a/generic/etc/init.d/rngd b/generic/etc/init.d/rngd
new file mode 100644
index 000..cdae9db
--- /dev/null
+++ b/generic/etc/init.d/rngd
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# Start/stop rngd (random number generator daemon) from rng-tools
+#
+
+# defaults are sane, normally no need to override
+OPTIONS=
+
+# pid-file created from rngd by default
+PIDFILE=/var/run/rngd.pid
+
+case $1 in
+ start)
+ if [ -e $PIDFILE ]; then
+ echo rngd already running (found $PIDFILE)
+ else
+ echo starting rngd
+ /sbin/rngd $OPTIONS
+ fi
+ ;;
+
+ stop)
+ if [ -e $PIDFILE ]; then
+ echo stopping rngd
+ kill -s SIGTERM `cat $PIDFILE`
+ else
+ echo rngd not running (no $PIDFILE)
+ fi
+ ;;
+
+ restart)
+ $0 stop
+ $0 start
+ ;;
+
+ *)
+ echo Usage: ${0} {start|stop|restart}
+ exit 1
+ ;;
+esac
diff --git a/rules/rng-tools-bbinit.in b/rules/rng-tools-bbinit.in
new file mode 100644
index 000..7cb74aa
--- /dev/null
+++ b/rules/rng-tools-bbinit.in
@@ -0,0 +1,10 @@
+## SECTION=initmethod_bbinit
+
+config RNG_TOOLS_BBINIT_LINK
+ string
+ depends on RNG_TOOLS_STARTSCRIPT
+ prompt rng-tools
+ default S00rngd
+ help
+ Order in start sequence.
+ Note: Start before rc-once to seed random before e.g. key creation.
diff --git a/rules/rng-tools.in b/rules/rng-tools.in
new file mode 100644
index 000..8282b93
--- /dev/null
+++ b/rules/rng-tools.in
@@ -0,0 +1,23 @@
+## SECTION=shell_and_console
+
+config RNG_TOOLS
+ tristate
+ prompt rng-tools rngd
+ help
+ random number generator daemon - seed kernel random from hwrng
+
+ This daemon feeds data from a random number generator to the kernel's
+ random number entropy pool, after first checking the data to ensure
+ that it is properly random.
+
+ By default, a hardware rng at /dev/hwrng is used as entropy source.
+
+ This daemon is part of the rng-tools, which can be found at
+ http://sourceforge.net/projects/gkernel/
+ git://git.kernel.org/pub/scm/utils/kernel/rng-tools/rng-tools.git
+
+config RNG_TOOLS_STARTSCRIPT
+ bool
+ default y
+ depends on RNG_TOOLS
+ prompt install /etc/init.d/rngd
diff --git a/rules/rng-tools.make b/rules/rng-tools.make
new file mode 100644
index 000..22f26fd
--- /dev/null
+++ b/rules/rng-tools.make
@@ -0,0 +1,57 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2014 by Andreas Pretzsch a...@cn-eng.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.
+#
+
+PACKAGES-$(PTXCONF_RNG_TOOLS) += rng-tools
+
+RNG_TOOLS_VERSION := 5
+RNG_TOOLS_MD5 := 6726cdc6fae1f5122463f24ae980dd68
+RNG_TOOLS := rng-tools-$(RNG_TOOLS_VERSION)
+RNG_TOOLS_SUFFIX := tar.gz
+RNG_TOOLS_URL := $(call ptx/mirror, SF,
gkernel/$(RNG_TOOLS).$(RNG_TOOLS_SUFFIX))
+RNG_TOOLS_SOURCE := $(SRCDIR)/$(RNG_TOOLS).$(RNG_TOOLS_SUFFIX)
+RNG_TOOLS_DIR := $(BUILDDIR)/$(RNG_TOOLS)
+RNG_TOOLS_LICENSE := GPLv2
Re: [ptxdist] [PATCH v2 1/2] openocd: new package for openocd-0.8.0
On Di, 2014-10-07 at 01:18 +0200, Andreas Pretzsch wrote: diff --git a/rules/openocd.make b/rules/openocd.make new file mode 100644 index 000..e5b9741 --- /dev/null +++ b/rules/openocd.make @@ -0,0 +1,91 @@ +# -*-makefile-*- +# +# Copyright (C) 2014 by Andreas Pretzsch a...@cn-eng.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. +# + +PACKAGES-$(PTXCONF_OPENOCD) += openocd + +OPENOCD_VERSION := 0.8.0 +OPENOCD_MD5 := 6d83c34763a5f1d1ac7ad83c5a11f4fb +OPENOCD := openocd-$(OPENOCD_VERSION) +OPENOCD_SUFFIX := tar.bz2 +OPENOCD_URL := $(call ptx/mirror, SF, openocd/$(OPENOCD).$(OPENOCD_SUFFIX)) +OPENOCD_SOURCE := $(SRCDIR)/$(OPENOCD).$(OPENOCD_SUFFIX) +OPENOCD_DIR := $(BUILDDIR)/$(OPENOCD) +# License: OpenOCD: GPLv2+, jimtcl: BSD +OPENOCD_LICENSE := LGPLv2, BSD I screwed up this license tag, cut and waste error :-( The comment above is correct, the makefile tag not. It should read: OPENOCD_LICENSE := GPLv2+, BSD Would you mind to fix this during apply or should I send a v3 ? Sorry, Andreas Pretzsch -- carpe noctem engineering Ingenieurbuero fuer Hard- Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas Pretzsch Tel. +49-(0)731-5521572 Hahnengasse 3 Fax: +49-(0)731-5521571 89073 Ulm, Germanyemail: a...@cn-eng.de -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2 2/2] host-openocd: new package for openocd-0.8.0
On Di, 2014-10-07 at 01:18 +0200, Andreas Pretzsch wrote: diff --git a/rules/host-openocd.make b/rules/host-openocd.make new file mode 100644 index 000..d72dd38 --- /dev/null +++ b/rules/host-openocd.make @@ -0,0 +1,69 @@ +# -*-makefile-*- +# +# Copyright (C) 2014 by Andreas Pretzsch a...@cn-eng.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. +# + +HOST_PACKAGES-$(PTXCONF_HOST_OPENOCD) += host-openocd + +HOST_OPENOCD_VERSION := 0.8.0 +HOST_OPENOCD_MD5 := 6d83c34763a5f1d1ac7ad83c5a11f4fb +HOST_OPENOCD := openocd-$(HOST_OPENOCD_VERSION) +HOST_OPENOCD_SUFFIX := tar.bz2 +HOST_OPENOCD_URL := $(call ptx/mirror, SF, openocd/$(HOST_OPENOCD).$(HOST_OPENOCD_SUFFIX)) +HOST_OPENOCD_SOURCE := $(SRCDIR)/$(HOST_OPENOCD).$(HOST_OPENOCD_SUFFIX) +HOST_OPENOCD_DIR := $(HOST_BUILDDIR)/$(HOST_OPENOCD) +# License: OpenOCD: GPLv2+, jimtcl: BSD +HOST_OPENOCD_LICENSE := LGPLv2, BSD Comment is correct, but license tag is wrong. It should read: HOST_OPENOCD_LICENSE:= GPLv2+, BSD Just noting, as this patch won't probably be applied anyway, but kept for informational purposes to whomever it might be useful for. -- carpe noctem engineering Ingenieurbuero fuer Hard- Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas Pretzsch Tel. +49-(0)731-5521572 Hahnengasse 3 Fax: +49-(0)731-5521571 89073 Ulm, Germanyemail: a...@cn-eng.de -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] dnsmasq: /etc/init.d/dnsmasq: fix erroneous already running message
Init script reports already running / not running based on existence of PID file. Test in start case is inverted. Fix this. Originally introduced in 1ca15292d20f8f73654ceba4b72d37f5bdb1cecf Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- generic/etc/init.d/dnsmasq | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic/etc/init.d/dnsmasq b/generic/etc/init.d/dnsmasq index e9ef8c1..6e6aa5d 100644 --- a/generic/etc/init.d/dnsmasq +++ b/generic/etc/init.d/dnsmasq @@ -9,7 +9,7 @@ PIDFILE=/var/run/dnsmasq.pid case $1 in start) - test -e $PIDFILE || echo already running + test -e $PIDFILE echo already running echo dnsmasq starting /usr/sbin/dnsmasq ;; -- 2.1.1 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] archivemount: new package for archivemount 0.8.3
Archivemount is a piece of glue code between libarchive and FUSE. It can be used to mount a (possibly compressed) archive (as in .tar.gz or .tar.bz2) and use it like an ordinary filesystem. It is a user-space application setting up the mount. Usage: archivemount archivepath mountpoint [options] For more information, see http://sourceforge.net/p/fuse/wiki/ArchiveFileSystems/#archivemount-mount-archives-tar-cpio http://www.cybernoia.de/software/archivemount.html Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/archivemount.in | 19 +++ rules/archivemount.make | 48 2 files changed, 67 insertions(+) create mode 100644 rules/archivemount.in create mode 100644 rules/archivemount.make diff --git a/rules/archivemount.in b/rules/archivemount.in new file mode 100644 index 000..13ee79b --- /dev/null +++ b/rules/archivemount.in @@ -0,0 +1,19 @@ +## SECTION=disk_and_file + +config ARCHIVEMOUNT + tristate + prompt archivemount + select FUSE + select FUSE__LIB + select FUSE__UTIL + select LIBARCHIVE + help + Archivemount is a piece of glue code between libarchive and FUSE. + It can be used to mount a (possibly compressed) archive (as + in .tar.gz or .tar.bz2) and use it like an ordinary filesystem. + + It is a user-space application setting up the mount. + Usage: archivemount archivepath mountpoint [options] + See archivemount --help for more information. + + To umount, use fusermount -u from FUSE utils. diff --git a/rules/archivemount.make b/rules/archivemount.make new file mode 100644 index 000..e70e9cd --- /dev/null +++ b/rules/archivemount.make @@ -0,0 +1,48 @@ +# -*-makefile-*- +# +# Copyright (C) 2014 by Andreas Pretzsch a...@cn-eng.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. +# + +PACKAGES-$(PTXCONF_ARCHIVEMOUNT) += archivemount + +ARCHIVEMOUNT_VERSION := 0.8.3 +ARCHIVEMOUNT_MD5 := a8c890e3fc315b07c7e85ad73a4b4760 +ARCHIVEMOUNT := archivemount-$(ARCHIVEMOUNT_VERSION) +ARCHIVEMOUNT_SUFFIX:= tar.gz +ARCHIVEMOUNT_URL := http://www.cybernoia.de/software/archivemount/$(ARCHIVEMOUNT).$(ARCHIVEMOUNT_SUFFIX) +ARCHIVEMOUNT_SOURCE:= $(SRCDIR)/$(ARCHIVEMOUNT).$(ARCHIVEMOUNT_SUFFIX) +ARCHIVEMOUNT_DIR := $(BUILDDIR)/$(ARCHIVEMOUNT) +ARCHIVEMOUNT_LICENSE := LGPLv2 + +# +# Prepare +# + +ARCHIVEMOUNT_CONF_TOOL := autoconf +ARCHIVEMOUNT_CONF_OPT := $(CROSS_AUTOCONF_USR) + +# +# Target-Install +# + +$(STATEDIR)/archivemount.targetinstall: + @$(call targetinfo) + + @$(call install_init, archivemount) + @$(call install_fixup, archivemount,PRIORITY,optional) + @$(call install_fixup, archivemount,SECTION,base) + @$(call install_fixup, archivemount,AUTHOR,Andreas Pretzsch a...@cn-eng.de) + @$(call install_fixup, archivemount,DESCRIPTION,Mount archives using FUSE and libarchive.) + + @$(call install_copy, archivemount, 0, 0, 0755, -, /usr/bin/archivemount) + + @$(call install_finish, archivemount) + + @$(call touch) + +# vim: syntax=make -- 2.1.1 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [ANNOUNCE] PTXdist 2014.10.0 released - license update patches
On Do, 2014-10-02 at 15:14 +0200, Michael Olbrich wrote: And a rather large stack of patches that add license information to various patches. Any reason why you did not pick up the below ones ? From: Robert Schwebel r.schwe...@pengutronix.de Subject:[ptxdist] [PATCH 02/36] binutils: add license information Date: Mon, 15 Sep 2014 22:18:04 +0200 Subject:[ptxdist] [PATCH 03/36] boost: add license information Date: Mon, 15 Sep 2014 22:18:05 +0200 Subject:[ptxdist] [PATCH 18/36] libmd: add license information Date: Mon, 15 Sep 2014 22:18:20 +0200 Subject:[ptxdist] [PATCH 29/36] screen: add license information Date: Mon, 15 Sep 2014 22:18:31 +0200 Subject:[ptxdist] [PATCH 33/36] xorg-font-alias: add license information Date: Mon, 15 Sep 2014 22:18:35 +0200 Subject:[ptxdist] [PATCH 34/36] xorg-font-ttf-bitstream-vera: add license information Date: Mon, 15 Sep 2014 22:18:36 +0200 Subject:[ptxdist] [PATCH 35/36] xorg-font-util: add license information Date: Mon, 15 Sep 2014 22:18:37 +0200 Subject:[ptxdist] [PATCH 36/36] xorg-fonts: add license information Date: Mon, 15 Sep 2014 22:18:38 +0200 From: Andreas Pretzsch a...@cn-eng.de Subject:[ptxdist] [PATCH 03/16] fontconfig: add license information Date: Sun, 28 Sep 2014 14:57:50 +0200 Subject:[ptxdist] [PATCH 04/16] gcclibs: add license information Date: Sun, 28 Sep 2014 14:57:51 +0200 Subject:[ptxdist] [PATCH] tomcat: add license information Date: Sun, 28 Sep 2014 15:31:50 +0200 -- carpe noctem engineering Ingenieurbuero fuer Hard- Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas Pretzsch Tel. +49-(0)731-5521572 Hahnengasse 3 Fax: +49-(0)731-5521571 89073 Ulm, Germanyemail: a...@cn-eng.de -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 2/2] host-openocd: new package for openocd-0.8.0
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/host-openocd.in | 211 rules/host-openocd.make | 69 2 files changed, 280 insertions(+) create mode 100644 rules/host-openocd.in create mode 100644 rules/host-openocd.make diff --git a/rules/host-openocd.in b/rules/host-openocd.in new file mode 100644 index 000..ba5b072 --- /dev/null +++ b/rules/host-openocd.in @@ -0,0 +1,211 @@ +## SECTION=hosttools + +menuconfig HOST_OPENOCD + tristate + prompt OpenOCD + + # libusb-1.x + select HOST_LIBUSB if HOST_OPENOCD_FTDI || HOST_OPENOCD_STLINK || HOST_OPENOCD_TI_ICDI || HOST_OPENOCD_ULINK || HOST_OPENOCD_USB_BLASTER_2 + # libusb-1.x or libusb-0.1 + select HOST_LIBUSB if HOST_OPENOCD_JLINK || HOST_OPENOCD_OSBDM || HOST_OPENOCD_OPENDOUS || HOST_OPENOCD_AICE + # libusb-0.1 ; currently no package in ptxdist, so disable it + #select HOST_LIBUSB_COMPAT if HOST_OPENOCD_VSLLINK || HOST_OPENOCD_USBPROG || HOST_OPENOCD_RLINK || HOST_OPENOCD_ARMJTAGEW + # libhidapi ; currently no package in ptxdist, so disable it + #select HOST_HIDAPI if HOST_OPENOCD_CMSIS_DAP + # libftdi1 or libftdi, with libftdi1 preferred ; currently no package in ptxdist, so disable it + #select HOST_LIBFTDI1 if HOST_OPENOCD_USB_BLASTER_LIBFTDI || HOST_OPENOCD_PRESTO_LIBFTDI || HOST_OPENOCD_OPENJTAG_FTDI + + help + The Open On-Chip Debugger (OpenOCD) provides debugging, in-system + programming and boundary-scan testing for embedded target devices. + It supports JTAG and SWD (direct or via dongle) to access targets. + Flash writing is supported for various internal and external types. + It is controlled with TCL scripts and can act as gdbserver. + +if HOST_OPENOCD + +# = interface drivers = + +config HOST_OPENOCD_DUMMY + bool + prompt dummy port driver + +# --- libusb-1.x based + +config HOST_OPENOCD_FTDI + bool + prompt MPSSE mode of FTDI based devices + +config HOST_OPENOCD_STLINK + bool + prompt ST-Link JTAG Programmer + +config HOST_OPENOCD_TI_ICDI + bool + prompt TI ICDI JTAG Programmer + +config HOST_OPENOCD_ULINK + bool + prompt Keil ULINK JTAG Programmer + +config HOST_OPENOCD_USB_BLASTER_2 + bool + prompt Altera USB-Blaster II Compatible + +# --- libusb-1.x or libusb-0.1 based + +config HOST_OPENOCD_JLINK + bool + prompt Segger J-Link JTAG Programmer + +config HOST_OPENOCD_OSBDM + bool + prompt OSBDM (JTAG only) Programmer + +config HOST_OPENOCD_OPENDOUS + bool + prompt eStick/opendous JTAG Programmer + +config HOST_OPENOCD_AICE + bool + prompt Andes JTAG Programmer + +# --- libusb-0.1 based + +config HOST_OPENOCD_VSLLINK + bool + # needs libusb-0.1 + depends on BROKEN + prompt Versaloon-Link JTAG Programmer + +config HOST_OPENOCD_USBPROG + bool + # needs libusb-0.1 + depends on BROKEN + prompt USBProg JTAG Programmer + +config HOST_OPENOCD_RLINK + bool + # needs libusb-0.1 + depends on BROKEN + prompt Raisonance RLink JTAG Programmer + +config HOST_OPENOCD_ARMJTAGEW + bool + # needs libusb-0.1 + depends on BROKEN + prompt Olimex ARM-JTAG-EW Programmer + +# --- hidapi based +config HOST_OPENOCD_CMSIS_DAP + bool + # needs libhidapi + depends on BROKEN + prompt CMSIS-DAP Compliant Debugger + +# --- various + +config HOST_OPENOCD_PARPORT + bool + prompt pc parallel port driver + +if HOST_OPENOCD_PARPORT + config HOST_OPENOCD_PARPORT_DISABLE_PARPORT_PPDEV + bool + prompt Disable use of ppdev (/dev/parportN) (x86 only) + + config HOST_OPENOCD_PARPORT_GIVEIO + bool + depends on HOST_OPENOCD_PARPORT + prompt Enable use of giveio (CygWin only) +endif + +config HOST_OPENOCD_JTAG_VPI + bool + prompt JTAG VPI + +config HOST_OPENOCD_USB_BLASTER_LIBFTDI + bool + prompt Altera USB-Blaster (libftdi driver, opensource) + +config HOST_OPENOCD_USB_BLASTER_FTD2XX + bool + # needs ftd2xx + depends on BROKEN + prompt Altera USB-Blaster (FTD2XX driver from ftdichip.com) + +config HOST_OPENOCD_AMTJTAGACCEL + bool + prompt Amontec JTAG-Accelerator driver + +config HOST_OPENOCD_ZY1000 + bool + prompt ZY1000 interface + +if HOST_OPENOCD_ZY1000 + config HOST_OPENOCD_ZY1000_MASTER + bool + prompt Use ZY1000 JTAG master registers +endif + +config HOST_OPENOCD_IOUTIL + bool + prompt ioutil functions - for standalone OpenOCD implementations + +config HOST_OPENOCD_EP93XX + bool + prompt EP93xx based SBCs + +config HOST_OPENOCD_AT91RM9200 + bool + prompt
[ptxdist] [PATCH v2 1/2] openocd: new package for openocd-0.8.0
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- ...c-correct-test-for-USB_BLASTER_DRIVER-AM-.patch | 33 patches/openocd-0.8.0/autogen.sh | 1 + patches/openocd-0.8.0/series | 1 + rules/openocd.in | 220 + rules/openocd.make | 91 + 5 files changed, 346 insertions(+) create mode 100644 patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch create mode 12 patches/openocd-0.8.0/autogen.sh create mode 100644 patches/openocd-0.8.0/series create mode 100644 rules/openocd.in create mode 100644 rules/openocd.make diff --git a/patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch b/patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch new file mode 100644 index 000..a7c65b7 --- /dev/null +++ b/patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch @@ -0,0 +1,33 @@ +From 930e41a2921b8c2905690153514099c8abf05828 Mon Sep 17 00:00:00 2001 +From: Paul Fertser fercer...@gmail.com +Date: Sat, 31 May 2014 08:19:51 +0400 +Subject: [PATCH] configure.ac: correct test for USB_BLASTER_DRIVER AM symbol + +Blaster II should depend on the corresponding symbol, not on libusb-1 +presence. + +Change-Id: I3d27a1005a78fe81042cb7b515618604612c3ece +Signed-off-by: Paul Fertser fercer...@gmail.com +Reviewed-on: http://openocd.zylin.com/2159 +Tested-by: jenkins +Reviewed-by: Andreas Fritiofson andreas.fritiof...@gmail.com +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1b4870e..9943beb 100644 +--- a/configure.ac b/configure.ac +@@ -1174,7 +1174,7 @@ AM_CONDITIONAL([FT2232_DRIVER], [test $build_ft2232_ftd2xx = yes -o $build_ft223 + AM_CONDITIONAL([USB_BLASTER_LIBFTDI], [test $build_usb_blaster_libftdi = yes]) + AM_CONDITIONAL([USB_BLASTER_FTD2XX], [test $build_usb_blaster_ftd2xx = yes]) + AM_CONDITIONAL([JTAG_VPI], [test $build_jtag_vpi = yes -o $build_jtag_vpi = yes]) +-AM_CONDITIONAL([USB_BLASTER_DRIVER], [test $build_usb_blaster_ftd2xx = yes -o $build_usb_blaster_libftdi = yes -o $use_libusb1 = yes]) ++AM_CONDITIONAL([USB_BLASTER_DRIVER], [test $build_usb_blaster_ftd2xx = yes -o $build_usb_blaster_libftdi = yes -o $enable_usb_blaster_2 != no]) + AM_CONDITIONAL([AMTJTAGACCEL], [test $build_amtjtagaccel = yes]) + AM_CONDITIONAL([GW16012], [test $build_gw16012 = yes]) + AM_CONDITIONAL([PRESTO_LIBFTDI], [test $build_presto_libftdi = yes]) +-- +2.1.0 + diff --git a/patches/openocd-0.8.0/autogen.sh b/patches/openocd-0.8.0/autogen.sh new file mode 12 index 000..9f8a4cb --- /dev/null +++ b/patches/openocd-0.8.0/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/openocd-0.8.0/series b/patches/openocd-0.8.0/series new file mode 100644 index 000..23230ef --- /dev/null +++ b/patches/openocd-0.8.0/series @@ -0,0 +1 @@ +0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch diff --git a/rules/openocd.in b/rules/openocd.in new file mode 100644 index 000..36194e9 --- /dev/null +++ b/rules/openocd.in @@ -0,0 +1,220 @@ +## SECTION=debug_tools + +menuconfig OPENOCD + tristate + prompt OpenOCD + + # libusb-1.x + select LIBUSB if OPENOCD_FTDI || OPENOCD_STLINK || OPENOCD_TI_ICDI || OPENOCD_ULINK || OPENOCD_USB_BLASTER_2 + # libusb-1.x or libusb-0.1 + select LIBUSB if OPENOCD_JLINK || OPENOCD_OSBDM || OPENOCD_OPENDOUS || OPENOCD_AICE + # libusb-0.1 + select LIBUSB_COMPATif OPENOCD_VSLLINK || OPENOCD_USBPROG || OPENOCD_RLINK || OPENOCD_ARMJTAGEW + + help + The Open On-Chip Debugger (OpenOCD) provides debugging, in-system + programming and boundary-scan testing for embedded target devices. + It supports JTAG and SWD (direct or via dongle) to access targets. + Flash writing is supported for various internal and external types. + It is controlled with TCL scripts and can act as gdbserver. + +if OPENOCD + +# = scripts directory = + +config OPENOCD_SCRIPTDIR + string + default /usr/share/openocd/scripts/ + prompt OpenOCD script tree + help + OpenOCD relies on TCL scripts for core and SoC specific configs and + setups, interface (debug adapter) specific configs, RAM and flash + layout definitions, board init routines, helper routines, and so on. + + Keeping the default option of /usr/share/openocd/scripts/ will + install all of them (several 100kB) to the target, which is probably + not what you want, as they are heavily target dependent. + + To install only a few required ones, create a tree in projectroot + named like the tree configured, so only these will be installed. + + Clear this config
Re: [ptxdist] [PATCH] openocd: new package for openocd-0.8.0 (host, target)
On Mi, 2014-10-01 at 12:29 +0200, Michael Olbrich wrote: On Mon, Sep 29, 2014 at 07:12:11PM +0200, Andreas Pretzsch wrote: [host-openocd] I think we should drop host-openocd for now. I'm not familiar OpenOCD but unless you need exactly the same version on the PC and the Target, I think we can let the Desktop Linux Distribution provide it. We can drop the host package. Host and target are independent and have different use cases. Target can be used for ISP and debugging on the target of an additional controller accessed by the main controller. Which is my use case here. Host is a classical development debugging tool and either provided by the host distri or local compiled by the developer anyway, often from git. I just added it as Michael Grzeschik made a preliminary packet back then, so there seems to be some use. And is was an easy by-product. I'll split up the patch, in a target one (including openocd/patches) and a host one. The target one should be merged, the host one is optional. I'll just put the host one on the list, so anyone can pick it up again later or use it locally, if they need it. And in this case, preserving some comments ;-) [...] diff --git a/rules/openocd.in b/rules/openocd.in [...] Will work in your suggestions in v2. +++ b/rules/openocd.make [...] +# +# Target-Install +# + +$(STATEDIR)/openocd.targetinstall: + @$(call targetinfo) + + @$(call install_init, openocd) + @$(call install_fixup, openocd,PRIORITY,optional) + @$(call install_fixup, openocd,SECTION,base) + @$(call install_fixup, openocd,AUTHOR,Andreas Pretzsch a...@cn-eng.de) + @$(call install_fixup, openocd,DESCRIPTION,OpenOCD - Open On-Chip Debugger) + + @$(call install_copy, openocd, 0, 0, 0755, -, /usr/bin/openocd) +# @$(call install_tree, openocd, 0, 0, -, /usr/share/openocd/) don't add comments like this either remove this or actually install any useful files. From your other reply: + @$(call install_copy, openocd, 0, 0, 0755, -, /usr/bin/openocd) +#@$(call install_tree, openocd, 0, 0, -, /usr/share/openocd/) Intentionally disabled. 700kB generic extra data on the target makes no sense. I doubt there won't be one real use case where the makefile is not pulled into platform local rules and adapted to copy only the 5 relevant files from this tree. So this is more of a reminder where to look, so I kept is as comment. I missed this when I commented the patch. Are there any files in /usr/share/openocd/ that are required on the target? Not strictly out from there. Beside device-specific firmware and examples, it contains some 500 config files and tcl scripts. Core and SoC specific configs and setups, interface (debug adapter) specific configs, RAM and flash layout definitions, (eval) board init routines, some helpers, and so on. For the myriad targets OpenOCD supports. In practice on the target, one will use maybe 5 out of them, sometimes even merged into one file, and also adapt it to the specific hardware. So a mixture of a few selected ones plus maybe some not even in the official package. I see no sensible way for a preselection here, and in 99% of the cases, it will be project specific. So no pre-install. But I like to keep the comment for those who will adapt it to their needs, to ease things. What I'll do in v2 is to switch from install_tree to install_alternative_tree, missed that one. But still commented out. -- carpe noctem engineering Ingenieurbuero fuer Hard- Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas Pretzsch Tel. +49-(0)731-5521572 Hahnengasse 3 Fax: +49-(0)731-5521571 89073 Ulm, Germanyemail: a...@cn-eng.de -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] openocd: new package for openocd-0.8.0 (host, target)
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- ...c-correct-test-for-USB_BLASTER_DRIVER-AM-.patch | 33 ...e-correct-test-for-USB_BLASTER_DRIVER-AM-.patch | 20 +++ patches/openocd-0.8.0/series | 4 + rules/host-openocd.in | 199 + rules/host-openocd.make| 76 rules/openocd.in | 199 + rules/openocd.make | 96 ++ 7 files changed, 627 insertions(+) create mode 100644 patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch create mode 100644 patches/openocd-0.8.0/0002-configure-correct-test-for-USB_BLASTER_DRIVER-AM-.patch create mode 100644 patches/openocd-0.8.0/series create mode 100644 rules/host-openocd.in create mode 100644 rules/host-openocd.make create mode 100644 rules/openocd.in create mode 100644 rules/openocd.make diff --git a/patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch b/patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch new file mode 100644 index 000..a7c65b7 --- /dev/null +++ b/patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch @@ -0,0 +1,33 @@ +From 930e41a2921b8c2905690153514099c8abf05828 Mon Sep 17 00:00:00 2001 +From: Paul Fertser fercer...@gmail.com +Date: Sat, 31 May 2014 08:19:51 +0400 +Subject: [PATCH] configure.ac: correct test for USB_BLASTER_DRIVER AM symbol + +Blaster II should depend on the corresponding symbol, not on libusb-1 +presence. + +Change-Id: I3d27a1005a78fe81042cb7b515618604612c3ece +Signed-off-by: Paul Fertser fercer...@gmail.com +Reviewed-on: http://openocd.zylin.com/2159 +Tested-by: jenkins +Reviewed-by: Andreas Fritiofson andreas.fritiof...@gmail.com +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1b4870e..9943beb 100644 +--- a/configure.ac b/configure.ac +@@ -1174,7 +1174,7 @@ AM_CONDITIONAL([FT2232_DRIVER], [test $build_ft2232_ftd2xx = yes -o $build_ft223 + AM_CONDITIONAL([USB_BLASTER_LIBFTDI], [test $build_usb_blaster_libftdi = yes]) + AM_CONDITIONAL([USB_BLASTER_FTD2XX], [test $build_usb_blaster_ftd2xx = yes]) + AM_CONDITIONAL([JTAG_VPI], [test $build_jtag_vpi = yes -o $build_jtag_vpi = yes]) +-AM_CONDITIONAL([USB_BLASTER_DRIVER], [test $build_usb_blaster_ftd2xx = yes -o $build_usb_blaster_libftdi = yes -o $use_libusb1 = yes]) ++AM_CONDITIONAL([USB_BLASTER_DRIVER], [test $build_usb_blaster_ftd2xx = yes -o $build_usb_blaster_libftdi = yes -o $enable_usb_blaster_2 != no]) + AM_CONDITIONAL([AMTJTAGACCEL], [test $build_amtjtagaccel = yes]) + AM_CONDITIONAL([GW16012], [test $build_gw16012 = yes]) + AM_CONDITIONAL([PRESTO_LIBFTDI], [test $build_presto_libftdi = yes]) +-- +2.1.0 + diff --git a/patches/openocd-0.8.0/0002-configure-correct-test-for-USB_BLASTER_DRIVER-AM-.patch b/patches/openocd-0.8.0/0002-configure-correct-test-for-USB_BLASTER_DRIVER-AM-.patch new file mode 100644 index 000..e8c4957 --- /dev/null +++ b/patches/openocd-0.8.0/0002-configure-correct-test-for-USB_BLASTER_DRIVER-AM-.patch @@ -0,0 +1,20 @@ +merge in changes to configure.ac introduced by + 0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch +into configure +--- + configure |2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: b/configure +=== +--- a/configure b/configure +@@ -15806,7 +15806,7 @@ + JTAG_VPI_FALSE= + fi + +- if test $build_usb_blaster_ftd2xx = yes -o $build_usb_blaster_libftdi = yes -o $use_libusb1 = yes; then ++ if test $build_usb_blaster_ftd2xx = yes -o $build_usb_blaster_libftdi = yes -o $enable_usb_blaster_2 != no; then + USB_BLASTER_DRIVER_TRUE= + USB_BLASTER_DRIVER_FALSE='#' + else diff --git a/patches/openocd-0.8.0/series b/patches/openocd-0.8.0/series new file mode 100644 index 000..1860de5 --- /dev/null +++ b/patches/openocd-0.8.0/series @@ -0,0 +1,4 @@ +# keep 0001 disabled, as changing configure.ac will trigger autotools +# invocation. The changes from 0001 are done by 0002 in configure. +# 0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch +0002-configure-correct-test-for-USB_BLASTER_DRIVER-AM-.patch diff --git a/rules/host-openocd.in b/rules/host-openocd.in new file mode 100644 index 000..d8c4e7e --- /dev/null +++ b/rules/host-openocd.in @@ -0,0 +1,199 @@ +## SECTION=hosttools + +menuconfig HOST_OPENOCD + tristate + prompt OpenOCD + + # libusb-1.x + select HOST_LIBUSB if HOST_OPENOCD_FTDI || HOST_OPENOCD_STLINK || HOST_OPENOCD_TI_ICDI || HOST_OPENOCD_ULINK || HOST_OPENOCD_USB_BLASTER_2 + # libusb-1.x or libusb-0.1 + select HOST_LIBUSB if HOST_OPENOCD_JLINK || HOST_OPENOCD_OSBDM || HOST_OPENOCD_OPENDOUS
Re: [ptxdist] [PATCH 3/3] host-openocd: add new package
On Mo, 2014-06-23 at 16:09 +0200, Michael Olbrich wrote: On Sun, Jun 22, 2014 at 09:41:09AM +0200, Michael Grzeschik wrote: Signed-off-by: Michael Grzeschik m.grzesc...@pengutronix.de --- rules/host-openocd.in | 184 rules/host-openocd.make | 71 +++ 2 files changed, 255 insertions(+) create mode 100644 rules/host-openocd.in create mode 100644 rules/host-openocd.make diff --git a/rules/host-openocd.in b/rules/host-openocd.in new file mode 100644 index 000..8071f3c --- /dev/null +++ b/rules/host-openocd.in @@ -0,0 +1,184 @@ +## SECTION=hosttools + +menuconfig HOST_OOCD + tristate + prompt openocd + select HOST_LIBUSB + select HOST_LIBUSB_COMPAT + select HOST_LIBFTDI1 + help + The Open On-Chip Debugger provides JTAG/SWD access from GDB + (or directly with TCL scripts) to processors with ARM and MIPS + based cores. + +if HOST_OOCD + This is a host tool, so we don't have any real space constraints. And no extra dependencies. Does it take a lot longer, when everything is enabled? If not, then I'd suggest to just enable everything and drop the options. Not my patch, but I just send a similar one to the list, so I'll comment on this (dead) discussion, too. First, while there is some kind of default set selected by OpenOCD configure depending on the present libs on the system, I doubt it will be suitable for everyone. Either things are missing or (won't harm) too broad. And, I wouldn't bet everything will always compile on all hosts. Second, in the end, it's a pure development tool, which is probably externally compiled by many users already. So integrating this as host tool into ptxdist is more like a convenience thing, if at all. Coming to Michael Grzeschiks patchset (thanks for that), I intended to polish it a bit for my usage here (OpenOCD on the target). Unfortunately, there are quite a few typos in the options, some are only in the Kconfig, some only in the makefile. And others were missing. Looks like the usual result of a patch living off-tree for quite some version interations :-) Anyway, due to this, I just rewrote the whole thing from scratch. Mainly for OpenOCD on target, the host part is more a by-product, albeit working. In both cases, there are no options selected at all by default. For the target, this won't make sense anyway, for the host it is debatable, see above. Left as an exercise to the reader ;-) In this respect I also ignored his patches for host-libftdi1 and host-libusb-compat, which did not went mainline. I'd suppose anybody needing them will pick them up, but that won't be me today. Regarding my patch and comments to details, please see the mail [ptxdist] [PATCH] openocd: new package for openocd-0.8.0 (host, target) from Mon, 29 Sep 2014 19:12:11 +0200 on the list. -- carpe noctem engineering Ingenieurbuero fuer Hard- Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas Pretzsch Tel. +49-(0)731-5521572 Hahnengasse 3 Fax: +49-(0)731-5521571 89073 Ulm, Germanyemail: a...@cn-eng.de -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] openocd: new package for openocd-0.8.0 (host, target)
A few comments on this, both generic here and specific inline (sorry for full quote, more readable in this case). First, as combined patch host+target due to the shared patches. Second, the options mimic the ./configure options from OpenOCD, not only in wording, but also in sequence. To ease maintenance, I refrained reordering them. On Mo, 2014-09-29 at 19:12 +0200, Andreas Pretzsch wrote: Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- ...c-correct-test-for-USB_BLASTER_DRIVER-AM-.patch | 33 ...e-correct-test-for-USB_BLASTER_DRIVER-AM-.patch | 20 +++ patches/openocd-0.8.0/series | 4 + rules/host-openocd.in | 199 + rules/host-openocd.make| 76 rules/openocd.in | 199 + rules/openocd.make | 96 ++ 7 files changed, 627 insertions(+) create mode 100644 patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch create mode 100644 patches/openocd-0.8.0/0002-configure-correct-test-for-USB_BLASTER_DRIVER-AM-.patch create mode 100644 patches/openocd-0.8.0/series create mode 100644 rules/host-openocd.in create mode 100644 rules/host-openocd.make create mode 100644 rules/openocd.in create mode 100644 rules/openocd.make diff --git a/patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch b/patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch new file mode 100644 index 000..a7c65b7 --- /dev/null +++ b/patches/openocd-0.8.0/0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch @@ -0,0 +1,33 @@ +From 930e41a2921b8c2905690153514099c8abf05828 Mon Sep 17 00:00:00 2001 +From: Paul Fertser fercer...@gmail.com +Date: Sat, 31 May 2014 08:19:51 +0400 +Subject: [PATCH] configure.ac: correct test for USB_BLASTER_DRIVER AM symbol + +Blaster II should depend on the corresponding symbol, not on libusb-1 +presence. + +Change-Id: I3d27a1005a78fe81042cb7b515618604612c3ece +Signed-off-by: Paul Fertser fercer...@gmail.com +Reviewed-on: http://openocd.zylin.com/2159 +Tested-by: jenkins +Reviewed-by: Andreas Fritiofson andreas.fritiof...@gmail.com +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1b4870e..9943beb 100644 +--- a/configure.ac b/configure.ac +@@ -1174,7 +1174,7 @@ AM_CONDITIONAL([FT2232_DRIVER], [test $build_ft2232_ftd2xx = yes -o $build_ft223 + AM_CONDITIONAL([USB_BLASTER_LIBFTDI], [test $build_usb_blaster_libftdi = yes]) + AM_CONDITIONAL([USB_BLASTER_FTD2XX], [test $build_usb_blaster_ftd2xx = yes]) + AM_CONDITIONAL([JTAG_VPI], [test $build_jtag_vpi = yes -o $build_jtag_vpi = yes]) +-AM_CONDITIONAL([USB_BLASTER_DRIVER], [test $build_usb_blaster_ftd2xx = yes -o $build_usb_blaster_libftdi = yes -o $use_libusb1 = yes]) ++AM_CONDITIONAL([USB_BLASTER_DRIVER], [test $build_usb_blaster_ftd2xx = yes -o $build_usb_blaster_libftdi = yes -o $enable_usb_blaster_2 != no]) + AM_CONDITIONAL([AMTJTAGACCEL], [test $build_amtjtagaccel = yes]) + AM_CONDITIONAL([GW16012], [test $build_gw16012 = yes]) + AM_CONDITIONAL([PRESTO_LIBFTDI], [test $build_presto_libftdi = yes]) +-- +2.1.0 + diff --git a/patches/openocd-0.8.0/0002-configure-correct-test-for-USB_BLASTER_DRIVER-AM-.patch b/patches/openocd-0.8.0/0002-configure-correct-test-for-USB_BLASTER_DRIVER-AM-.patch new file mode 100644 index 000..e8c4957 --- /dev/null +++ b/patches/openocd-0.8.0/0002-configure-correct-test-for-USB_BLASTER_DRIVER-AM-.patch @@ -0,0 +1,20 @@ +merge in changes to configure.ac introduced by + 0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch +into configure +--- + configure |2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: b/configure +=== +--- a/configure b/configure +@@ -15806,7 +15806,7 @@ + JTAG_VPI_FALSE= + fi + +- if test $build_usb_blaster_ftd2xx = yes -o $build_usb_blaster_libftdi = yes -o $use_libusb1 = yes; then ++ if test $build_usb_blaster_ftd2xx = yes -o $build_usb_blaster_libftdi = yes -o $enable_usb_blaster_2 != no; then + USB_BLASTER_DRIVER_TRUE= + USB_BLASTER_DRIVER_FALSE='#' + else diff --git a/patches/openocd-0.8.0/series b/patches/openocd-0.8.0/series new file mode 100644 index 000..1860de5 --- /dev/null +++ b/patches/openocd-0.8.0/series @@ -0,0 +1,4 @@ +# keep 0001 disabled, as changing configure.ac will trigger autotools +# invocation. The changes from 0001 are done by 0002 in configure. +# 0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch +0002-configure-correct-test-for-USB_BLASTER_DRIVER-AM-.patch diff --git a/rules/host-openocd.in b/rules/host-openocd.in new file mode
Re: [ptxdist] [PATCH] openocd: new package for openocd-0.8.0 (host, target)
On Mo, 2014-09-29 at 19:27 +0200, Marc Kleine-Budde wrote: --- /dev/null +++ b/patches/openocd-0.8.0/series @@ -0,0 +1,4 @@ +# keep 0001 disabled, as changing configure.ac will trigger autotools +# invocation. The changes from 0001 are done by 0002 in configure. +# 0001-configure.ac-correct-test-for-USB_BLASTER_DRIVER-AM-.patch +0002-configure-correct-test-for-USB_BLASTER_DRIVER-AM-.patch Please drop patch 2, activate patch 1 and create a link to ../autgen.sh in patches/openocd-0.8.0 Ok, will do in a v2 of the patch. Suppose this is the preferred way and I can omit any extra select autotools dependency in the package ? Regarding v2, waiting for comments (mirror, maybe other points) regarding the rest of the patch. Thanks, Andreas -- carpe noctem engineering Ingenieurbuero fuer Hard- Software-Entwicklung Andreas Pretzsch Dipl.-Ing. (FH) Andreas Pretzsch Tel. +49-(0)731-5521572 Hahnengasse 3 Fax: +49-(0)731-5521571 89073 Ulm, Germanyemail: a...@cn-eng.de -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 00/16] add license information for various packages
About package fontconfig: Its license is comparable to BSD 3-clause, but with different wording. Still, I put it as special (fontconfig) license tag into the makefile, not as BSD, as it is not. Feel free to replace this patch if you think it will suit PTXdist better. Also feel free to squash this series into one patch, if you like to. Andreas Pretzsch (16): alsa-lib: add license information avahi: add license information fontconfig: add license information gcclibs: add license information iptables: add license information ldd: fix license information libdaemon: add license information libevent: add license information libiodbc: fix license information tag libltdl: add license information lighttpd: add license information mii-diag: add license information myodbc: add license information opkg: add license information sudo: add license information urshd: add license information rules/alsa-lib.make | 1 + rules/avahi.make | 1 + rules/fontconfig.make | 1 + rules/gcclibs.make| 1 + rules/iptables.make | 1 + rules/ldd.make| 2 +- rules/libdaemon.make | 1 + rules/libevent.make | 1 + rules/libiodbc.make | 2 +- rules/libltdl.make| 1 + rules/lighttpd.make | 1 + rules/mii-diag.make | 1 + rules/myodbc.make | 1 + rules/opkg.make | 1 + rules/sudo.make | 1 + rules/urshd.make | 1 + 16 files changed, 16 insertions(+), 2 deletions(-) -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 01/16] alsa-lib: add license information
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/alsa-lib.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make index ad6e186..e949274 100644 --- a/rules/alsa-lib.make +++ b/rules/alsa-lib.make @@ -37,6 +37,7 @@ endif ALSA_LIB_SOURCE:= $(SRCDIR)/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) ALSA_LIB_DIR := $(BUILDDIR)/$(ALSA_LIB) +ALSA_LIB_LICENSE := LGPLv2.1+ # # Prepare -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 02/16] avahi: add license information
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/avahi.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/avahi.make b/rules/avahi.make index 5de3e5a..c0b9b49 100644 --- a/rules/avahi.make +++ b/rules/avahi.make @@ -23,6 +23,7 @@ AVAHI_SUFFIX := tar.gz AVAHI_URL := http://avahi.org/download/$(AVAHI).$(AVAHI_SUFFIX) AVAHI_SOURCE := $(SRCDIR)/$(AVAHI).$(AVAHI_SUFFIX) AVAHI_DIR := $(BUILDDIR)/$(AVAHI) +AVAHI_LICENSE := LGPLv2.1+ # # Prepare -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 03/16] fontconfig: add license information
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/fontconfig.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/fontconfig.make b/rules/fontconfig.make index 3cbee2e..c086a28 100644 --- a/rules/fontconfig.make +++ b/rules/fontconfig.make @@ -23,6 +23,7 @@ FONTCONFIG_SUFFIX := tar.gz FONTCONFIG_URL := http://fontconfig.org/release/$(FONTCONFIG).$(FONTCONFIG_SUFFIX) FONTCONFIG_SOURCE := $(SRCDIR)/$(FONTCONFIG).$(FONTCONFIG_SUFFIX) FONTCONFIG_DIR := $(BUILDDIR)/$(FONTCONFIG) +FONTCONFIG_LICENSE := fontconfig # -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 04/16] gcclibs: add license information
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/gcclibs.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/gcclibs.make b/rules/gcclibs.make index a1079c2..8c443da 100644 --- a/rules/gcclibs.make +++ b/rules/gcclibs.make @@ -21,6 +21,7 @@ GCCLIBS_VERSION := unknown else GCCLIBS_VERSION:= $(shell $(CROSS_CC) -dumpversion) endif +GCCLIBS_LICENSE:= LGPLv2.1, LGPLv2.1+, LGPLv3+ # # Target-Install -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 05/16] iptables: add license information
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/iptables.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/iptables.make b/rules/iptables.make index de5f76c..67917bd 100644 --- a/rules/iptables.make +++ b/rules/iptables.make @@ -26,6 +26,7 @@ IPTABLES_SUFFIX := tar.bz2 IPTABLES_URL := http://ftp.netfilter.org/pub/iptables/$(IPTABLES).$(IPTABLES_SUFFIX) IPTABLES_SOURCE:= $(SRCDIR)/$(IPTABLES).$(IPTABLES_SUFFIX) IPTABLES_DIR := $(BUILDDIR)/$(IPTABLES) +IPTABLES_LICENSE := GPLv2 # # Prepare -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 06/16] ldd: fix license information
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/ldd.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/ldd.make b/rules/ldd.make index ea4563b..d850af1 100644 --- a/rules/ldd.make +++ b/rules/ldd.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_LDD) += ldd # This is the version from the glibc we have stolen from LDD_VERSION:= 2.7 -LDD_LICENSE:= none +LDD_LICENSE:= LGPLv2.1+ # # Target-Install -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 09/16] libiodbc: fix license information tag
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/libiodbc.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/libiodbc.make b/rules/libiodbc.make index 95681e4..8bcc517 100644 --- a/rules/libiodbc.make +++ b/rules/libiodbc.make @@ -24,7 +24,7 @@ LIBIODBC_SUFFIX := tar.gz LIBIODBC_URL := $(call ptx/mirror, SF, iodbc/$(LIBIODBC).$(LIBIODBC_SUFFIX)) LIBIODBC_SOURCE:= $(SRCDIR)/$(LIBIODBC).$(LIBIODBC_SUFFIX) LIBIODBC_DIR := $(BUILDDIR)/$(LIBIODBC) -LIBIOBDC_LICENSE := LGPLv2, BSD +LIBIODBC_LICENSE := LGPLv2, BSD # # Prepare -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 08/16] libevent: add license information
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/libevent.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/libevent.make b/rules/libevent.make index fb6fccd..675f78e 100644 --- a/rules/libevent.make +++ b/rules/libevent.make @@ -24,6 +24,7 @@ LIBEVENT_SUFFIX := tar.gz LIBEVENT_URL := https://github.com/downloads/libevent/libevent/$(LIBEVENT).$(LIBEVENT_SUFFIX) LIBEVENT_SOURCE:= $(SRCDIR)/$(LIBEVENT).$(LIBEVENT_SUFFIX) LIBEVENT_DIR := $(BUILDDIR)/$(LIBEVENT) +LIBEVENT_LICENSE := BSD # # Prepare -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 07/16] libdaemon: add license information
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/libdaemon.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/libdaemon.make b/rules/libdaemon.make index 6cd0e6e..395e190 100644 --- a/rules/libdaemon.make +++ b/rules/libdaemon.make @@ -24,6 +24,7 @@ LIBDAEMON_SUFFIX := tar.gz LIBDAEMON_URL := http://0pointer.de/lennart/projects/libdaemon/$(LIBDAEMON).$(LIBDAEMON_SUFFIX) LIBDAEMON_SOURCE := $(SRCDIR)/$(LIBDAEMON).$(LIBDAEMON_SUFFIX) LIBDAEMON_DIR := $(BUILDDIR)/$(LIBDAEMON) +LIBDAEMON_LICENSE := LGPLv2.1+ # # Prepare -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 12/16] mii-diag: add license information
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/mii-diag.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/mii-diag.make b/rules/mii-diag.make index c6ef132..c9f10ea 100644 --- a/rules/mii-diag.make +++ b/rules/mii-diag.make @@ -25,6 +25,7 @@ MII_DIAG_TARBALL := mii-diag_$(MII_DIAG_VERSION).orig.$(MII_DIAG_SUFFIX) MII_DIAG_URL := $(call ptx/mirror, DEB, pool/main/m/mii-diag/$(MII_DIAG_TARBALL)) MII_DIAG_SOURCE:= $(SRCDIR)/$(MII_DIAG_TARBALL) MII_DIAG_DIR := $(BUILDDIR)/$(MII_DIAG) +MII_DIAG_LICENSE := GPL # # Prepare -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 10/16] libltdl: add license information
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/libltdl.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/libltdl.make b/rules/libltdl.make index 93108c8..b244464 100644 --- a/rules/libltdl.make +++ b/rules/libltdl.make @@ -23,6 +23,7 @@ LIBLTDL_SUFFIX:= tar.gz LIBLTDL_URL:= $(call ptx/mirror, GNU, libtool/$(LIBLTDL).$(LIBLTDL_SUFFIX)) LIBLTDL_SOURCE := $(SRCDIR)/$(LIBLTDL).$(LIBLTDL_SUFFIX) LIBLTDL_DIR:= $(BUILDDIR)/$(LIBLTDL) +LIBLTDL_LICENSE:= LGPLv2.1+ (libltdl), GPLv2+ (libtool) # # Prepare -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 11/16] lighttpd: add license information
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/lighttpd.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/lighttpd.make b/rules/lighttpd.make index 92dd690..5648390 100644 --- a/rules/lighttpd.make +++ b/rules/lighttpd.make @@ -24,6 +24,7 @@ LIGHTTPD_SUFFIX := tar.xz LIGHTTPD_URL := http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX) LIGHTTPD_SOURCE:= $(SRCDIR)/$(LIGHTTPD).$(LIGHTTPD_SUFFIX) LIGHTTPD_DIR := $(BUILDDIR)/$(LIGHTTPD) +LIGHTTPD_LICENSE := BSD # # Prepare -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 13/16] myodbc: add license information
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/myodbc.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/myodbc.make b/rules/myodbc.make index e804cd4..c5cf3fa 100644 --- a/rules/myodbc.make +++ b/rules/myodbc.make @@ -23,6 +23,7 @@ MYODBC_SUFFIX := tar.gz MYODBC_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(MYODBC).$(MYODBC_SUFFIX) MYODBC_SOURCE := $(SRCDIR)/$(MYODBC).$(MYODBC_SUFFIX) MYODBC_DIR := $(BUILDDIR)/$(MYODBC) +MYODBC_LICENSE := GPLv2 with MySQL FLOSS License Exception # # Prepare -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 14/16] opkg: add license information
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/opkg.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/opkg.make b/rules/opkg.make index 95623c5..81cfbfe 100644 --- a/rules/opkg.make +++ b/rules/opkg.make @@ -24,6 +24,7 @@ OPKG_SUFFIX := tar.gz OPKG_URL := http://downloads.yoctoproject.org/releases/opkg/$(OPKG).$(OPKG_SUFFIX) OPKG_SOURCE:= $(SRCDIR)/$(OPKG).$(OPKG_SUFFIX) OPKG_DIR := $(BUILDDIR)/$(OPKG) +OPKG_LICENSE := GPLv2+ # # Prepare -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 15/16] sudo: add license information
Signed-off-by: Andreas Pretzsch a...@cn-eng.de --- rules/sudo.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/sudo.make b/rules/sudo.make index b516e52..c9ba61c 100644 --- a/rules/sudo.make +++ b/rules/sudo.make @@ -26,6 +26,7 @@ SUDO_URL := \ http://www.sudo.ws/sudo/dist/OLD/$(SUDO).$(SUDO_SUFFIX) SUDO_SOURCE:= $(SRCDIR)/$(SUDO).$(SUDO_SUFFIX) SUDO_DIR := $(BUILDDIR)/$(SUDO) +SUDO_LICENSE := BSD, ISC # # Prepare -- 2.1.0 -- ptxdist mailing list ptxdist@pengutronix.de
