Re: [ptxdist] [PATCH 2/2] u-boot: Allow generation of boot script
Hello Michael, see my questions inline below. Am Freitag, 12. April 2019, 09:49:18 CEST schrieb Michael Olbrich: > On Thu, Apr 11, 2019 at 01:09:37PM +0200, Alexander Dahl wrote: > > From: Ahmad Fatoum > > > > U-Boot can be configured via the environment to look for a boot script > > in the rootfs. The boot script can then be used to customize the booting > > process further. > > > > Cc: Denis OSTERLAND > > Co-authored-by: Alexander Dahl > > Signed-off-by: Ahmad Fatoum > > Signed-off-by: Alexander Dahl > > --- > > > > Notes: > > Changes from the original patch by Ahmad: > > > > * Added compile stage from patch adding precompiled U-Boot env, but > > > > changed compile command to '@$(call world/compile, )' as > > suggested by Denis OSTERLAND. (That patch was not merged upstream.) > > > > * Changed default script filename to 'boot.scr.uimg', because this is > > > > one of the defaults in 'config_distro_bootcmd.h' in U-Boot. (Took me > > only half a day to find why the script was not found here.) > > > > platforms/u-boot.in | 18 ++ > > rules/u-boot.make | 32 > > 2 files changed, 50 insertions(+) > > > > diff --git a/platforms/u-boot.in b/platforms/u-boot.in > > index 5d04a3cbd..8af0c8271 100644 > > --- a/platforms/u-boot.in > > +++ b/platforms/u-boot.in > > @@ -71,6 +71,24 @@ config U_BOOT_CONFIG > > > > endif > > > > +config U_BOOT_BOOT_SCRIPT > > + prompt "Compile U-Boot boot script" > > + bool > > + help > > + Use U-Boot's mkimage to compile a U-Boot boot script and install it > > + into the rootfs > > + > > +if U_BOOT_BOOT_SCRIPT > > + > > +config U_BOOT_BOOT_SCRIPT_ROOTFS_PATH > > + string > > + default "/boot/boot.scr.uimg" > > + prompt "Installation path" > > + help > > + Target rootfs path where the U-Boot script should be located > > + > > +endif > > + > > > > comment "target install" > > > > config U_BOOT_INSTALL_SREC > > > > diff --git a/rules/u-boot.make b/rules/u-boot.make > > index 55d18b97d..277216af9 100644 > > --- a/rules/u-boot.make > > +++ b/rules/u-boot.make > > @@ -2,6 +2,7 @@ > > > > # > > # Copyright (C) 2007 by Sascha Hauer > > # 2009, 2010 by Marc Kleine-Budde > > > > +# 2018 by Ahmad Fatoum > > > > # > > # See CREDITS for details about who has contributed to this project. > > # > > > > @@ -34,6 +35,10 @@ endif > > > > # Prepare > > # > > > > > ifdef PTXCONF_U_BOOT_BOOT_SCRIPT > > > +U_BOOT_BOOT_SCRIPT_TXT := $(call ptx/in-platformconfigdir, uboot.scr) > > +U_BOOT_BOOT_SCRIPT_BIN := $(call remove_quotes, \ > > + $(PTXCONF_U_BOOT_BOOT_SCRIPT_ROOTFS_PATH)) > > $(STATEDIR)/u-boot.compile: $(U_BOOT_BOOT_SCRIPT_TXT) > endif > > While ptx/in-platformconfigdir is not as slow as ptx/get-alternative, it > should still be avoided when not needed. > > Add the dependency to ensure changes are propagated. Makes sense. > > U_BOOT_WRAPPER_BLACKLIST := \ > > > > TARGET_HARDEN_STACKCLASH \ > > TARGET_HARDEN_RELRO \ > > > > @@ -82,6 +87,20 @@ $(STATEDIR)/u-boot.prepare: > > endif > > > > # > > > > > > > +# Compile > > +# > > - > > --- + > > +$(STATEDIR)/u-boot.compile: > > + @$(call targetinfo) > > + @$(call world/compile, U_BOOT) > > +ifdef PTXCONF_U_BOOT_BOOT_SCRIPT > > + @$(U_BOOT_DIR)/tools/mkimage -T script -C none \ > > + -d $(U_BOOT_BOOT_SCRIPT_TXT) \ > > + $(U_BOOT_DIR)/uboot.scr > > I don't mind the name, but you could use > '$(notdir $(U_BOOT_BOOT_SCRIPT_TXT))' here and below. Not sure what you mean here. 'mkimage' expects the [image data file] after option '-d', which is the input file not just a name. And what is 'below' supposed to mean here? Alex > > Michael > > > +endif > > + @$(call touch) > > + > > +# > > - > > ---> > > # Install > > # > > ---
Re: [ptxdist] audit.make file
Hello Prabhakar, Am Donnerstag, 18. April 2019, 11:42:18 CEST schrieb Prabhakara Rao Kolusu (WMSC-HW): > This is Prabhakar, working with ptxdist-2013.01.3. I need to add audit > package and its dependencies to my target board. > Could you please help us to compile audit package with ptxdist as current > ptxdist-2013.01.0 does not have audit.make file. Neither in current ptxdist master. Besides the problem with the package you want to compile, I strongly advise to migrate your BSP to a recent version of ptxdist. > Could you please let me know where should I get audit source code > audit.make files from, which are compatible to ptxdist-2013.01.0? You gave no details on which software package you want to build besides the very generic name. It's almost impossible to find this way. But besides that, the chance you find ptxdist packages anywhere but in the upstream repo is quite low. You probably will have to create that package by yourself. Have a look at the documentation, most of the current docs still apply to older ptxdist versions: https://www.ptxdist.org/doc/ If questions come up on the way, you can ask here. HTH & Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 06/34] dropbear: Add license information
Hello Michael, Am Mittwoch, 29. Mai 2019, 09:49:23 CEST schrieb Michael Olbrich: > On Fri, May 10, 2019 at 11:24:06AM +0200, Alexander Dahl wrote: > > The parts written for dropbear itself are MIT licensed, as are those > > imported from PuTTY. Some parts come from OpenSSH with BSD 2 clause, > > some parts are in the public domain. curve25519 parts from Google are > > BSD 3 clause licensed. Everything is explained in the file 'LICENSE'. > > > > Signed-off-by: Alexander Dahl > > --- > > > > rules/dropbear.make | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/rules/dropbear.make b/rules/dropbear.make > > index c1ad614ef..016c4d713 100644 > > --- a/rules/dropbear.make > > +++ b/rules/dropbear.make > > @@ -25,6 +25,8 @@ DROPBEAR_SUFFIX := tar.bz2 > > > > DROPBEAR_URL := > > http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX) > > DROPBEAR_SOURCE:= $(SRCDIR)/$(DROPBEAR).$(DROPBEAR_SUFFIX) > > DROPBEAR_DIR := $(BUILDDIR)/$(DROPBEAR) > > > > +DROPBEAR_LICENSE := MIT AND BSD-2-Clause AND BSD-3-Clause > > +DROPBEAR_LICENSE_FILES := > > file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01 > The license text for BSD-2-Clause is missing. It is not in the file LICENSE, but as stated in that file applies to loginrec.c, loginrec.h, atomicio.h, and atomicio.c. Each of those files contains the license text. Just pick one and add it to DROPBEAR_LICENSE_FILES? Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 16/34] libmodbus3: Fix license and add license file hashes
Hello Michael, Am Mittwoch, 29. Mai 2019, 10:04:20 CEST schrieb Michael Olbrich: > On Fri, May 10, 2019 at 11:24:16AM +0200, Alexander Dahl wrote: > > When introduced to ptxdist back in 2011 with version 3.0.1 libmodbus was > > already licensed LGPL-2.1-or-later for the library part and > > GPL-3.0-or-later for the tests. This did not change upstream since then. > > Do we have different versions, because the test in version 3.1.4 are > BSD-3-Clause Maybe. We still have 3.0.x in some BSPs, possible I mixed things up here. I'll recheck. > > Fixes: a8f85be09c663bfad8a34a162b1a63fb3d499985 > > Cc: Josef Holzmayr > > Signed-off-by: Alexander Dahl > > --- > > > > rules/libmodbus3.make | 5 - > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make > > index 9f9acdc6d..5f3189cd0 100644 > > --- a/rules/libmodbus3.make > > +++ b/rules/libmodbus3.make > > @@ -23,7 +23,10 @@ LIBMODBUS3_SUFFIX:= tar.gz > > > > LIBMODBUS3_URL := > > http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX) > > LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX) > > LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3) > > > > -LIBMODBUS3_LICENSE := LGPL-3.0-only > > +LIBMODBUS3_LICENSE := LGPL-2.1-or-later AND GPL-3.0-or-later > > +LIBMODBUS3_LICENSE_FILES := \ > > + file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \ > > + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 > > ... and this file does not exist. o.O Okay I will recheck this library. Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 05/34] libnl3: Fix license and add license hash
Hei hei, before I dive in deeper, I have a general questionm which does not only apply to libnl3, see below. Am Mittwoch, 29. Mai 2019, 09:12:32 CEST schrieb Michael Olbrich: > On Tue, May 28, 2019 at 11:43:46PM +0200, Roland Hieber wrote: > > I was a bit hasty with my Reviewed-by line, and found some more: > > > > include/netlink/xfrm/*: BSD-3-Clause > > This one should be added with a file entry with starline/endline > > > include/netlink/hash.h: Public Domain / CC-0 > > m4/*: FSFULLR (today I learned a new SPDX license identifier ...^^) > > I think we can skip those. > > > lib/xfrm/*: BSD-3-Clause > > Source to the headers above. > > > lib/hash.h: Public Domain / CC-0 > > And skip this as well. What about 'include/linux-private'? These seem to be headers all copied from 'include/uapi' from the Linux kernel. So I think this is not directly part of libnl3, but comes with the lib just for convenience and easier build. Otherwise one would have to build against real kernel headers, right? Should those files also be part of the license list and files then? Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3 2/3] ptxd_lib_dgen: error out for targetinstall stages in host/cross/image packages
Hei hei, On Thu, Jun 06, 2019 at 06:26:15PM +0200, Roland Hieber wrote: > This point came up multiple times in the past and the special handling > of targetinstall stages lead to confusion when trying to depend on image > packages. Document it to prevent further confusion in that matter, and > warn the user if such a make target exists. The last time I fell in that trap, was when I tried to package a binary image file for an onboard FPGA which I wanted to have in /boot to load it from U-Boot, but to also have it updated with the rootfs. Turned out I could not name that image package just 'image-fpga' … ;-) So thanks for this patch, this can probably avoid wasting time for one or the other developer. :-) Greets Alex -- /"\ ASCII RIBBON | »With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.« / \ HTML MAIL| (Jean-Luc Picard, quoting Judge Aaron Satie) signature.asc Description: PGP signature ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] inetd services: don't use busybox's find in postinst
Hello Roland, On Mon, Jun 17, 2019 at 04:06:46PM +0200, Roland Hieber wrote: > busybox's find doesn't understand '-empty', so when running these > postinst scripts on a system without GNU coreutils, they will display a > nice help text instead. In deed. > diff --git a/rules/busybox.postinst b/rules/busybox.postinst > index 6f564791d0c8..aa56d329fd72 100644 > --- a/rules/busybox.postinst > +++ b/rules/busybox.postinst > @@ -1,8 +1,7 @@ > #!/bin/sh > > # generate inetd.conf > -if [ -d $DESTDIR/etc/inetd.conf.d ] && > - [ -z "`find $DESTDIR/etc/inetd.conf.d -type d -empty`" ]; then > +if [ "`echo $DESTDIR/etc/inetd.conf.d/*`" != "$DESTDIR/etc/inetd.conf.d/*" > ]; then > cat $DESTDIR/etc/inetd.conf.d/* > $DESTDIR/etc/inetd.conf > fi The use of backticks is discouraged by shellcheck: https://github.com/koalaman/shellcheck/wiki/SC2006 Grüße Alex -- /"\ ASCII RIBBON | »With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.« / \ HTML MAIL| (Jean-Luc Picard, quoting Judge Aaron Satie) signature.asc Description: PGP signature ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 07/34] figlet: Fix license and add license file hashes
Hello Roland, thanks for your review. Comments below. Am Montag, 13. Mai 2019, 11:41:12 CEST schrieb Roland Hieber: > On Fri, May 10, 2019 at 11:24:07AM +0200, Alexander Dahl wrote: > > Added information based on what the Debian project found out. > > > > https://metadata.ftp-master.debian.org/changelogs//main/f/figlet/figlet_2. > > 2.5-2_copyright > > > > Signed-off-by: Alexander Dahl > > --- > > > > rules/figlet.make | 8 +++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/rules/figlet.make b/rules/figlet.make > > index b22d22e17..8886beab3 100644 > > --- a/rules/figlet.make > > +++ b/rules/figlet.make > > @@ -25,7 +25,13 @@ FIGLET_SUFFIX:= tar.gz > > > > FIGLET_URL := > > ftp://ftp.figlet.org/pub/figlet/program/unix/$(FIGLET).$(FIGLET_SUFFIX) > > FIGLET_SOURCE := $(SRCDIR)/$(FIGLET).$(FIGLET_SUFFIX) > > FIGLET_DIR := $(BUILDDIR)/$(FIGLET) > > > > -FIGLET_LICENSE := figlet > > +FIGLET_LICENSE := BSD-3-Clause AND MIT-CMU AND ISC AND Unicode- DFS-2016 > > AND WTFPL +FIGLET_LICENSE_FILES := \ > > + file://LICENSE;md5=1688bcd97b27704f1afcac7336409857 \ > > + file:// inflate.c;startline=7;endline=27;md5=74ed6158b8244dbc4d91afaf8a39 > > bec2 \ > > + file://utf8.c;startline=2;endline=16;md5=eb9cc57cf60ac24044670bf8dc4755 > > 79 \ > > + file://fonts/8859-2.flc;startline=9;endline=23;md5=1cecb984063248f29ffe > > 5c46f5c04f34 \ > > + file://tests/emboss.tlf;startline=3;endline=10;md5=8e317e9236ffade21fed > > c39e3496eac2 > I was trying to reproduce these, but I got a better match for HPND > instead of MIT-CMU for inflate.c. See lines 29 to 33 in inflate.c, it is explicitly licensed under MIT. However the license text for MIT itself does not match very well, but for MIT-CMU quite well. It's a little tricky to interpret the output of your tool. One has to look very closely at the brackets! Sometimes comparing manually with the annotated license text at spdx.org got me a better result. I often had the case your tool had a higher matching value for BSD-2-Clause, when the license was actually BSD-3-Clause, for example. > And I cannot reprocude the match from > fonts/8859-2.flc, which apparently should be Unicode-DFS-2016? It seems > to me this is a bug in the Debian package you referenced above. I was not sure about this, I actually tried to compare with upstream unicode files, but the licensing was rather unclear to me. From the three Unicode licenses listed by SPDX that one seemed to match best. If someone has a better idea on that, let me know. Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] license-yaml2csv.py fails on Debian 9 (stretch)
Hei hei, Am Dienstag, 14. Mai 2019, 16:56:54 CEST schrieb Alexander Dahl: > I tried to run license-yaml2csv.py today, just out of curiosity, but it does > not work: > > > adahl@ada /mnt/data/adahl/src/DistroKit (git)-[master] % /usr/local/lib/ > ptxdist-$(p version)/scripts/license-yaml2csv.py platform-v7a/report/misc/ > openssl/license-report.yaml > Traceback (most recent call last): > File "/usr/local/lib/ptxdist-2019.05.0/scripts/license-yaml2csv.py", line > 56, in > value = record.get(field, None) > AttributeError: 'str' object has no attribute 'get' Well, it seems, that was the wrong input file. The followin works: adahl@ada ~/src/DistroKit (git)-[master] % /usr/local/lib/ptxdist-$(ptxdist version)/scripts/license-yaml2csv.py platform-v7a/release/license- compliance.yaml To generate that yaml file, one has to call this: ptxdist make license-compliance-data If you're interested in license report topics, there are more interesting make targets in rules/post/ptxd_make_license_report.make … Thanks for reading. ;-) Alex ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 03/34] boost: Add license file hash
Signed-off-by: Alexander Dahl --- rules/boost.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/boost.make b/rules/boost.make index 555b1744f..9575486ab 100644 --- a/rules/boost.make +++ b/rules/boost.make @@ -25,6 +25,7 @@ BOOST_URL := $(call ptx/mirror, SF, boost/$(BOOST).$(BOOST_SUFFIX)) BOOST_SOURCE := $(SRCDIR)/$(BOOST).$(BOOST_SUFFIX) BOOST_DIR := $(BUILDDIR)/$(BOOST) BOOST_LICENSE := BSL-1.0 +BOOST_LICENSE_FILES := file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 01/34] at: Add license identifiers and hashes
Signed-off-by: Alexander Dahl --- rules/at.make | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rules/at.make b/rules/at.make index 1436dcdbb..101529a4f 100644 --- a/rules/at.make +++ b/rules/at.make @@ -24,7 +24,10 @@ AT_TARBALL := at_$(AT_VERSION).orig.$(AT_SUFFIX) AT_URL := http://snapshot.debian.org/archive/debian/20091130T214753Z/pool/main/a/at/$(AT_TARBALL) AT_SOURCE := $(SRCDIR)/$(AT_TARBALL) AT_DIR := $(BUILDDIR)/$(AT) -AT_LICENSE := unknown +AT_LICENSE := GPL-2.0-or-later AND GPL-3.0-or-later AND ISC +AT_LICENSE_FILES := \ + file://COPYING;md5=4325afd396febcb659c36b49533135d4 \ + file://Copyright;md5=dffa11c636884752fbf0b2a159b2883a # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 02/34] at91bootstrap: Add license information
There's no separate license nor readme file in this project, but just some information in the file headers. Files of the following types were checked for individual license information: .h, .c, Makefile, .S, .bat, and .sh. Most code by Atmel matches "BSD-Source-Code" license, one file from U-Boot (?) is under GPL. Signed-off-by: Alexander Dahl --- rules/at91bootstrap.make | 4 1 file changed, 4 insertions(+) diff --git a/rules/at91bootstrap.make b/rules/at91bootstrap.make index 5dd1c2991..bb8bf8ad9 100644 --- a/rules/at91bootstrap.make +++ b/rules/at91bootstrap.make @@ -27,6 +27,10 @@ AT91BOOTSTRAP_URL:= \ http://sources.buildroot.net/$(AT91BOOTSTRAP_TARBALL) AT91BOOTSTRAP_SOURCE := $(SRCDIR)/$(AT91BOOTSTRAP_TARBALL) AT91BOOTSTRAP_DIR := $(BUILDDIR)/$(AT91BOOTSTRAP) +AT91BOOTSTRAP_LICENSE := BSD-Source-Code AND GPL-2.0-or-later +AT91BOOTSTRAP_LICENSE_FILES := \ + file://main.c;startline=4;endline=26;md5=3492153edbe9064d12ba58818b73983d \ + file://lib/div0.c;startline=2;endline=21;md5=e0212951661974539b2490564f7050fe # # Compile -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 05/34] libnl3: Fix license and add license hash
libnl3 library is licensed under LGPL-2.1-only according to file 'COPYING' and file headers of various library source and public include header files of the project. That did not change ever since initial import of code into libnl vcs in 2007 and up to the current version. The license stated when introducing the libnl3 package into ptxdist back in 2013 applies to the tools however. This is backed by a statement of the author from 2015: https://github.com/thom311/libnl/issues/80 Fixes: adeac13183422dc7152ad5e0484601b074436af7 Cc: Alexander Aring Signed-off-by: Alexander Dahl --- rules/libnl3.make | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rules/libnl3.make b/rules/libnl3.make index e3bda8785..285f4c89b 100644 --- a/rules/libnl3.make +++ b/rules/libnl3.make @@ -24,7 +24,9 @@ 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 +# LGPL-2.1-only for library; GPL-2.0-only for tools +LIBNL3_LICENSE := LGPL-2.1-only AND GPL-2.0-only +LIBNL3_LICENSE_FILES := file://COPYING;md5=4fbd65380cdd255951079008b364516c # # autoconf -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 09/34] json-c: Add license file hash
Signed-off-by: Alexander Dahl --- rules/json-c.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/json-c.make b/rules/json-c.make index 166392e1f..f5d9fe254 100644 --- a/rules/json-c.make +++ b/rules/json-c.make @@ -24,6 +24,7 @@ JSON_C_URL:= https://github.com/json-c/json-c/archive/$(JSON_C).$(JSON_C_SUFFI JSON_C_SOURCE := $(SRCDIR)/$(JSON_C).$(JSON_C_SUFFIX) JSON_C_DIR := $(BUILDDIR)/$(JSON_C) JSON_C_LICENSE := MIT +JSON_C_LICENSE_FILES := file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 13/34] libgmp: Fix license
The README of libgmp 6.1.2 and 6.0.0 states this: > The GNU MP Library is free software; you can redistribute it and/or modify > it under the terms of either: > > * the GNU Lesser General Public License as published by the Free > Software Foundation; either version 3 of the License, or (at your > option) any later version. > > or > > * the GNU General Public License as published by the Free Software > Foundation; either version 2 of the License, or (at your option) any > later version. > > or both in parallel, as here. The library switched licensing with release of version 6. Fixes: 9d22b77f54f0001640e4d632d0c463c029a3e8d0 Cc: Alexander Aring Fixes: 00c6e91b6b8a54cdfc7af0d75e4eb7637981e63d Cc: Juergen Borleis Signed-off-by: Alexander Dahl --- rules/libgmp.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/libgmp.make b/rules/libgmp.make index 1c9568f37..80a0baab7 100644 --- a/rules/libgmp.make +++ b/rules/libgmp.make @@ -24,7 +24,7 @@ LIBGMP_SUFFIX := tar.bz2 LIBGMP_URL := $(call ptx/mirror, GNU, gmp/$(LIBGMP).$(LIBGMP_SUFFIX)) LIBGMP_SOURCE := $(SRCDIR)/$(LIBGMP).$(LIBGMP_SUFFIX) LIBGMP_DIR := $(BUILDDIR)/$(LIBGMP) -LIBGMP_LICENSE := GPL-3.0-only AND LGPL-3.0-only +LIBGMP_LICENSE := GPL-2.0-or-later OR LGPL-3.0-or-later # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 06/34] dropbear: Add license information
The parts written for dropbear itself are MIT licensed, as are those imported from PuTTY. Some parts come from OpenSSH with BSD 2 clause, some parts are in the public domain. curve25519 parts from Google are BSD 3 clause licensed. Everything is explained in the file 'LICENSE'. Signed-off-by: Alexander Dahl --- rules/dropbear.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/dropbear.make b/rules/dropbear.make index c1ad614ef..016c4d713 100644 --- a/rules/dropbear.make +++ b/rules/dropbear.make @@ -25,6 +25,8 @@ DROPBEAR_SUFFIX := tar.bz2 DROPBEAR_URL := http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX) DROPBEAR_SOURCE:= $(SRCDIR)/$(DROPBEAR).$(DROPBEAR_SUFFIX) DROPBEAR_DIR := $(BUILDDIR)/$(DROPBEAR) +DROPBEAR_LICENSE := MIT AND BSD-2-Clause AND BSD-3-Clause +DROPBEAR_LICENSE_FILES := file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 11/34] libarchive: Add license file hash
Signed-off-by: Alexander Dahl --- rules/libarchive.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/libarchive.make b/rules/libarchive.make index f4252df35..e5a9a3f5b 100644 --- a/rules/libarchive.make +++ b/rules/libarchive.make @@ -24,6 +24,7 @@ LIBARCHIVE_URL:= http://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIV LIBARCHIVE_SOURCE := $(SRCDIR)/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX) LIBARCHIVE_DIR := $(BUILDDIR)/$(LIBARCHIVE) LIBARCHIVE_LICENSE := BSD-2-Clause AND BSD-3-Clause +LIBARCHIVE_LICENSE_FILES := file://COPYING;md5=ed99aca006bc346974bb745a35336425 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 10/34] coreutils: Add license file hash
Signed-off-by: Alexander Dahl --- rules/coreutils.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/coreutils.make b/rules/coreutils.make index e36767a81..fc39de8e7 100644 --- a/rules/coreutils.make +++ b/rules/coreutils.make @@ -24,6 +24,7 @@ COREUTILS_URL := $(call ptx/mirror, GNU, coreutils/$(COREUTILS).$(COREUTILS_SUF COREUTILS_SOURCE := $(SRCDIR)/$(COREUTILS).$(COREUTILS_SUFFIX) COREUTILS_DIR := $(BUILDDIR)/$(COREUTILS) COREUTILS_LICENSE := GPL-3.0-only +COREUTILS_LICENSE_FILES:= file://COPYING;md5=d32239bcb673463ab874e80d47fae504 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 20/34] libpopt: Add license file hash
Signed-off-by: Alexander Dahl --- rules/libpopt.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/libpopt.make b/rules/libpopt.make index 3bc769080..06e6d896f 100644 --- a/rules/libpopt.make +++ b/rules/libpopt.make @@ -25,6 +25,7 @@ LIBPOPT_URL := http://rpm5.org/files/popt/$(LIBPOPT).$(LIBPOPT_SUFFIX) LIBPOPT_SOURCE := $(SRCDIR)/$(LIBPOPT).$(LIBPOPT_SUFFIX) LIBPOPT_DIR:= $(BUILDDIR)/$(LIBPOPT) LIBPOPT_LICENSE:= MIT +LIBPOPT_LICENSE_FILES := file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 16/34] libmodbus3: Fix license and add license file hashes
When introduced to ptxdist back in 2011 with version 3.0.1 libmodbus was already licensed LGPL-2.1-or-later for the library part and GPL-3.0-or-later for the tests. This did not change upstream since then. Fixes: a8f85be09c663bfad8a34a162b1a63fb3d499985 Cc: Josef Holzmayr Signed-off-by: Alexander Dahl --- rules/libmodbus3.make | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make index 9f9acdc6d..5f3189cd0 100644 --- a/rules/libmodbus3.make +++ b/rules/libmodbus3.make @@ -23,7 +23,10 @@ LIBMODBUS3_SUFFIX:= tar.gz LIBMODBUS3_URL := http://libmodbus.org/site_media/build/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX) LIBMODBUS3_SOURCE := $(SRCDIR)/$(LIBMODBUS3).$(LIBMODBUS3_SUFFIX) LIBMODBUS3_DIR := $(BUILDDIR)/$(LIBMODBUS3) -LIBMODBUS3_LICENSE := LGPL-3.0-only +LIBMODBUS3_LICENSE := LGPL-2.1-or-later AND GPL-3.0-or-later +LIBMODBUS3_LICENSE_FILES := \ + file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 17/34] libnet: Add license information
Signed-off-by: Alexander Dahl --- rules/libnet.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/libnet.make b/rules/libnet.make index 635c3d8c4..3c94b5fd6 100644 --- a/rules/libnet.make +++ b/rules/libnet.make @@ -24,6 +24,8 @@ LIBNET_SUFFIX := tar.gz LIBNET_URL := $(call ptx/mirror, SF, libnet-dev/$(LIBNET).$(LIBNET_SUFFIX)) LIBNET_SOURCE := $(SRCDIR)/$(LIBNET).$(LIBNET_SUFFIX) LIBNET_DIR := $(BUILDDIR)/$(LIBNET) +LIBNET_LICENSE := BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND MIT-CMU +LIBNET_LICENSE_FILES := file://doc/COPYING;md5=fb43d5727b2d3d1238545f75ce456ec3 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 25/34] mtd-utils: Add license file hash
Signed-off-by: Alexander Dahl --- rules/mtd-utils.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make index a433c6fa2..36f5fb7b1 100644 --- a/rules/mtd-utils.make +++ b/rules/mtd-utils.make @@ -25,6 +25,8 @@ MTD_UTILS_URL := ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS MTD_UTILS_SOURCE := $(SRCDIR)/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) MTD_UTILS_DIR := $(BUILDDIR)/$(MTD_UTILS) MTD_UTILS_LICENSE := GPL-2.0-or-later +MTD_UTILS_LICENSE_FILES:= file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 + # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 14/34] libgmp: Add license file hashes
The README contains the dual licensing statement. The other three files are the license texts for GPL-2.0, GPL-3.0, and LGPL-3.0. The file 'COPYING' in version 6.1.2 of libgmp also contains a GPLv3 license text, but is removed upstream in later versions. Signed-off-by: Alexander Dahl --- rules/libgmp.make | 5 + 1 file changed, 5 insertions(+) diff --git a/rules/libgmp.make b/rules/libgmp.make index 80a0baab7..1948f8cb2 100644 --- a/rules/libgmp.make +++ b/rules/libgmp.make @@ -25,6 +25,11 @@ LIBGMP_URL := $(call ptx/mirror, GNU, gmp/$(LIBGMP).$(LIBGMP_SUFFIX)) LIBGMP_SOURCE := $(SRCDIR)/$(LIBGMP).$(LIBGMP_SUFFIX) LIBGMP_DIR := $(BUILDDIR)/$(LIBGMP) LIBGMP_LICENSE := GPL-2.0-or-later OR LGPL-3.0-or-later +LIBGMP_LICENSE_FILES := \ + file://README;startline=1;endline=27;md5=20e1eb0dbe1e7dba4f5934a132360fe9 \ + file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 18/34] libnftnl: Fix license and add license file hash
When added to ptxdist in 2016 the package version was 1.0.5, which already contained at least one file under GPL-2.0-only, which is still the case with the current version 1.1.2. Fixes: db4d91b62aa8f8653fa2e6b87fc72f07cd838cfd Cc: Andreas Geisenhainer Signed-off-by: Alexander Dahl --- rules/libnftnl.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/libnftnl.make b/rules/libnftnl.make index b5fd6331d..a53652d0a 100644 --- a/rules/libnftnl.make +++ b/rules/libnftnl.make @@ -23,7 +23,8 @@ LIBNFTNL_SUFFIX := tar.bz2 LIBNFTNL_URL := http://ftp.netfilter.org/pub/libnftnl/$(LIBNFTNL).$(LIBNFTNL_SUFFIX) LIBNFTNL_SOURCE:= $(SRCDIR)/$(LIBNFTNL).$(LIBNFTNL_SUFFIX) LIBNFTNL_DIR := $(BUILDDIR)/$(LIBNFTNL) -LIBNFTNL_LICENSE := GPL-2.0-only +LIBNFTNL_LICENSE := GPL-2.0-only AND GPL-2.0-or-later +LIBNFTNL_LICENSE_FILES := file://COPYING;md5=79808397c3355f163c012616125c9e26 # # autoconf -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 19/34] libpcap: Fix license and add license file hash
While the license in file 'LICENSE' indeed seems to be BSD-3-Clause, the actual source files have more, different licensing applied in their headers, all different variants of BSD licenses. Signed-off-by: Alexander Dahl --- Notes: ./ieee80211.h is even BSD-3-Clause OR GPL-2.0-only … o.O How should this be handled? rules/libpcap.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/libpcap.make b/rules/libpcap.make index 3f2c85205..7871f8684 100644 --- a/rules/libpcap.make +++ b/rules/libpcap.make @@ -23,7 +23,8 @@ LIBPCAP_SUFFIX:= tar.gz LIBPCAP_URL:= http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX) LIBPCAP_SOURCE := $(SRCDIR)/$(LIBPCAP).$(LIBPCAP_SUFFIX) LIBPCAP_DIR:= $(BUILDDIR)/$(LIBPCAP) -LIBPCAP_LICENSE:= BSD-3-Clause +LIBPCAP_LICENSE:= BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSD-4-Clause-UC +LIBPCAP_LICENSE_FILES := file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 28/34] nftables: Add license file hash
Signed-off-by: Alexander Dahl --- rules/nftables.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/nftables.make b/rules/nftables.make index 15368f965..8509059b4 100644 --- a/rules/nftables.make +++ b/rules/nftables.make @@ -24,6 +24,7 @@ NFTABLES_URL := http://ftp.netfilter.org/pub/nftables/$(NFTABLES).$(NFTABLES_SU NFTABLES_SOURCE:= $(SRCDIR)/$(NFTABLES).$(NFTABLES_SUFFIX) NFTABLES_DIR := $(BUILDDIR)/$(NFTABLES) NFTABLES_LICENSE := GPL-2.0-only +NFTABLES_LICENSE_FILES := file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 15/34] libmnl: Fix license and add license file hashes
libmnl switched from GPLv2+ to LGPLv2.1+ before the 1.0.0 release. The package was initially added to ptxdist with version 1.0.3 in 2016 with the wrong license information. The project clearly states it is LGPL-2.1-or-later in both COPYING file and file headers. Fixes: e2c4c9dceec7dfcef3bfcbd2f2a2d09eb88b8726 Cc: Andreas Geisenhainer Signed-off-by: Alexander Dahl --- rules/libmnl.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/libmnl.make b/rules/libmnl.make index cacef7d07..844cc9279 100644 --- a/rules/libmnl.make +++ b/rules/libmnl.make @@ -23,7 +23,8 @@ LIBMNL_SUFFIX := tar.bz2 LIBMNL_URL := http://ftp.netfilter.org/pub/libmnl/$(LIBMNL).$(LIBMNL_SUFFIX) LIBMNL_SOURCE := $(SRCDIR)/$(LIBMNL).$(LIBMNL_SUFFIX) LIBMNL_DIR := $(BUILDDIR)/$(LIBMNL) -LIBMNL_LICENSE := GPL-2.0-only +LIBMNL_LICENSE := LGPL-2.1-or-later +LIBMNL_LICENSE_FILES := file://COPYING;md5=4fbd65380cdd255951079008b364516c # # autoconf -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 24/34] log4cplus: Fix licenses and add license file hash
When introduced as package to ptxdist, log4cplus 1.1.0 README already stated: > This library is licensed under the Apache Public License 2.0 and two > clause BSD license. Please read the included LICENSE file for > details. Actually some files are under Apache-2.0 and other files are under BSD-2-Clause, so both apply. Fixes: 0ac556f6b55da4c9d41c5e191432ba51276a40eb Cc: Bernhard Sessler Signed-off-by: Alexander Dahl --- rules/log4cplus.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/log4cplus.make b/rules/log4cplus.make index 18fc53fb0..75959a32d 100644 --- a/rules/log4cplus.make +++ b/rules/log4cplus.make @@ -24,7 +24,8 @@ LOG4CPLUS_SUFFIX := tar.xz LOG4CPLUS_URL := $(call ptx/mirror, SF, log4cplus/$(LOG4CPLUS).$(LOG4CPLUS_SUFFIX)) LOG4CPLUS_SOURCE := $(SRCDIR)/$(LOG4CPLUS).$(LOG4CPLUS_SUFFIX) LOG4CPLUS_DIR := $(BUILDDIR)/$(LOG4CPLUS) -LOG4CPLUS_LICENSE := Apache-2.0 +LOG4CPLUS_LICENSE := Apache-2.0 AND BSD-2-Clause +LOG4CPLUS_LICENSE_FILES:= file://LICENSE;md5=65053a46f707ee2b93f09ad22f692170 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 21/34] libxml2: Fix license and add license file hash
The 'Copyright' file says: > Except where otherwise noted in the source code (e.g. the files hash.c, > list.c and the trio files, which are covered by a similar licence but > with different Copyright notices) all the files are: According to comparison with the license text at SPDX and what Debian found out, those files are put under ISC license. Signed-off-by: Alexander Dahl --- rules/libxml2.make | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rules/libxml2.make b/rules/libxml2.make index 234e85f3e..c47356532 100644 --- a/rules/libxml2.make +++ b/rules/libxml2.make @@ -24,7 +24,9 @@ LIBXML2 := libxml2-$(LIBXML2_VERSION) LIBXML2_SUFFIX := tar.gz LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX) LIBXML2_DIR:= $(BUILDDIR)/$(LIBXML2) -LIBXML2_LICENSE:= MIT +LIBXML2_LICENSE:= MIT AND ISC +# The file 'COPYING' is just a symlink on the file 'Copyright' +LIBXML2_LICENSE_FILES := file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 LIBXML2_URL := \ ftp://xmlsoft.org/libxml2/$(LIBXML2).$(LIBXML2_SUFFIX) \ -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 27/34] net-snmp: Fix licenses and add license file hash
Fixes: 4cb0b96e0df94644e42a735039967c6a5fa22a27 Cc: Oliver Graute Signed-off-by: Alexander Dahl --- rules/net-snmp.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/net-snmp.make b/rules/net-snmp.make index eb24ccbc2..98acf38cd 100644 --- a/rules/net-snmp.make +++ b/rules/net-snmp.make @@ -25,7 +25,8 @@ NET_SNMP_SUFFIX := tar.gz NET_SNMP_URL := $(call ptx/mirror, SF, net-snmp/$(NET_SNMP).$(NET_SNMP_SUFFIX)) NET_SNMP_SOURCE:= $(SRCDIR)/$(NET_SNMP).$(NET_SNMP_SUFFIX) NET_SNMP_DIR := $(BUILDDIR)/$(NET_SNMP) -NET_LICENSE:= BSD like +NET_SNMP_LICENSE := MIT-CMU AND BSD-3-Clause +NET_SNMP_LICENSE_FILES := file://COPYING;md5=5dedd290b5ffbe69d9625ddeb350a044 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 26/34] ncurses: Use 'COPYING' for license file hash
That file came with ncurses 6.0, when the initial license file hash was defined in ptxdist for ncurses 5.9, that file was not yet present. For details on ncurses licensing see: https://invisible-island.net/ncurses/ncurses-license.html Signed-off-by: Alexander Dahl --- rules/ncurses.make | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rules/ncurses.make b/rules/ncurses.make index 1df747983..c2a111cc2 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -24,8 +24,7 @@ NCURSES_URL := $(call ptx/mirror, GNU, ncurses/$(NCURSES).$(NCURSES_SUFFIX)) NCURSES_SOURCE := $(SRCDIR)/$(NCURSES).$(NCURSES_SUFFIX) NCURSES_DIR:= $(BUILDDIR)/$(NCURSES) NCURSES_LICENSE:= MIT -NCURSES_LICENSE_FILES := \ - file://include/curses.h.in;startline=2;endline=26;md5=12de1a79061c9246decc146201452dc5 +NCURSES_LICENSE_FILES := file://COPYING;md5=8a241caac0fd66225f7ac2d1b2ef76ac # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 30/34] readline: Add license file hash
Signed-off-by: Alexander Dahl --- rules/readline.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/readline.make b/rules/readline.make index be3928c78..382d22685 100644 --- a/rules/readline.make +++ b/rules/readline.make @@ -25,6 +25,7 @@ READLINE_URL := $(call ptx/mirror, GNU, readline/$(READLINE).$(READLINE_SUFFIX) READLINE_SOURCE:= $(SRCDIR)/$(READLINE).$(READLINE_SUFFIX) READLINE_DIR := $(BUILDDIR)/$(READLINE) READLINE_LICENSE := GPL-3.0-or-later +READLINE_LICENSE_FILES := file://COPYING;md5=d32239bcb673463ab874e80d47fae504 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 23/34] lm_sensors: Add license file hashes
Signed-off-by: Alexander Dahl --- rules/lm_sensors.make | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rules/lm_sensors.make b/rules/lm_sensors.make index a80ffdc13..5f6de9785 100644 --- a/rules/lm_sensors.make +++ b/rules/lm_sensors.make @@ -27,6 +27,9 @@ LM_SENSORS_URL:= \ LM_SENSORS_SOURCE := $(SRCDIR)/$(LM_SENSORS).$(LM_SENSORS_SUFFIX) LM_SENSORS_DIR := $(BUILDDIR)/$(LM_SENSORS) LM_SENSORS_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later +LM_SENSORS_LICENSE_FILES := \ + file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 08/34] flex: Fix license and add license file hash
The license text neither matches BSD-2-Clause nor BSD-3-Clause exactly. However it actually contains the third clause, but without leading numbering. Fixes: 1c799fcdc126d9e81da7944809e9da2a6d96466d Cc: Juergen Borleis Signed-off-by: Alexander Dahl --- rules/flex.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/flex.make b/rules/flex.make index 803e25897..bcf628d44 100644 --- a/rules/flex.make +++ b/rules/flex.make @@ -23,7 +23,8 @@ FLEX_SUFFIX := tar.xz FLEX_URL := $(call ptx/mirror, SF, flex/$(FLEX).$(FLEX_SUFFIX)) FLEX_SOURCE:= $(SRCDIR)/$(FLEX).$(FLEX_SUFFIX) FLEX_DIR := $(BUILDDIR)/$(FLEX) -FLEX_LICENSE := BSD-2-Clause +FLEX_LICENSE := BSD-3-Clause +FLEX_LICENSE_FILES := file://COPYING;md5=e4742cf92e89040b39486a6219b68067 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 12/34] libfaketime: Add license file hash
Signed-off-by: Alexander Dahl --- rules/libfaketime.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/libfaketime.make b/rules/libfaketime.make index fe5d21b46..4ed9c3db2 100644 --- a/rules/libfaketime.make +++ b/rules/libfaketime.make @@ -18,6 +18,7 @@ LIBFAKETIME_URL := https://github.com/wolfcw/libfaketime/archive/v$(LIBFAKETIME LIBFAKETIME_SOURCE := $(SRCDIR)/$(LIBFAKETIME).$(LIBFAKETIME_SUFFIX) LIBFAKETIME_DIR:= $(BUILDDIR)/$(LIBFAKETIME) LIBFAKETIME_LICENSE:= GPL-2.0-only +LIBFAKETIME_LICENSE_FILES := file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 00/34] License updates
Hei hei, I reviewed lots of packages for licensing issues and this patch series is the outcome. There are basically three types of patches: 1) Add license information where it was missing 2) Add license file hashes for otherwise already correct packages 3) Fix license information where the given licenses are/became wrong 4) Combinations of the above When mistakes were traceable to specific changesets, I added Fixes: lines and the original author in Cc. This is not meant to offend anyone, but to get a second opinion or review. This legal stuff is hard, I get headaches from this. This is also why some commit messages are longer than others. Please review these patches carefully, I'm no lawyer. Some small upstream projects make it easy to check each file, some would require to inspect over 100 source files, if you want to do it right. Almost none so far uses those still quite new SPDX license identifiers in the file headers (sudo does in a version not yet available in ptxdist). Some patches contain additional notes with remarks or questions. Thanks to Roland Hieber for his SPDX matching tool [1], which made all this a lot easier. You should however not solely depend on that tool, but have a look into the current SPDX license list [3] and exceptions [4]. Also helpful was the Debian project. They carry detailed copyright information with their packages (well, most of them), e.g.: https://metadata.ftp-master.debian.org/changelogs//main/u/util-linux/util-linux_2.33.1-0.1_copyright And I also had a look on the license information the buildroot project [2] has in its packages. Maybe someone wants to send them patches as well. ;-) Some additional notes on which packages should be reviewed and probably updated: * U-Boot * util-linux-ng Let me know, if I should reorder or change or squash something, but I would also be happy, if just a subset would be applied. Greets Alex P.S.: For people enjoying a long read about this whole license mess, here you go: https://invisible-island.net/ncurses/ncurses-license.html P.P.S.: If you did not already know, the FSFE started the REUSE initiative to make all this somewhat easier, so if you're an upstream developer, have a look: https://reuse.software/ [1] https://github.com/rohieb/spdx-license-match [2] https://buildroot.org/ [3] https://spdx.org/licenses/ [4] https://spdx.org/licenses/exceptions-index.html Alexander Dahl (34): at: Add license identifiers and hashes at91bootstrap: Add license information boost: Add license file hash busybox: Add license file hash libnl3: Fix license and add license hash dropbear: Add license information figlet: Fix license and add license file hashes flex: Fix license and add license file hash json-c: Add license file hash coreutils: Add license file hash libarchive: Add license file hash libfaketime: Add license file hash libgmp: Fix license libgmp: Add license file hashes libmnl: Fix license and add license file hashes libmodbus3: Fix license and add license file hashes libnet: Add license information libnftnl: Fix license and add license file hash libpcap: Fix license and add license file hash libpopt: Add license file hash libxml2: Fix license and add license file hash lighttpd: Fix licenses and add more license file hashes lm_sensors: Add license file hashes log4cplus: Fix licenses and add license file hash mtd-utils: Add license file hash ncurses: Use 'COPYING' for license file hash net-snmp: Fix licenses and add license file hash nftables: Add license file hash opkg: Add license file hash readline: Add license file hash rt-tests: Fix licenses and add license file hash sudo: Fix licenses and add license file hash tree: Fix licenses and add license file hashes u-boot-tools: Fix licenses and add license file hashes rules/at.make| 5 - rules/at91bootstrap.make | 4 rules/boost.make | 1 + rules/busybox.make | 1 + rules/coreutils.make | 1 + rules/dropbear.make | 2 ++ rules/figlet.make| 8 +++- rules/flex.make | 3 ++- rules/json-c.make| 1 + rules/libarchive.make| 1 + rules/libfaketime.make | 1 + rules/libgmp.make| 7 ++- rules/libmnl.make| 3 ++- rules/libmodbus3.make| 5 - rules/libnet.make| 2 ++ rules/libnftnl.make | 3 ++- rules/libnl3.make| 4 +++- rules/libpcap.make | 3 ++- rules/libpopt.make | 1 + rules/libxml2.make | 4 +++- rules/lighttpd.make | 7 +-- rules/lm_sensors.make| 3 +++ rules/log4cplus.make | 3 ++- rules/mtd-utils.make | 2 ++ rules/ncurses.make | 3 +-- rules/net-snmp.make | 3 ++- rules/nftables.make | 1 + rules/opkg.make | 1 + rules/readline.make | 1 + rules/rt-tests.make | 3 ++- rules/sudo.make | 3 ++- rules/tree.make | 5 - rules/u-boot-tools.make | 5 - 33 files changed, 80 insertions(+), 20
[ptxdist] [PATCH 04/34] busybox: Add license file hash
Signed-off-by: Alexander Dahl --- rules/busybox.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/busybox.make b/rules/busybox.make index 05bd397c6..141c0734b 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -25,6 +25,7 @@ BUSYBOX_SOURCE:= $(SRCDIR)/$(BUSYBOX).$(BUSYBOX_SUFFIX) BUSYBOX_DIR:= $(BUILDDIR)/$(BUSYBOX) BUSYBOX_KCONFIG:= $(BUSYBOX_DIR)/Config.in BUSYBOX_LICENSE:= GPL-2.0-only +BUSYBOX_LICENSE_FILES := file://LICENSE;md5=de10de48642ab74318e893a61105afbb # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 07/34] figlet: Fix license and add license file hashes
Added information based on what the Debian project found out. https://metadata.ftp-master.debian.org/changelogs//main/f/figlet/figlet_2.2.5-2_copyright Signed-off-by: Alexander Dahl --- rules/figlet.make | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rules/figlet.make b/rules/figlet.make index b22d22e17..8886beab3 100644 --- a/rules/figlet.make +++ b/rules/figlet.make @@ -25,7 +25,13 @@ FIGLET_SUFFIX:= tar.gz FIGLET_URL := ftp://ftp.figlet.org/pub/figlet/program/unix/$(FIGLET).$(FIGLET_SUFFIX) FIGLET_SOURCE := $(SRCDIR)/$(FIGLET).$(FIGLET_SUFFIX) FIGLET_DIR := $(BUILDDIR)/$(FIGLET) -FIGLET_LICENSE := figlet +FIGLET_LICENSE := BSD-3-Clause AND MIT-CMU AND ISC AND Unicode-DFS-2016 AND WTFPL +FIGLET_LICENSE_FILES := \ + file://LICENSE;md5=1688bcd97b27704f1afcac7336409857 \ + file://inflate.c;startline=7;endline=27;md5=74ed6158b8244dbc4d91afaf8a39bec2 \ + file://utf8.c;startline=2;endline=16;md5=eb9cc57cf60ac24044670bf8dc475579 \ + file://fonts/8859-2.flc;startline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34 \ + file://tests/emboss.tlf;startline=3;endline=10;md5=8e317e9236ffade21fedc39e3496eac2 # # Compile -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 33/34] tree: Fix licenses and add license file hashes
Fixes: 91c5a41750b821cf2a5af537b1a0d93e0cf4ba59 Cc: Bernhard Walle Signed-off-by: Alexander Dahl --- rules/tree.make | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rules/tree.make b/rules/tree.make index d86293851..9e25602a2 100644 --- a/rules/tree.make +++ b/rules/tree.make @@ -23,7 +23,10 @@ TREE_SUFFIX := tgz TREE_URL := http://mama.indstate.edu/users/ice/tree/src/$(TREE).$(TREE_SUFFIX) TREE_SOURCE:= $(SRCDIR)/$(TREE).$(TREE_SUFFIX) TREE_DIR := $(BUILDDIR)/$(TREE) -TREE_LICENSE := GPL +TREE_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later +TREE_LICENSE_FILES := \ + file://LICENSE;md5=393a5ca445f6965873eca0259a17f833 \ + file://strverscmp.c;startline=1;endline=19;md5=f50ab9ef044f00fb22691ec5051c922d # # Compile -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 32/34] sudo: Fix licenses and add license file hash
Upstream distributes a fairly complete LICENSE document listing all applying licenses. Fixes: 8a4ca3129944e590408f375aa4855a7e7509d137 Cc: Andreas Pretzsch Signed-off-by: Alexander Dahl --- rules/sudo.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/sudo.make b/rules/sudo.make index 54d84ea54..232942482 100644 --- a/rules/sudo.make +++ b/rules/sudo.make @@ -26,7 +26,8 @@ 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 AND ISC +SUDO_LICENSE := ISC AND BSD-3-Clause AND BSD-2-Clause-NetBSD AND Zlib +SUDO_LICENSE_FILES := file://doc/LICENSE;md5=7765a3d787cb4fed3ccc3c9cee030af9 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 29/34] opkg: Add license file hash
Signed-off-by: Alexander Dahl --- rules/opkg.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/opkg.make b/rules/opkg.make index d9004d8b7..d2dda73cf 100644 --- a/rules/opkg.make +++ b/rules/opkg.make @@ -25,6 +25,7 @@ OPKG_URL := http://downloads.yoctoproject.org/releases/opkg/$(OPKG).$(OPKG_SUFFI OPKG_SOURCE:= $(SRCDIR)/$(OPKG).$(OPKG_SUFFIX) OPKG_DIR := $(BUILDDIR)/$(OPKG) OPKG_LICENSE := GPL-2.0-or-later +OPKG_LICENSE_FILES := file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 34/34] u-boot-tools: Fix licenses and add license file hashes
This package uses only a small part of U-Boot intended to run on Linux, for which only two licenses apply. Signed-off-by: Alexander Dahl --- rules/u-boot-tools.make | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make index b1b5515ca..a05b41d5f 100644 --- a/rules/u-boot-tools.make +++ b/rules/u-boot-tools.make @@ -23,7 +23,10 @@ U_BOOT_TOOLS_SUFFIX := tar.bz2 U_BOOT_TOOLS_URL := ftp://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX) U_BOOT_TOOLS_SOURCE:= $(SRCDIR)/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX) U_BOOT_TOOLS_DIR := $(BUILDDIR)/u-boot-tools-$(U_BOOT_TOOLS_VERSION) -U_BOOT_TOOLS_LICENSE := GPL-2.0-only +U_BOOT_TOOLS_LICENSE := GPL-2.0-or-later AND Zlib +U_BOOT_TOOLS_LICENSE_FILES := \ + file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://include/u-boot/zlib.h;startline=15;endline=43;md5=7c27ae0384929249664da410d539a1dc # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 31/34] rt-tests: Fix licenses and add license file hash
The file 'src/pi_tests/tst-mutexpi10.c' is LGPL-2.1-or-later. Signed-off-by: Alexander Dahl --- rules/rt-tests.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/rt-tests.make b/rules/rt-tests.make index f3c38fe3f..10c4769f7 100644 --- a/rules/rt-tests.make +++ b/rules/rt-tests.make @@ -21,7 +21,6 @@ PACKAGES-$(PTXCONF_RT_TESTS) += rt-tests # RT_TESTS_VERSION := 1.0 RT_TESTS_MD5 := 3818d2d0a3069291864bf85fde40883b -RT_TESTS_LICENSE := GPL-2.0-only AND GPL-2.0-or-later RT_TESTS := rt-tests-$(RT_TESTS_VERSION) RT_TESTS_SUFFIX:= tar.xz RT_TESTS_URL := \ @@ -29,6 +28,8 @@ RT_TESTS_URL := \ $(call ptx/mirror, KERNEL, utils/rt-tests/older/$(RT_TESTS).$(RT_TESTS_SUFFIX)) RT_TESTS_SOURCE:= $(SRCDIR)/$(RT_TESTS).$(RT_TESTS_SUFFIX) RT_TESTS_DIR := $(BUILDDIR)/$(RT_TESTS) +RT_TESTS_LICENSE := GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later +RT_TESTS_LICENSE_FILES := file://COPYING;md5=751419260aa954499f7abaabaa882bbe # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 22/34] lighttpd: Fix licenses and add more license file hashes
Most of lighttpd is BSD-3-Clause, except three files, which are OML or RSA-MD licensed. Found by reading Debian package copyright information and by inspecting file headers. Fixes: d9ee5ecd1fe89b4a1cc3a32b09388ab678d129af Cc: Andreas Pretzsch Signed-off-by: Alexander Dahl --- rules/lighttpd.make | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rules/lighttpd.make b/rules/lighttpd.make index 69fa69a22..1398431ea 100644 --- a/rules/lighttpd.make +++ b/rules/lighttpd.make @@ -24,8 +24,11 @@ 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-3-Clause -LIGHTTPD_LICENSE_FILES := file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579 +LIGHTTPD_LICENSE := BSD-3-Clause AND OML AND RSA-MD +LIGHTTPD_LICENSE_FILES := \ + file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579 \ + file://src/fastcgi.h;startline=7;endline=15;md5=fe9ffe753772839aace9c90e814bc356 \ + file://src/md5.c;startline=6;endline=26;md5=b5be3b6afd4afa7bb89b16361244f9b6 # # Prepare -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] license-yaml2csv.py fails on Debian 9 (stretch)
Hello, I tried to run license-yaml2csv.py today, just out of curiosity, but it does not work: adahl@ada /mnt/data/adahl/src/DistroKit (git)-[master] % /usr/local/lib/ ptxdist-$(p version)/scripts/license-yaml2csv.py platform-v7a/report/misc/ openssl/license-report.yaml Traceback (most recent call last): File "/usr/local/lib/ptxdist-2019.05.0/scripts/license-yaml2csv.py", line 56, in value = record.get(field, None) AttributeError: 'str' object has no attribute 'get' As you can see, I'm using the current DistroKit master with ptxdist 2019.05.0. The host system is Debian 9 (stretch) on amd64, nothing special. I'm no Python expert, so I essentially don't at all know what problem could be? Python3 is installed through apt, including the necessary modules. Any ideas? Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] m4: make it build with ICECC again
Hei hei, I brought this up on IRC yesterday, I just tried to compile DistroKit master on Debian 10 (buster) on an amd64 host, with some Debian 9 (stretch) icecc nodes on the local net. On Fri, Apr 26, 2019 at 08:42:53PM +0200, Roland Hieber wrote: > On Fri, Apr 26, 2019 at 07:49:44PM +0200, Roland Hieber wrote: > > Signed-off-by: Roland Hieber > > --- > > ...nt-warnings-when-building-with-ICECC.patch | 39 +++ > > patches/m4-1.4.18/series | 3 +- > > 2 files changed, 41 insertions(+), 1 deletion(-) > > create mode 100644 > > patches/m4-1.4.18/0002-HACK-prevent-warnings-when-building-with-ICECC.patch > > > > diff --git > > a/patches/m4-1.4.18/0002-HACK-prevent-warnings-when-building-with-ICECC.patch > > > > b/patches/m4-1.4.18/0002-HACK-prevent-warnings-when-building-with-ICECC.patch > > new file mode 100644 > > index 0..979106910 > > --- /dev/null > > +++ > > b/patches/m4-1.4.18/0002-HACK-prevent-warnings-when-building-with-ICECC.patch > > @@ -0,0 +1,39 @@ > > +From: Roland Hieber > > +Date: Fri, 26 Apr 2019 19:11:19 +0200 > > +Subject: [PATCH] HACK: prevent warnings when building with ICECC > > + > > +If ICECC is enabled, -fdirectives-only is apparently always used, which > > +leads to errors like > > + > > +verify.h:161:31: error: __COUNTER__ expanded inside directive with > > -fdirectives-only > > Strange, I see the same issue with glib too, and libtasn1, and > host-gettext, and gdbserver. All of them seem to have forked the same > verify.h... :) But I don't think patching all of them is the right way > to approach this. I only saw the issue with host-m4. > Debian testing/unstable, ptxdist master, ICECC 1.2.0, host-gcc 8.2.0, > but I also saw this with an old host-gcc 5.4.0, so I guess it's > independent of the host compiler version. Could the difference be in the icecc version on the host? Debian 9 has ICECC 1.0.1 and does not fail. Debian 10 has ICECC 1.2.0 and fails. Greets Alex -- /"\ ASCII RIBBON | »With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.« / \ HTML MAIL| (Jean-Luc Picard, quoting Judge Aaron Satie) signature.asc Description: PGP signature ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] jq: version bump 1.5 -> 1.6
* New release 1.6 fixes security issues and bugs.
* Dropped patch was a backport from post 1.5 upstream, included in 1.6.
* Changes in COPYING were whitespace and http to https in an URL.
Signed-off-by: Alexander Dahl
---
.../jq-1.5/0001-Support-without-oniguruma.patch| 60 --
patches/jq-1.5/autogen.sh | 1 -
patches/jq-1.5/series | 4 --
rules/jq.make | 6 +--
4 files changed, 3 insertions(+), 68 deletions(-)
delete mode 100644 patches/jq-1.5/0001-Support-without-oniguruma.patch
delete mode 12 patches/jq-1.5/autogen.sh
delete mode 100644 patches/jq-1.5/series
diff --git a/patches/jq-1.5/0001-Support-without-oniguruma.patch
b/patches/jq-1.5/0001-Support-without-oniguruma.patch
deleted file mode 100644
index 7e85d1b40..0
--- a/patches/jq-1.5/0001-Support-without-oniguruma.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: David Tolnay
-Date: Sat, 21 Nov 2015 10:05:37 -0800
-Subject: [PATCH] Support --without-oniguruma
-
- configure.ac | 41 -
- 1 file changed, 20 insertions(+), 21 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4bb436ee34d6..f802ecfca45b 100644
a/configure.ac
-+++ b/configure.ac
-@@ -52,27 +52,26 @@ fi
- AC_ARG_WITH([oniguruma],
- [AS_HELP_STRING([--with-oniguruma=prefix],
- [try this for a non-standard install prefix of the oniguruma
library])],
--[ONIGURUMAPATHSET=1],
--[ONIGURUMAPATHSET=0])
--
--if test $ONIGURUMAPATHSET = 1; then
-- CFLAGS="$CFLAGS -I${with_oniguruma}/include"
-- LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib"
--fi
--
--# check for ONIGURUMA library
--HAVE_ONIGURUMA=0
--AC_CHECK_HEADER("oniguruma.h",
--AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig";
HAVE_ONIGURUMA=1;]))
--
--# handle check results
--if test $HAVE_ONIGURUMA != 1; then
--AC_MSG_NOTICE([Oniguruma was not found.])
--AC_MSG_NOTICE([ Try setting the location using '--with-oniguruma=PREFIX'
])
--else
--AC_DEFINE([HAVE_ONIGURUMA],1,[Define to 1 if Oniguruma is installed])
--fi
--
-+[],
-+[with_oniguruma=yes])
-+
-+AS_IF([test "x$with_oniguruma" != xno], [
-+AS_IF([test "x$with_oniguruma" != xyes], [
-+CFLAGS="$CFLAGS -I${with_oniguruma}/include"
-+LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib"
-+])
-+# check for ONIGURUMA library
-+have_oniguruma=0
-+AC_CHECK_HEADER("oniguruma.h",
-+AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig";
have_oniguruma=1;]))
-+# handle check results
-+AS_IF([test $have_oniguruma = 1], [
-+AC_DEFINE([HAVE_ONIGURUMA], 1, [Define to 1 if Oniguruma is
installed])
-+], [
-+AC_MSG_NOTICE([Oniguruma was not found.])
-+AC_MSG_NOTICE([Try setting the location using
'--with-oniguruma=PREFIX'])
-+])
-+])
-
- dnl Check for valgrind
- AC_CHECK_PROGS(valgrind_cmd, valgrind)
diff --git a/patches/jq-1.5/autogen.sh b/patches/jq-1.5/autogen.sh
deleted file mode 12
index 9f8a4cb7d..0
--- a/patches/jq-1.5/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/jq-1.5/series b/patches/jq-1.5/series
deleted file mode 100644
index e9b5518ab..0
--- a/patches/jq-1.5/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Support-without-oniguruma.patch
-# b1ba38754fe362c3d5862f8f541586c8 - git-ptx-patches magic
diff --git a/rules/jq.make b/rules/jq.make
index 9f0f87511..36753b53c 100644
--- a/rules/jq.make
+++ b/rules/jq.make
@@ -16,15 +16,15 @@ PACKAGES-$(PTXCONF_JQ) += jq
#
# Paths and names
#
-JQ_VERSION := 1.5
-JQ_MD5 := 0933532b086bd8b6a41c1b162b1731f9
+JQ_VERSION := 1.6
+JQ_MD5 := e68fbd6a992e36f1ac48c99bbf825d6b
JQ := jq-$(JQ_VERSION)
JQ_SUFFIX := tar.gz
JQ_URL :=
https://github.com/stedolan/jq/releases/download/$(JQ)/$(JQ).$(JQ_SUFFIX)
JQ_SOURCE := $(SRCDIR)/$(JQ).$(JQ_SUFFIX)
JQ_DIR := $(BUILDDIR)/$(JQ)
JQ_LICENSE := MIT AND CC-BY-3.0
-JQ_LICENSE_FILES := file://COPYING;md5=29dd0c35d7e391bb8d515eacf7592e00
+JQ_LICENSE_FILES := file://COPYING;md5=15d03e360fa7399f76d5a4359fc72cbf
#
# Prepare
--
2.11.0
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v4 3/3] gpsd: version bump 2.39 -> 3.18.1
Hello Denis,
could you please give an update on the state of this patch? We are currently
experimenting with gpsd and could help you testing.
One thing I noticed, when just adding 'select HOST_PYTHON_SCONS' to an
otherwise clean package, it seems some dependency to host python is not set:
This is from a ptxdist 2018.09.0 based BSP, where I just copied rules/host-
python-scons.{in,make} to:
-
target: host-python-scons.compile
-
environment: line 2: /home/adahl/Work/bsp/***/platform-v7a/sysroot-host/bin/
python2.7: No such file or directory
/usr/local/lib/ptxdist-2018.09.0/rules/post/ptxd_make_world_compile.make:21:
recipe for target '/home/adahl/Work/bsp/***/platform-v7a/state/host-python-
scons.compile' failed
Greets
Alex
Am Dienstag, 5. Februar 2019, 09:46:37 CEST schrieb Denis OSTERLAND:
> Hi Michael,
>
> thanks for your input.
>
> Am Dienstag, den 05.02.2019, 10:07 +0100 schrieb Michael Olbrich:
>
> > On Mon, Jan 21, 2019 at 12:01:21PM +, Denis OSTERLAND wrote:
> >
> > >
> > >
> > > +
> > > GPSD_ENV = \
> > > $(CROSS_ENV) \
> > > PYTHON=$(CROSS_PYTHON)
> >
> > You need to add PATH=$(CROSS_PATH) to the env. Otherwise pkg-config does
> > not work correctly.
>
> okay. I was pretty sure that the defines for pkg-config were part of
> CROSS_ENV.
>
> >
> > Also, the python here is not picked up correctly. You need to set
> > target_python and python_libdir below to properly install the python
> > files.
> I will try it.
>
>
> >
> > And targetinstall fails because /usr/bin/gpsflash is not found. I think
> > this war removed upstream.
>
> So let´s remove it, too. ;-)
>
>
> >
> > Michael
>
>
> Regards Denis
>
>
> Diehl Connectivity Solutions GmbH
> Geschäftsführung: Horst Leonberger
> Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht
> Nürnberg: HRB 32315
>
> ___
> Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail
> enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
> Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise
> erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede
> unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung
> und/oder Publikation dieser E-Mail ist strengstens untersagt. The contents
> of the above mentioned e-mail is not legally binding. This e-mail contains
> confidential and/or legally protected information. Please inform us if you
> have received this e-mail by mistake and delete it in such a case. Each
> unauthorized reproduction, disclosure, alteration, distribution and/or
> publication of this e-mail is strictly prohibited.
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] tz: version bump 2018i -> 2019b
Signed-off-by: Alexander Dahl --- rules/host-tz-database.make | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make index 61d16a72c..1b1906098 100644 --- a/rules/host-tz-database.make +++ b/rules/host-tz-database.make @@ -20,8 +20,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_TZ_DATABASE) += host-tz-database HOST_TZ_DATABASE := tz-database HOST_TZ_DATABASE_DIR := $(HOST_BUILDDIR)/$(HOST_TZ_DATABASE) -TZCODE_VERSION := 2018i -TZCODE_MD5 := 6a6d98be8fa2fa3485e25343e79188b4 +TZCODE_VERSION := 2019b +TZCODE_MD5 := 91e0978d947496fd6aaf46d351f9c41d TZCODE := tzcode$(TZCODE_VERSION) TZCODE_SUFFIX := tar.gz TZCODE_URL := \ @@ -31,8 +31,8 @@ $(TZCODE_SOURCE) := TZCODE TZCODE_DIR := $(HOST_TZ_DATABASE_DIR) TZCODE_STRIP_LEVEL := 0 -TZDATA_VERSION := 2018i -TZDATA_MD5 := b3f0a1a789480a036e58466cd0702477 +TZDATA_VERSION := 2019b +TZDATA_MD5 := b26b5d7d844cb96c73ed2fb6d588daaf TZDATA := tzdata$(TZDATA_VERSION) TZDATA_SUFFIX := tar.gz TZDATA_URL := \ -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] gpsd: Version bump to 3.17
Hello, fyi, there were some patch sets sent to this list in January updating gpsd to 3.18.1 already. Those did not get merged though: v3: https://www.mail-archive.com/ptxdist@pengutronix.de/msg13944.html v4: https://www.mail-archive.com/ptxdist@pengutronix.de/msg13985.html Greets Alex Am Donnerstag, 15. August 2019, 14:56:19 CEST schrieb Sascha Hauer: > From: Fabian Godehardt > > This updates gpsd from 2.39 to 3.17. The build system has changed from > autotools to scons in the meantime, so there are quite some changes > necessary. > > Signed-off-by: Fabian Godehardt > Signed-off-by: Sascha Hauer > --- > rules/gpsd.in | 30 > rules/gpsd.make | 120 > 2 files changed, 90 insertions(+), 60 deletions(-) > > diff --git a/rules/gpsd.in b/rules/gpsd.in > index ff270cff5..7a86967c4 100644 > --- a/rules/gpsd.in > +++ b/rules/gpsd.in > @@ -1,13 +1,14 @@ > ## SECTION=system_libraries > menuconfig GPSD > tristate > + select HOST_PYTHON_SCONS > select LIBC_M > select LIBC_NSL > select LIBC_PTHREAD > select GCCLIBS_CXX > select GCCLIBS_GCC_S > - select NCURSES if GPSD_CGPS > - select NCURSES if GPSD_GPSMON > + select NCURSES if GPSD_NCURSES > + select LIBUSB if GPSD_USB > select DBUS_GLIBif GPSD_DBUS > select PYTHON if GPSD_PYTHON > prompt "gpsd " > @@ -21,6 +22,19 @@ menuconfig GPSD > > if GPSD > > +config GPSD_NCURSES > + bool > + prompt "Enable tools using ncurses" > + help > + Some tools use ncurses as interface. Enable this to get > + able to build them. > + > +config GPSD_USB > + bool > + prompt "Enable USB support" > + help > + Enable this to ineract with devices using USB interface. > + > config GPSD_PYTHON > bool > prompt "python bindings" > @@ -68,6 +82,10 @@ config GPSD_MAX_DEVICES > > menu "drivers" > > + config GPSD_DRIVER_BLUEZ > + bool > + prompt "bluez" > + > config GPSD_DRIVER_NMEA > bool > prompt "nmea" > @@ -208,14 +226,6 @@ menu "install options" > received sentences to stdout. This makes the program > useful as a pipe from gpsd to another program or file. > > - config GPSD_GPSFLASH > - bool > - prompt "gpsflash" > - help > - This program is a firmware loader for GPS receivers > - connected via serial or USB port. Presently it supports > - only SiRF GPSes. > - > config GPSD_GPXLOGGER > bool > prompt "gpxlogger" > diff --git a/rules/gpsd.make b/rules/gpsd.make > index cec308af9..bd664c4dd 100644 > --- a/rules/gpsd.make > +++ b/rules/gpsd.make > @@ -2,6 +2,9 @@ > # > # Copyright (C) 2008 by J.Kilb > # 2009 by Marc Kleine-Budde > +# 2019 by Fabian Godehardt > +# > +# 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. > @@ -15,11 +18,11 @@ PACKAGES-$(PTXCONF_GPSD) += gpsd > # > # Paths and names > # > -GPSD_VERSION := 2.39 > -GPSD_MD5 := 3db437196a6840c252fca99b6c19d4d0 > +GPSD_VERSION := 3.17 > +GPSD_MD5 := e0cfadcf4a65dfbdd2afb11c58f4e4a1 > GPSD := gpsd-$(GPSD_VERSION) > GPSD_SUFFIX := tar.gz > -GPSD_URL := $(call ptx/mirror, SF, gpsd.berlios/$(GPSD).$(GPSD_SUFFIX)) > +GPSD_URL := > http://download-mirror.savannah.gnu.org/releases/gpsd/$(GPSD).$(GPSD_SUFFIX > ) GPSD_SOURCE := $(SRCDIR)/$(GPSD).$(GPSD_SUFFIX) > GPSD_DIR := $(BUILDDIR)/$(GPSD) > > @@ -27,58 +30,78 @@ GPSD_DIR := $(BUILDDIR)/$(GPSD) > # Prepare > # > --- > - > > -GPSD_ENV = \ > - $(CROSS_ENV) \ > - PYTHON=$(CROSS_PYTHON) > +GPSD_CONF_TOOL := NO > > -# > -# autoconf > -# > -GPSD_AUTOCONF := \ > - $(CROSS_AUTOCONF_USR) \ > - --without-x \ > - --$(call ptx/endis, PTXCONF_GPSD_PYTHON)-python \ > - --$(call ptx/endis, PTXCONF_GPSD_PROFILING)-profiling \ > - --$(call ptx/endis, PTXCONF_GPSD_NTPSHM)-ntpshm \ > - --$(call ptx/endis, PTXCONF_GPSD_PPS)-pps \ > - --$(call ptx/endis, PTXCONF_GPSD_PPS_ON_CTS)-pps-on-cts \ > - --$(call ptx/endis, PTXCONF_GPSD_DBUS)-dbus \ > - --$(call ptx/endis, PTXCONF_GPSD_DRIVER_NMEA)-nmea \ > - --$(call ptx/endis, PTXCONF_GPSD_DRIVER_SIRF)-sirf \ > - --$(call ptx/endis, PTXCONF_GPSD_DRIVER_TSIP)-tsip \ > - --$(call ptx/endis, PTXCONF_GPSD_DRIVER_FV18)-fv18 \ > - --$(call ptx/endis, PTXCONF_GPSD_DRIVER_TRIPMATE)-tripmate \ > - --$(call ptx/endis, PTXCONF_GPSD_DRIVER_EARTHMATE)-earthmate \ > - --$(call ptx/endis, PTXCONF_GPSD_DRIVER_ITRAX)-itrax \ > - --$(call ptx/endis,
[ptxdist] kernel compile fail with icecc, IKCONFIG set, and kernel v5.0 or later
Hei hei,
while upgrading different BSPs to kernel v5.2.x I came accross a special build
error. Affected is the kernel.compile stage. This happens with different
ptxdist versions (tested with 2018.05.0, 2019.01.0, 2019.07.0, 2019.08.0) and
at least with kernel v5.1 and v5.2 (IIRC kernels at least up to v4.19 were not
affected) and CONFIG_IKCONFIG and CONFIG_IKCONFIG_PROC set (as in DistroKit
master).
We use icecc here, my host system is still Debian GNU/Linux 9 (stretch) with
icecc version 1.0.1. If one of those three things is not present, this build
error does not occur: kernel, icecc, that config option. I could reproduce
this with a recent DistroKit BSP and kernels v5.1 and v5.2. Like this:
* checkout recent distrokit
* select platform v7a
* activate icecc (ptxdist setup)
* `ptxdist compile kernel`
At least the first build run fails, later runs might succeed at random. Output
is like this:
--
target: kernel.compile
--
make[1]: Entering directory '/home/adahl/Work/bsp/isNet_Lite_phoenix-contact/
platform-pc/build-target/linux-5.2.9'
CALLscripts/checksyscalls.sh
CALLscripts/atomic/check-atomics.sh
CHK include/generated/compile.h
CC kernel/configs.o
{standard input}: Assembler messages:
{standard input}:136: Error: file not found: kernel/config_data.gz
ICECC[21465] 16:13:52: Compiled on 192.168.10.72
scripts/Makefile.build:278: recipe for target 'kernel/configs.o' failed
make[2]: *** [kernel/configs.o] Error 1
Makefile:1073: recipe for target 'kernel' failed
make[1]: *** [kernel] Error 2
Or this (with `ptxdist -q go`):
{standard input}: Assembler messages:
{standard input}:136: Error: file not found: kernel/config_data.gz
ICECC[27588] 16:19:30: Compiled on 192.168.10.70
make[2]: *** [kernel/configs.o] Error 1
make[2]: *** Waiting for unfinished jobs
make[1]: *** [kernel] Error 2
make[1]: *** Waiting for unfinished jobs
make: *** [/home/adahl/Work/bsp/isNet_Lite_phoenix-contact/platform-pc/state/
kernel.compile] Error 2
make: *** Waiting for unfinished jobs
The remote build node which fails is not always the same. To build this kernel
make target 'gzip' is needed, which according to my colleague is installed on
those build nodes failing.
Build succeeds if I turn off icecc _or_ deactivate that kernel config option
_or_ go back to v4.19. Currently I'm opting for second, but I'm not amused.
Any help and hints appreciated!
Greets
Alex
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] treewide: remove all leftover references to "u-boot-v2"
Hei hei,
does this affect U-Boot itself?
Greets
Alex
Am Dienstag, 20. August 2019, 16:21:57 CEST schrieb Roland Hieber:
> Fixes: 8def36f40f44f2cdb83c ("u-boot-v2: remove in favor of barebox")
> Signed-off-by: Roland Hieber
> ---
> bin/ptxdist| 15 +--
> rules/other/Namespace.make | 1 -
> tests/make_uboot_v2_env| 29 -
> 3 files changed, 1 insertion(+), 44 deletions(-)
> delete mode 100755 tests/make_uboot_v2_env
>
> diff --git a/bin/ptxdist b/bin/ptxdist
> index 343d80a7052e..d4e51a7ef15b 100755
> --- a/bin/ptxdist
> +++ b/bin/ptxdist
> @@ -53,11 +53,6 @@ menu() {
> menu=( "${menu[@]}" "kernel""Configure
> Kernel (${kernel_version})"
)
> fi
>
> - local u_boot_v2_version="$(ptxd_get_ptxconf PTXCONF_U_BOOT_V2_VERSION)"
> - if [ -n "${u_boot_v2_version}" ]; then
> - menu=( "${menu[@]}" "u-boot-v2" "Configure
> U-Boot-v2
> (${u_boot_v2_version})" ) - fi
> -
> local barebox_version="$(ptxd_get_ptxconf PTXCONF_BAREBOX_VERSION)"
> if [ -n "${barebox_version}" ]; then
> menu=( "${menu[@]}" "barebox" "Configure
> barebox ($
{barebox_version})" )
> @@ -113,7 +108,7 @@ menu() {
> menu_select "${cmd}"
> ;;
>
> - ptx|platform|kernel|u-boot-v2|barebox|board|user)
> + ptx|platform|kernel|barebox|board|user)
> do_config menuconfig "${cmd}"
> # FIXME: reread user config file
> ;;
> @@ -917,9 +912,6 @@ Setup and Project Actions:
>
>menuconfig barebox configure the bootloader Barebox
>
> - menuconfig u-boot-v2
> - u_boot_config configure U-Boot V2
> -
>oldconfig run 'make oldconfig' on ptxconfig file
>allmodconfig run 'make allmodconfig' on ptxconfig
> file
>allyesconfig run 'make allyesconfig' on ptxconfig
> file
> @@ -1848,11 +1840,6 @@ parse_second()
> exit
> ;;
>
> - u_boot_config)
> - do_config menuconfig u-boot-v2
> - exit
> - ;;
> -
> boardsetup)
> check_config &&
> do_config menuconfig board
> diff --git a/rules/other/Namespace.make b/rules/other/Namespace.make
> index f15800d005fd..9b2187582aca 100644
> --- a/rules/other/Namespace.make
> +++ b/rules/other/Namespace.make
> @@ -24,7 +24,6 @@ HOSTCXX := g++
>
> PTXCONF_ARCH_STRING := $(call remove_quotes, $(PTXCONF_ARCH_STRING))
> PTXCONF_KERNEL_ARCH_STRING := $(call remove_quotes,
> $(PTXCONF_KERNEL_ARCH_STRING)) -PTXCONF_U_BOOT_V2_ARCH_STRING := $(call
> remove_quotes, $(PTXCONF_U_BOOT_V2_ARCH_STRING))
> PTXCONF_BAREBOX_ARCH_STRING := $(call remove_quotes,
> $(PTXCONF_BAREBOX_ARCH_STRING))
>
> PTXCONF_TARGET_EXTRA_CFLAGS := $(call remove_quotes,
> $(PTXCONF_TARGET_EXTRA_CFLAGS)) diff --git a/tests/make_uboot_v2_env
> b/tests/make_uboot_v2_env
> deleted file mode 100755
> index 93d55c30e851..
> --- a/tests/make_uboot_v2_env
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -#!/bin/bash
> -
> -set -e
> -PTXDIST_SETENV_U_BOOT_V2_ENV="${1}"
> -ENVTMPDIR="$(mktemp -d "${PTXDIST_TEMPDIR}/uboot_v2_env.XX")"
> -
> -# IMAGEDIR is not set if we are called from "ptxdist test" directly
> -# since it comes from kwraper.
> -[ -z "${IMAGEDIR}" ] && export IMAGEDIR=${PTXDIST_PLATFORMDIR}/images
> -
> -if [ ! -r ${PTXDIST_PLATFORMCONFIGDIR}/u-boot-env/config ]; then
> - echo "ERROR: missing valid
> ${PTXDIST_PLATFORMCONFIGDIR}/u-boot-env/config"
> >&2 - exit 1
> -fi
> -
> -tar -C "${PTXDIST_PLATFORMCONFIGDIR}/u-boot-env/" -c . \
> - --exclude .svn \
> - --exclude .pc \
> - --exclude .git \
> - --exclude "config.in" \
> - --exclude "*/*~" \
> - | tar -C "${ENVTMPDIR}" -x
> -
> -ubootenv -s "${ENVTMPDIR}" "${IMAGEDIR}/u-boot-v2-environment"
> -
> -# only copy the image if we are called by "ptxdist test setenv"
> -[ -n "${PTXDIST_SETENV_U_BOOT_V2_ENV}" ] && cp
> "${IMAGEDIR}/u-boot-v2-environment" "${PTXDIST_SETENV_U_BOOT_V2_ENV}" -
> -rm -rf "${ENVTMPDIR}"
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] treewide: remove all leftover references to "u-boot-v2"
Hello Roland, Am Dienstag, 20. August 2019, 17:34:06 CEST schrieb Roland Hieber: > At least as far as I can see, ptxdist never supported a "ptxdist > menuconfig u-boot" for u-boot packages (yes, the "ptxdist u_boot_config" > option could have been named better…). It does for a while now, see ptxdist-2019.01.0-40-g44e565de9 … ;-) > Does u-boot have a menuconfig > meanwhile? I only know that it didn't have that in the past. U-Boot started migrating their config to kconfig like 5 years ago? New config options are only allowed to be introduced as kconfig options nowadays. More and more options are converted with each U-Boot release every three months. We use u-boot on two different BSPs for at least three different boards. I'd like to keep support for that in ptxdist. O:-) Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [RFC PATCH] doc: Add section on creating new layers
After discussing these topics in IRC, it seemed reasonable to add some explanation on how to create a new layer from scratch. Signed-off-by: Alexander Dahl --- doc/dev_manual.rst | 31 +++ 1 file changed, 31 insertions(+) diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst index d79ebdba7..746f3d695 100644 --- a/doc/dev_manual.rst +++ b/doc/dev_manual.rst @@ -1631,6 +1631,8 @@ convenient way to crate simple templates. It is also possible to create more files. For examples, the builtin ``genimage`` template creates a extra config file for the new package. +.. _layers: + Layers in PTXdist - @@ -1740,3 +1742,32 @@ layer. The make macros that provide these features are currently used by the barebox and kernel packages and templates. + +Creating a new Layer + + +Adding new layers on top of an already existing BSP is easy: + +#. Create an empty folder, e.g. next to the existing BSP. +#. The lower layer is just a folder named ``base`` (see layers_ above). You + may do one of the following (or something else you consider convenient): + + - Create a symbolic link ``base`` to an outside laying BSP folder. For + an easy start, you can try this method with DistroKit_ for example: + ``$ ln -s ../DistroKit base`` + - Use a Git submodule with a BSP in a folder ``base``. + - Copy over your whole existing BSP to a new subfolder ``base``. + +#. If needed select **ptxconfig** and/or **platformconfig** after copying + that file from the lower layer to your new layer: + +.. code-block:: text + + $ mkdir -p configs/platform-v7a + $ cp base/configs/platform-v7a/platformconfig configs/platform-v7a/ + $ ptxdist platform configs/platform-v7a/platformconfig + +#. Use ``ptxdist menu`` like usual. +#. Put your new layer into Git and add configs and delta configs to it. + +.. _DistroKit: https://www.pengutronix.de/de/software/distrokit.html -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC PATCH] doc: Add section on creating new layers
Hello Roland, Am Dienstag, 3. September 2019, 14:00:17 CEST schrieb Roland Hieber: > On Tue, Sep 03, 2019 at 01:50:25PM +0200, Alexander Dahl wrote: > > After discussing these topics in IRC, it seemed reasonable to add some > > explanation on how to create a new layer from scratch. > > \o/ someone else did a task on my overlong todo list :D Yes, and I just saw you already wrote a piece on that topic, but on your website, not in ptxdist documentation: https://pengutronix.de/en/blog/2019-06-18-DistroKitLayer.html o.O > > + > > +Creating a new Layer > > + > > + > > +Adding new layers on top of an already existing BSP is easy: > > + > > +#. Create an empty folder, e.g. next to the existing BSP. > > +#. The lower layer is just a folder named ``base`` (see layers_ above). > > You + may do one of the following (or something else you consider > > convenient): + > > + - Create a symbolic link ``base`` to an outside laying BSP folder. For > > + an easy start, you can try this method with DistroKit_ for example: > > + ``$ ln -s ../DistroKit base`` > > We have done that too sometimes in the past, but if the config files in > the base layer are not in the right versions, the MD5 sum in the config > diffs in the inherited layer will not match. I think this should be > mentioned here. Sorry, I do not understand. :-/ > > + - Use a Git submodule with a BSP in a folder ``base``. > > + - Copy over your whole existing BSP to a new subfolder ``base``. > > Subtree merges are another possibility, although I've never done one. Same here. > > + > > +#. If needed select **ptxconfig** and/or **platformconfig** after copying > > + that file from the lower layer to your new layer: > > + > > +.. code-block:: text > > + > > + $ mkdir -p configs/platform-v7a > > + $ cp base/configs/platform-v7a/platformconfig configs/platform-v7a/ > > + $ ptxdist platform configs/platform-v7a/platformconfig > > I think you should be able to select the config from base/ directly > without copying them? mol? I did not try that. What is possible to select would be indeed an interesting piece in the docs! That question came up multiple times in IRC in the last days. ;-) > > + > > +#. Use ``ptxdist menu`` like usual. > > menuconfig? platformconfig? You reach both from `p menu` … but I don't mind changing this. > > +#. Put your new layer into Git and add configs and delta configs to it. > > nit: s/Git/SCM/, or something like that Yes. So you already wrote on that topic. I wouldn't mind if you take my patch as base for your own additions. O:-) Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC PATCH] doc: Add section on creating new layers
Hei hei, Am Dienstag, 3. September 2019, 15:08:08 CEST schrieb Michael Olbrich: > On Tue, Sep 03, 2019 at 02:22:04PM +0200, Alexander Dahl wrote: > > Am Dienstag, 3. September 2019, 14:00:17 CEST schrieb Roland Hieber: > > > On Tue, Sep 03, 2019 at 01:50:25PM +0200, Alexander Dahl wrote: > > > > + > > > > +#. If needed select **ptxconfig** and/or **platformconfig** after > > > > copying > > > > + that file from the lower layer to your new layer: > > > > + > > > > +.. code-block:: text > > > > + > > > > + $ mkdir -p configs/platform-v7a > > > > + $ cp base/configs/platform-v7a/platformconfig > > > > configs/platform-v7a/ > > > > + $ ptxdist platform configs/platform-v7a/platformconfig > > > > > > I think you should be able to select the config from base/ directly > > > without copying them? mol? > > > > I did not try that. What is possible to select would be indeed an > > interesting piece in the docs! That question came up multiple times in > > IRC in the last days. ;-) > > If there is just on platform, then ptxdist will just use that on if no > selected_platformconfig exists. This is especially useful with layers, > because it will then just pick the config from the first layer that has > one. So this is not different to ptxdist behaviour without layers. Maybe DistroKit is no good example, because it contains more than one platform and you must select one to get going? > This means, that you can start with just the base link. Then change > something with 'ptxdist platformconfig'. PTXdist will create the > platformconfig in your new layer and use it automatically. > > The same works for the ptxconfig as well. > > Note: ptxdist will delete the config if it is identical to the layer below. I think this is very convenient. This makes creating a new layer even easier, at least for BSPs with exactly one ptxconfig and exactly one platformconfig. > It does not touch the selected_* links you might need to change those if it > happens. So the question remains. If there is more than one platform or config, where should it be selected best and how? Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC PATCH] doc: Add section on creating new layers
Hello Michael, I tried a little more: mkdir DistroKit-rpi1 cd DistroKit-rpi1 ln -s ../DistroKit base The new layer is almost empty so far, see below. On Tue, Sep 03, 2019 at 04:22:55PM +0200, Michael Olbrich wrote: > On Tue, Sep 03, 2019 at 03:48:17PM +0200, Alexander Dahl wrote: > > Am Dienstag, 3. September 2019, 15:08:08 CEST schrieb Michael Olbrich: > > > If there is just on platform, then ptxdist will just use that on if no > > > selected_platformconfig exists. This is especially useful with layers, > > > because it will then just pick the config from the first layer that has > > > one. > > > > So this is not different to ptxdist behaviour without layers. Maybe > > DistroKit > > is no good example, because it contains more than one platform and you must > > select one to get going? > > Correct. You need to select one (or run ptxdist with --platformconfig=...). > Once ptxdist has crated a platformconfig for the new layer, you need to > select that one. PTXdist will complain if you forget this step. Indeed! Because there was no platformconfig in my new layer, I selected the platformconfig from the base layer: ptxdist platform base/configs/platform-rpi/platformconfig > > > It does not touch the selected_* links you might need to change those if > > > it > > > happens. > > > > So the question remains. If there is more than one platform or config, > > where > > should it be selected best and how? > > Only selections in the current layer are used. Anything else is ignored. > And PTXdist enforces that the selected config is from the top layer (if the > config exists there) or the next layer that contains it. "Enforces" does not mean it changes the platfrom selection by itself automatically, but just checks and bails out in case. For example, after selecting the platformconfig in the base layer before, I changed something in the platformconfig, which leads to ptxdist creating a platformconfig file in my new layer. Now ptxdist stops like this: alex@lemmy ~/src/DistroKit-rpi1 % p -q -j6 go ptxdist: error: The selected config file: ptxdist: error: DistroKit-rpi1/base/configs/platform-rpi/platformconfig ptxdist: error: is overwritten by: ptxdist: error: DistroKit-rpi1/configs/platform-rpi/platformconfig ptxdist: error: The config file in the outer layer must be used! error: error during generation of dependencies ptxdist: error: error in dgen The error message is clear, I have to select the platform in my upper layer now. Okay, did that. Now I changed something in my platformconfig to make it equal to the platformconfig of the lower layer again. This leads to ptxdist removing the platformconfig from the upper layer (just keeping platformconfig.old), I have a symlink 'selected_platform' to a non existent file and ptxdist bails out like this: alex@lemmy ~/src/DistroKit-rpi1 % p -q -j6 go error: 'selected_platformconfig' is missing try 'ptxdist platform ' All in all, one has to take care a little and reset the selected platform if ptxdist complains, but ptxdist either seems to build or print what's wrong, so it's not that hard to find out, which platform to select. I'll see what I can do with that information, to improve the documentation or the patch, if nobody else wants to jump in. Greets Alex -- /"\ ASCII RIBBON | »With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.« / \ HTML MAIL| (Jean-Luc Picard, quoting Judge Aaron Satie) signature.asc Description: PGP signature ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] mmc-utils: use https:// URL instead of git://
Hello, On Thu, Aug 22, 2019 at 10:35:16PM +0200, Uwe Kleine-König wrote: > In contrast to git:// https:// is usually not blocked in corporate > firewalls and provides some anonymity. If this URL does not start with git:// is it still recognized as git repo url to be cloned from by ptxdist? Greets Alex -- /"\ ASCII RIBBON | »With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.« / \ HTML MAIL| (Jean-Luc Picard, quoting Judge Aaron Satie) signature.asc Description: PGP signature ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC 3/4] libptxdist: add a function to find unreferenced source directories
Hei hei,
Am Freitag, 23. August 2019, 10:33:42 CEST schrieb Roland Hieber:
> On Thu, Aug 22, 2019 at 05:38:19PM +0200, Michael Olbrich wrote:
> > On Thu, Aug 22, 2019 at 12:42:40PM +0200, Roland Hieber wrote:
> > > +
> > > + # get list of dirs for which no package exists
> > > + comm --nocheck-order -13 ${pkgslistfile} ${patchdirfile} | while
read
> > > dir; do + ptxd_in_path PTXDIST_PATH_PATCHES ${dir}
> > > + ptxd_print_path ${ptxd_reply}
> > > + done | while read line; do
> > > + # annotate packages that are built specially or their version
> > > + # depends on enabling kconfig entries
> > > + case i in
> > > + *alsa-lib*|*at91bootstrap*|*barebox*)
> >
> > I think we can 'fix' the alsa-lib false positives.
> > And maybe we should just remove the at91bootstrap patches, they are really
> > old anyways.
> > But why barebox? There should be no old patches, right?
>
> Ah, yes. I was thinking at91bootstrap can be disabled, so the version
> number is empty, and the same can be said for barebox too. But the only
> location where Barebox patches occur is at the BSP level, and I guess
> it doesn't happen that someone switches from barebox to at91bootstrap
> with patches lying around locally.
FWIW, we are still using different versions of at91bootstrap in different
BSPs. The legacy version (at91bootstrap) has patches in the directory
'patches/Bootstrap-v1.16' and the current version (at91bootstrap2) has them in
'patches/at91bootstrap-3.8.13'.
If one or the other package needs fixes, let me know.
Greets
Alex
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [RFC 3/4] libptxdist: add a function to find unreferenced source directories
Hello Michael, Am Mittwoch, 4. September 2019, 15:05:04 CEST schrieb Michael Olbrich: > On Fri, Aug 23, 2019 at 11:01:58AM +0200, Alexander Dahl wrote: > > FWIW, we are still using different versions of at91bootstrap in different > > BSPs. The legacy version (at91bootstrap) has patches in the directory > > 'patches/Bootstrap-v1.16' and the current version (at91bootstrap2) has > > them in 'patches/at91bootstrap-3.8.13'. > > > > If one or the other package needs fixes, let me know. > > PTXdist upstream has patches for 'at91bootstrap'. Do you use those, or do > you have your own patch stack in your BSP? > > I'd like to remove the patches from PTXdist. It's the only packages that > has a configurable version and patches for one specific version upstream. We have our own patches anyway. And even if not, it would also be no problem to add them to our BSP, if ptxdist won't ship those anymore. Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] host-tz-database: version bump 2019b -> 2019c
Announcement here: https://mm.icann.org/pipermail/tz-announce/2019-September/57.html Signed-off-by: Alexander Dahl --- rules/host-tz-database.make | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make index f12f798ff..5bce536f9 100644 --- a/rules/host-tz-database.make +++ b/rules/host-tz-database.make @@ -18,8 +18,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_TZ_DATABASE) += host-tz-database HOST_TZ_DATABASE := tz-database HOST_TZ_DATABASE_DIR := $(HOST_BUILDDIR)/$(HOST_TZ_DATABASE) -TZCODE_VERSION := 2019b -TZCODE_MD5 := 91e0978d947496fd6aaf46d351f9c41d +TZCODE_VERSION := 2019c +TZCODE_MD5 := 195a17454c5db05cab96595380650391 TZCODE := tzcode$(TZCODE_VERSION) TZCODE_SUFFIX := tar.gz TZCODE_URL := \ @@ -29,8 +29,8 @@ $(TZCODE_SOURCE) := TZCODE TZCODE_DIR := $(HOST_TZ_DATABASE_DIR) TZCODE_STRIP_LEVEL := 0 -TZDATA_VERSION := 2019b -TZDATA_MD5 := b26b5d7d844cb96c73ed2fb6d588daaf +TZDATA_VERSION := 2019c +TZDATA_MD5 := f6987e6dfdb2eb83a1b5076a50b80894 TZDATA := tzdata$(TZDATA_VERSION) TZDATA_SUFFIX := tar.gz TZDATA_URL := \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC 3/4] libptxdist: add a function to find unreferenced source directories
Hei hei, Am Montag, 9. September 2019, 08:23:00 CEST schrieb Michael Olbrich: > On Wed, Sep 04, 2019 at 03:16:51PM +0200, Alexander Dahl wrote: > > Am Mittwoch, 4. September 2019, 15:05:04 CEST schrieb Michael Olbrich: > > > On Fri, Aug 23, 2019 at 11:01:58AM +0200, Alexander Dahl wrote: > > > > FWIW, we are still using different versions of at91bootstrap in > > > > different > > > > BSPs. The legacy version (at91bootstrap) has patches in the directory > > > > 'patches/Bootstrap-v1.16' and the current version (at91bootstrap2) has > > > > them in 'patches/at91bootstrap-3.8.13'. > > > > > > > > If one or the other package needs fixes, let me know. > > > > > > PTXdist upstream has patches for 'at91bootstrap'. Do you use those, or > > > do > > > you have your own patch stack in your BSP? > > > > > > I'd like to remove the patches from PTXdist. It's the only packages that > > > has a configurable version and patches for one specific version > > > upstream. > > > > We have our own patches anyway. > > > > And even if not, it would also be no problem to add them to our BSP, if > > ptxdist won't ship those anymore. > > Hmm, so I noticed that I actually run build tests for this. And I'd > probably loose those if I drop the patches... > > So another Idea: From what I understand, Upstream for this is dead, so > there will be no new version, right? Can I assume, that nowadays only > version 1.16 is used? This is at91bootstrap version 1, from my point of view upstream focus is now on version 3 only (the ptxdist package is called 'at91bootstrap2'). You choose one or the other depending on your SoC/board, AFAIK there are only very few boards supported by both, if any. And: you can avoid at91bootstrap at all and use the SPL variant of U-Boot or barebox instead for this stage of the bootloaders. (We never tried that.) > In that case I could just remove the version options and keep the patches. > That way all my scripts are happy and it's still covered in my build tests. > > Alex, would that make sense to you? If you just want to pin the version to v1.16, I'm fine with that. > Ladis, you submitted the last patch for this. Is this still relevant for > you? What do you think? > > Michael Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] logrotate: change from single config file to drop-in directory
Hello Jürgen,
Am Donnerstag, 5. September 2019, 12:37:50 CEST schrieb Juergen Borleis:
> Instead of using only one single config file, a drop-in directory is more
> useful to support various users of 'logrotate'.
>
> This change still expects the BSP to provide the '/etc/logrotate.d'
> directory and the required config files in there.
>
> Signed-off-by: Juergen Borleis
> ---
> projectroot/etc/logrotate.conf | 14 +-
> rules/logrotate.in | 7 ++-
> 2 files changed, 7 insertions(+), 14 deletions(-)
>
> diff --git a/projectroot/etc/logrotate.conf b/projectroot/etc/logrotate.conf
> index d872dcc5d..e3d85c4ff 100644
> --- a/projectroot/etc/logrotate.conf
> +++ b/projectroot/etc/logrotate.conf
> @@ -1,13 +1 @@
> -/var/log/syslog {
> - missingok
> -
> - # rotate after X bytes - ignore time
> - size 512k
> -
> - # keep backlog of X
> - rotate 20
> -
> - postrotate
> - systemctl restart rsyslog
> - endscript
> -}
> +include /etc/logrotate.d
> diff --git a/rules/logrotate.in b/rules/logrotate.in
> index 097804017..f3b465b87 100644
> --- a/rules/logrotate.in
> +++ b/rules/logrotate.in
> @@ -15,8 +15,13 @@ menuconfig LOGROTATE
> log file gets to a certain size. Normally, logrotate runs as
> a daily cron job.
>
> + In order to make 'logrotate' work at run-time, a directory
> + '/etc/logrotate.d' is required which must contain your own 'logrotate'
> + config files (refer the manpage). There are no defaults in this
> + package.
> +
> Note: on a read-only root filesystem this package still requires a
> - writable '/var/lib' for its run-time information.
> + writable '/var/lib' for its run-time state information.
>
> if LOGROTATE
Reviewed-by: Alexander Dahl
Greets
Alex
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] mosquitto: version bump 1.4.14 -> 1.6.4
This includes a lot of security fixes, bug fixes, fixed build issues, new features, and removed features. Notable for this package: * libuuid support removed * new systemd service unit * copied config file from upstream example, changed unpriviledged user to "daemon" (already exists in ptxdist) Signed-off-by: Alexander Dahl --- Notes: I squeezed the version bump and the new stuff for running the broker with systemd in one commit. Let me know if I should split it up. projectroot/etc/mosquitto/mosquitto.conf | 988 +++ rules/mosquitto.in | 12 +- rules/mosquitto.make | 33 +- 3 files changed, 1024 insertions(+), 9 deletions(-) create mode 100644 projectroot/etc/mosquitto/mosquitto.conf diff --git a/projectroot/etc/mosquitto/mosquitto.conf b/projectroot/etc/mosquitto/mosquitto.conf new file mode 100644 index 0..1041ba0e6 --- /dev/null +++ b/projectroot/etc/mosquitto/mosquitto.conf @@ -0,0 +1,988 @@ +# Config file for mosquitto +# +# See mosquitto.conf(5) for more information. +# +# Default values are shown, uncomment to change. +# +# Use the # character to indicate a comment, but only if it is the +# very first character on the line. + +# = +# General configuration +# = + +# Use per listener security settings. +# +# It is recommended this option be set before any other options. +# +# If this option is set to true, then all authentication and access control +# options are controlled on a per listener basis. The following options are +# affected: +# +# password_file acl_file psk_file auth_plugin auth_opt_* allow_anonymous +# auto_id_prefix allow_zero_length_clientid +# +# Note that if set to true, then a durable client (i.e. with clean session set +# to false) that has disconnected will use the ACL settings defined for the +# listener that it was most recently connected to. +# +# The default behaviour is for this to be set to false, which maintains the +# setting behaviour from previous versions of mosquitto. +#per_listener_settings false + + +# If a client is subscribed to multiple subscriptions that overlap, e.g. foo/# +# and foo/+/baz , then MQTT expects that when the broker receives a message on +# a topic that matches both subscriptions, such as foo/bar/baz, then the client +# should only receive the message once. +# Mosquitto keeps track of which clients a message has been sent to in order to +# meet this requirement. The allow_duplicate_messages option allows this +# behaviour to be disabled, which may be useful if you have a large number of +# clients subscribed to the same set of topics and are very concerned about +# minimising memory usage. +# It can be safely set to true if you know in advance that your clients will +# never have overlapping subscriptions, otherwise your clients must be able to +# correctly deal with duplicate messages even when then have QoS=2. +#allow_duplicate_messages false + +# This option controls whether a client is allowed to connect with a zero +# length client id or not. This option only affects clients using MQTT v3.1.1 +# and later. If set to false, clients connecting with a zero length client id +# are disconnected. If set to true, clients will be allocated a client id by +# the broker. This means it is only useful for clients with clean session set +# to true. +#allow_zero_length_clientid true + +# If allow_zero_length_clientid is true, this option allows you to set a prefix +# to automatically generated client ids to aid visibility in logs. +# Defaults to 'auto-' +#auto_id_prefix auto- + +# This option affects the scenario when a client subscribes to a topic that has +# retained messages. It is possible that the client that published the retained +# message to the topic had access at the time they published, but that access +# has been subsequently removed. If check_retain_source is set to true, the +# default, the source of a retained message will be checked for access rights +# before it is republished. When set to false, no check will be made and the +# retained message will always be published. This affects all listeners. +#check_retain_source true + +# QoS 1 and 2 messages will be allowed inflight per client until this limit +# is exceeded. Defaults to 0. (No maximum) +# See also max_inflight_messages +#max_inflight_bytes 0 + +# The maximum number of QoS 1 and 2 messages currently inflight per +# client. +# This includes messages that are partway through handshakes and +# those that are being retried. Defaults to 20. Set to 0 for no +# maximum. Setting to 1 will guarantee in-order delivery of QoS 1 +# and 2 messages. +#max_inflight_messages 20 + +# For MQTT v5 clients, it is possible to have the server send a "server +# keepalive" value that will override the keepalive value set by the client. +# This is intended to be used a
Re: [ptxdist] [PATCH] mosquitto: version bump 1.4.14 -> 1.6.4
Hello Michael, Am Freitag, 9. August 2019, 11:52:03 CEST schrieb Michael Olbrich: > On Fri, Aug 09, 2019 at 10:47:44AM +0200, Alexander Dahl wrote: > > This includes a lot of security fixes, bug fixes, fixed build issues, > > new features, and removed features. Notable for this package: > > > > * libuuid support removed > > * new systemd service unit > > * copied config file from upstream example, changed unpriviledged user > > > > to "daemon" (already exists in ptxdist) > > The default user is mosquitto, right? Please introduce that user and copy > the example mosquitto.conf to the pkgdir in the install stage. This way it > will be used as fallback if no other config is found. > Otherwise the config in projectroot/ will become outdated if we're not very > careful. That came to my mind, but I was not sure if that's desired. Now I know. ;-) > > Notes: > > I squeezed the version bump and the new stuff for running the broker > > with systemd in one commit. Let me know if I should split it up. I will split up the patch into several patches and resend a v2 then. Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 3/4] mosquitto: version bump 1.4.14 -> 1.6.4
This includes a lot of security fixes, bug fixes, fixed build issues, new features, and removed features. See ChangeLog for details: https://mosquitto.org/ChangeLog.txt Signed-off-by: Alexander Dahl --- rules/mosquitto.in | 5 - rules/mosquitto.make | 14 ++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/rules/mosquitto.in b/rules/mosquitto.in index d7eb813c1..7ed65bf34 100644 --- a/rules/mosquitto.in +++ b/rules/mosquitto.in @@ -5,7 +5,6 @@ menuconfig MOSQUITTO prompt "mosquitto " select OPENSSL if MOSQUITTO_TLS select C_ARES if MOSQUITTO_SRV - select LIBUUID if MOSQUITTO_UUID help Open source MQTT message broker, library, and client. @@ -27,10 +26,6 @@ config MOSQUITTO_SRV bool prompt "SRV lookup support" -config MOSQUITTO_UUID - bool - prompt "UUID as client id" - endif # vim: ft=kconfig noet tw=72 diff --git a/rules/mosquitto.make b/rules/mosquitto.make index 63cd2dca5..4faabf783 100644 --- a/rules/mosquitto.make +++ b/rules/mosquitto.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MOSQUITTO) += mosquitto # # Paths and names # -MOSQUITTO_VERSION := 1.4.14 -MOSQUITTO_MD5 := 6b0966e93f118bc71ad7b61600a6c2d3 +MOSQUITTO_VERSION := 1.6.4 +MOSQUITTO_MD5 := c89df444afb121d795f8af5b4fd97d78 MOSQUITTO := mosquitto-$(MOSQUITTO_VERSION) MOSQUITTO_SUFFIX := tar.gz MOSQUITTO_URL := https://mosquitto.org/files/source/$(MOSQUITTO).$(MOSQUITTO_SUFFIX) @@ -43,13 +43,19 @@ MOSQUITTO_MAKE_OPT := \ WITH_PERSISTENCE=yes \ WITH_MEMORY_TRACKING=yes \ WITH_SYS_TREE=yes \ + WITH_SYSTEMD=no \ WITH_SRV=$(call ptx/yesno, PTXCONF_MOSQUITTO_SRV) \ - WITH_UUID=$(call ptx/yesno, PTXCONF_MOSQUITTO_UUID) \ WITH_WEBSOCKETS=no \ WITH_EC=yes \ WITH_DOCS=no \ WITH_SOCKS=yes \ - WITH_ADNS=no + WITH_STRIP=yes \ + WITH_STATIC_LIBRARIES=no \ + WITH_SHARED_LIBRARIES=yes \ + WITH_ADNS=no \ + WITH_EPOLL=yes \ + WITH_BUNDLED_DEPS=yes \ + WITH_COVERAGE=no MOSQUITTO_INSTALL_OPT := \ $(MOSQUITTO_MAKE_OPT) \ install -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 0/4] mosquitto: Version bump and systemd support
Hei hei, I split up the original patch into two patches and prepended that with two other patches for creating system user and install_alternative config file, which can be done before the version bump. I moved the systemd support to a separate patch following the version bump for easier review. Greets Alex Alexander Dahl (4): rootfs: Add 'mosquitto' user and group mosquitto: Install default config file mosquitto: version bump 1.4.14 -> 1.6.4 mosquitto: Add systemd service unit projectroot/etc/group | 1 + projectroot/etc/passwd | 1 + rules/mosquitto.in | 12 +++- rules/mosquitto.make | 35 +++ 4 files changed, 40 insertions(+), 9 deletions(-) -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 4/4] mosquitto: Add systemd service unit
Signed-off-by: Alexander Dahl --- rules/mosquitto.in | 7 +++ rules/mosquitto.make | 11 ++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/rules/mosquitto.in b/rules/mosquitto.in index 7ed65bf34..a2e53d7c4 100644 --- a/rules/mosquitto.in +++ b/rules/mosquitto.in @@ -14,6 +14,13 @@ config MOSQUITTO_BROKER bool prompt "Broker" +config MOSQUITTO_SYSTEMD_UNIT + bool + prompt "install systemd unit file" + default y + depends on MOSQUITTO_BROKER + depends on SYSTEMD + config MOSQUITTO_CLIENTS bool prompt "Clients" diff --git a/rules/mosquitto.make b/rules/mosquitto.make index 4faabf783..8a4967606 100644 --- a/rules/mosquitto.make +++ b/rules/mosquitto.make @@ -43,7 +43,7 @@ MOSQUITTO_MAKE_OPT:= \ WITH_PERSISTENCE=yes \ WITH_MEMORY_TRACKING=yes \ WITH_SYS_TREE=yes \ - WITH_SYSTEMD=no \ + WITH_SYSTEMD=$(call ptx/yesno, PTXCONF_MOSQUITTO_SYSTEMD_UNIT) \ WITH_SRV=$(call ptx/yesno, PTXCONF_MOSQUITTO_SRV) \ WITH_WEBSOCKETS=no \ WITH_EC=yes \ @@ -68,6 +68,8 @@ $(STATEDIR)/mosquitto.install: @$(call world/install, MOSQUITTO) @install -v -D -m644 $(MOSQUITTO_DIR)/mosquitto.conf \ $(MOSQUITTO_PKGDIR)/etc/mosquitto/mosquitto.conf + @install -v -D -m644 $(MOSQUITTO_DIR)/service/systemd/mosquitto.service.notify \ + $(MOSQUITTO_PKGDIR)/usr/lib/systemd/system/mosquitto.service @$(call touch) # @@ -95,6 +97,13 @@ ifdef PTXCONF_MOSQUITTO_BROKER @$(call install_copy, mosquitto, 0, 0, 0755, -, /usr/sbin/mosquitto) @$(call install_alternative, mosquitto, 0, 0, 0644, \ /etc/mosquitto/mosquitto.conf) + +ifdef PTXCONF_MOSQUITTO_SYSTEMD_UNIT + @$(call install_copy, mosquitto, 0, 0, 0644, -, \ + /usr/lib/systemd/system/mosquitto.service) + @$(call install_link, mosquitto, ../mosquitto.service, \ + /usr/lib/systemd/system/multi-user.target.wants/mosquitto.service) +endif endif @$(call install_finish, mosquitto) -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 1/4] rootfs: Add 'mosquitto' user and group
Allow the mosquitto broker to drop priviledges. Signed-off-by: Alexander Dahl --- projectroot/etc/group | 1 + projectroot/etc/passwd | 1 + 2 files changed, 2 insertions(+) diff --git a/projectroot/etc/group b/projectroot/etc/group index 96f7578d3..3e4a4be39 100644 --- a/projectroot/etc/group +++ b/projectroot/etc/group @@ -22,6 +22,7 @@ lock:x:114: audio:x:115: input:x:116: mysql:x:117: +mosquitto:x:118: systemd-journal:x:201: systemd-network:x:202: systemd-journal-gateway:x:206: diff --git a/projectroot/etc/passwd b/projectroot/etc/passwd index 9b35a54de..d15650b38 100644 --- a/projectroot/etc/passwd +++ b/projectroot/etc/passwd @@ -6,6 +6,7 @@ tss:x:98:98:TSS Daemon User:/dev/null:/bin/false sshd:x:100:65534:SSH Server:/var/run/sshd:/bin/false mysql:x:101:117:mySQL Server:/var/run/mysql:/bin/false messagebus:x:103:104:messagebus:/dev/null:/bin/false +mosquitto:x:104:118:Mosquitto broker user:/dev/null:/bin/false systemd-network:x:202:202:systemd-network:/dev/null:/bin/false systemd-resolve:x:203:65534:systemd-resolve:/dev/null:/bin/false systemd-timesync:x:204:65534:systemd-timesync:/dev/null:/bin/false -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 2/4] mosquitto: Install default config file
The broker service should run with a config file, but we can't use the example installed with the default install stage with 'install_alternative' in targetinstall stage (wrong place), so we install it a second time to a place better suitable. Signed-off-by: Alexander Dahl --- rules/mosquitto.make | 12 1 file changed, 12 insertions(+) diff --git a/rules/mosquitto.make b/rules/mosquitto.make index 6d3002a82..63cd2dca5 100644 --- a/rules/mosquitto.make +++ b/rules/mosquitto.make @@ -54,6 +54,16 @@ MOSQUITTO_INSTALL_OPT:= \ $(MOSQUITTO_MAKE_OPT) \ install +# +# Install +# +$(STATEDIR)/mosquitto.install: + @$(call targetinfo) + @$(call world/install, MOSQUITTO) + @install -v -D -m644 $(MOSQUITTO_DIR)/mosquitto.conf \ + $(MOSQUITTO_PKGDIR)/etc/mosquitto/mosquitto.conf + @$(call touch) + # # Target-Install # @@ -77,6 +87,8 @@ endif ifdef PTXCONF_MOSQUITTO_BROKER @$(call install_copy, mosquitto, 0, 0, 0755, -, /usr/sbin/mosquitto) + @$(call install_alternative, mosquitto, 0, 0, 0644, \ + /etc/mosquitto/mosquitto.conf) endif @$(call install_finish, mosquitto) -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 3/3] usbutils: version bump 007 -> 012
Hello Roland, Am Dienstag, 1. Oktober 2019, 13:15:20 CEST schrieb Roland Hieber: > The upstream tarball currently does not provide a pre-built configure > script [1], we need to generate it during the extract stage. > > The usb.ids file was removed from the source tarball in v008 [3], > instead we now install it through an extra package. With that, zlib is > no longer needed for the build. > > A look through the source tree shows GPL-2.0-or-later files too. Pin > down all relevant license files. I would expect version bump and license issues in two separate commits. ;-) > > [1]: https://github.com/gregkh/usbutils/issues/95#issuecomment-490086696 > [3]: https://github.com/gregkh/usbutils/commit/5d7ea40bc94c > --- > patches/usbutils-012/autogen.sh | 1 + > rules/usbutils.in | 15 +-- > rules/usbutils.make | 15 --- > 3 files changed, 22 insertions(+), 9 deletions(-) > create mode 12 patches/usbutils-012/autogen.sh > > diff --git a/patches/usbutils-012/autogen.sh > b/patches/usbutils-012/autogen.sh new file mode 12 > index ..9f8a4cb7ddcb > --- /dev/null > +++ b/patches/usbutils-012/autogen.sh > @@ -0,0 +1 @@ > +../autogen.sh > \ No newline at end of file > diff --git a/rules/usbutils.in b/rules/usbutils.in > index f259f9c4e560..42eb0b77c6b0 100644 > --- a/rules/usbutils.in > +++ b/rules/usbutils.in > @@ -1,9 +1,13 @@ > ## SECTION=shell_and_console > > menuconfig USBUTILS > - select LIBUSB > tristate > prompt "usbutils " > + select LIBUSB > + select UDEV > + select UDEV_LIBUDEV > + select USB_IDS if USBUTILS_IDS > + > help > Linux USB utilities > > @@ -44,8 +48,15 @@ config USBUTILS_USBHIDDUMP > > config USBUTILS_USBDEVICES > bool > - prompt "usbdevices" > + prompt "usb-devices" > help > Print out sysfs information about usb devices. > > +config USBUTILS_IDS > + bool > + prompt "usb.ids" > + help > + Install /usr/share/usb.ids, the database of known USB vendor and > + product IDs. > + > endif > diff --git a/rules/usbutils.make b/rules/usbutils.make > index 80af5a2bbf17..df1f44a5a2c7 100644 > --- a/rules/usbutils.make > +++ b/rules/usbutils.make > @@ -15,14 +15,18 @@ PACKAGES-$(PTXCONF_USBUTILS) += usbutils > # > # Paths and names > # > -USBUTILS_VERSION := 007 > -USBUTILS_MD5 := c9df5107ae9d26b10a1736a261250139 > +USBUTILS_VERSION := 012 > +USBUTILS_MD5 := 0da98eb80159071fdbb00905390509d9 > USBUTILS := usbutils-$(USBUTILS_VERSION) > USBUTILS_SUFFIX := tar.xz > USBUTILS_URL := $(call ptx/mirror, KERNEL, > utils/usb/usbutils/$(USBUTILS).$(USBUTILS_SUFFIX)) USBUTILS_SOURCE > := > $(SRCDIR)/$(USBUTILS).$(USBUTILS_SUFFIX) > USBUTILS_DIR := $(BUILDDIR)/$(USBUTILS) > -USBUTILS_LICENSE := GPL-2.0-only > +USBUTILS_LICENSE := GPL-2.0-only AND GPL-2.0-or-later > +USBUTILS_LICENSE_FILES := \ > + > file://README.md;startline=2;endline=3;md5=d1a09bbc0904287c70ce0a7aba17d63 > 7 \ + file://LICENSES/GPL-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > + file://LICENSES/GPL-3.0.txt;md5=1ebbd3e34237af26da5dc08a4e440464 > > # > --- > - # Prepare > @@ -36,9 +40,7 @@ USBUTILS_ENV:= $(CROSS_ENV) > # > USBUTILS_AUTOCONF := \ > $(CROSS_AUTOCONF_USR) \ > - $(GLOBAL_LARGE_FILE_OPTION) \ > - --disable-zlib \ > - --enable-usbids > + $(GLOBAL_LARGE_FILE_OPTION) > > # > --- > - # Target-Install > @@ -62,7 +64,6 @@ endif > ifdef PTXCONF_USBUTILS_USBDEVICES > @$(call install_copy, usbutils, 0, 0, 0755, -, /usr/bin/usb-devices) > endif > - @$(call install_copy, usbutils, 0, 0, 0644, -, /usr/share/usb.ids,n) > > @$(call install_finish, usbutils) Alex ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] libevdev: Add license file hash
Signed-off-by: Alexander Dahl --- rules/libevdev.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/libevdev.make b/rules/libevdev.make index b0855e7a0..e64ce19de 100644 --- a/rules/libevdev.make +++ b/rules/libevdev.make @@ -22,6 +22,7 @@ LIBEVDEV_URL := http://www.freedesktop.org/software/libevdev/$(LIBEVDEV).$(LIBE LIBEVDEV_SOURCE:= $(SRCDIR)/$(LIBEVDEV).$(LIBEVDEV_SUFFIX) LIBEVDEV_DIR := $(BUILDDIR)/$(LIBEVDEV) LIBEVDEV_LICENSE := MIT +LIBEVDEV_LICENSE_FILES := file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb # # Prepare -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] libevdev: version bump 1.5.7 -> 1.8.0
Signed-off-by: Alexander Dahl --- rules/libevdev.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libevdev.make b/rules/libevdev.make index e64ce19de..3179f87ae 100644 --- a/rules/libevdev.make +++ b/rules/libevdev.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBEVDEV) += libevdev # # Paths and names # -LIBEVDEV_VERSION := 1.5.7 -LIBEVDEV_MD5 := 4f1cfaee8d75ea3fbbfeb99a98730952 +LIBEVDEV_VERSION := 1.8.0 +LIBEVDEV_MD5 := 879631080be18526737e33b63d848039 LIBEVDEV := libevdev-$(LIBEVDEV_VERSION) LIBEVDEV_SUFFIX:= tar.xz LIBEVDEV_URL := http://www.freedesktop.org/software/libevdev/$(LIBEVDEV).$(LIBEVDEV_SUFFIX) -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 0/3] mtd-utils
Hei hei,
I wanted to investigate the hot and new 'ubihealthd' [1] from
mtd-utils master, so I decided to upgrade mtd-utils first, also
because I was curious about the new tool 'lsmtd'. While at it I
stumbled over something I forgot when doing the bump from 1.5.x to
2.0.x two years ago … you might want to review that first patch a
little more closely!
Greets
Alex
[1]
http://git.infradead.org/mtd-utils.git/commitdiff/7f0e2dc21fb291a9815fedb6e9e2c572db43c8c9
Alexander Dahl (3):
host-mtd-utils: Switch to autoconf based build
mtd-utils: version bump 2.0.2 -> 2.1.1
mtd-utils: Add option for new tool 'lsmtd'
...rkbad-new-util-to-mark-blocks-as-bad.patch | 0
.../autogen.sh| 0
.../series| 0
rules/host-mtd-utils.make | 29 +++
rules/mtd-utils.in| 8 +
rules/mtd-utils.make | 14 +++--
6 files changed, 36 insertions(+), 15 deletions(-)
rename patches/{mtd-utils-2.0.2 =>
mtd-utils-2.1.1}/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch (100%)
rename patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/autogen.sh (100%)
rename patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/series (100%)
--
2.20.1
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 2/3] mtd-utils: version bump 2.0.2 -> 2.1.1
Signed-off-by: Alexander Dahl
---
...01-nandmarkbad-new-util-to-mark-blocks-as-bad.patch | 0
.../{mtd-utils-2.0.2 => mtd-utils-2.1.1}/autogen.sh| 0
patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/series| 0
rules/host-mtd-utils.make | 6 +-
rules/mtd-utils.make | 10 +++---
5 files changed, 12 insertions(+), 4 deletions(-)
rename patches/{mtd-utils-2.0.2 =>
mtd-utils-2.1.1}/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch (100%)
rename patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/autogen.sh (100%)
rename patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/series (100%)
diff --git
a/patches/mtd-utils-2.0.2/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch
b/patches/mtd-utils-2.1.1/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch
similarity index 100%
rename from
patches/mtd-utils-2.0.2/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch
rename to
patches/mtd-utils-2.1.1/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch
diff --git a/patches/mtd-utils-2.0.2/autogen.sh
b/patches/mtd-utils-2.1.1/autogen.sh
similarity index 100%
rename from patches/mtd-utils-2.0.2/autogen.sh
rename to patches/mtd-utils-2.1.1/autogen.sh
diff --git a/patches/mtd-utils-2.0.2/series b/patches/mtd-utils-2.1.1/series
similarity index 100%
rename from patches/mtd-utils-2.0.2/series
rename to patches/mtd-utils-2.1.1/series
diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make
index 09709ba80..f49a08261 100644
--- a/rules/host-mtd-utils.make
+++ b/rules/host-mtd-utils.make
@@ -25,9 +25,13 @@ HOST_MTD_UTILS_CONF_OPT := \
--disable-unit-tests \
--disable-tests \
--disable-install-tests \
+ --disable-lsmtd \
--without-jffs \
--with-ubifs \
--with-xattr \
- --with-lzo
+ --with-lzo \
+ --without-zstd \
+ --without-selinux \
+ --without-crypto
# vim: syntax=make
diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
index aa64bd2c9..57b7691fc 100644
--- a/rules/mtd-utils.make
+++ b/rules/mtd-utils.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils
#
# Paths and names
#
-MTD_UTILS_VERSION := 2.0.2
-MTD_UTILS_MD5 := 3f05981551e73f1c6de28b2ea4edec7c
+MTD_UTILS_VERSION := 2.1.1
+MTD_UTILS_MD5 := 94bbd31b217a5169ae26ab8c0442f691
MTD_UTILS := mtd-utils-$(MTD_UTILS_VERSION)
MTD_UTILS_SUFFIX := tar.bz2
MTD_UTILS_URL :=
ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX)
@@ -36,10 +36,14 @@ MTD_UTILS_CONF_OPT := \
--disable-unit-tests \
--disable-tests \
--disable-install-tests \
+ --disable-lsmtd \
--$(call ptx/wwo, PTXCONF_MTD_UTILS_JFFS)-jffs \
--$(call ptx/wwo, PTXCONF_MTD_UTILS_UBIFS)-ubifs \
--without-xattr \
- --$(call ptx/wwo, PTXCONF_MTD_UTILS_USE_LIBLZO)-lzo
+ --$(call ptx/wwo, PTXCONF_MTD_UTILS_USE_LIBLZO)-lzo \
+ --without-zstd \
+ --without-selinux \
+ --without-crypto
#
# Target-Install
--
2.20.1
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 1/3] host-mtd-utils: Switch to autoconf based build
mtd-utils went from plain Makefile to autotools with version 2. This was
considered for the target package, but not for the host package.
host-mtd-utils build will break however when upgrading to mtd-utils
v2.1.x, so we fix this first before the version bump.
Fixes: 11c111c3af11 ("mtd-utils: Upgrade from 1.5.2 to 2.0.1")
Signed-off-by: Alexander Dahl
---
rules/host-mtd-utils.make | 25 +
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make
index 457ecefb4..09709ba80 100644
--- a/rules/host-mtd-utils.make
+++ b/rules/host-mtd-utils.make
@@ -12,21 +12,22 @@
#
HOST_PACKAGES-$(PTXCONF_HOST_MTD_UTILS) += host-mtd-utils
-#
-# Paths and names
-#
-HOST_MTD_UTILS_DIR = $(HOST_BUILDDIR)/$(MTD_UTILS)
-
#
# Prepare
#
-# don't use := here
-HOST_MTD_UTILS_MAKEVARS= \
- PREFIX=/ \
- BUILDDIR=$(HOST_MTD_UTILS_DIR) \
- DESTDIR=$(HOST_MTD_UTILS_PKGDIR)
-
-HOST_MTD_UTILS_CFLAGS := -fgnu89-inline
+#
+# autoconf
+#
+HOST_MTD_UTILS_CONF_TOOL := autoconf
+HOST_MTD_UTILS_CONF_OPT:= \
+ $(HOST_AUTOCONF) \
+ --disable-unit-tests \
+ --disable-tests \
+ --disable-install-tests \
+ --without-jffs \
+ --with-ubifs \
+ --with-xattr \
+ --with-lzo
# vim: syntax=make
--
2.20.1
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 3/3] mtd-utils: Add option for new tool 'lsmtd'
Signed-off-by: Alexander Dahl --- rules/mtd-utils.in | 8 rules/mtd-utils.make | 6 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in index 6e829667a..8988ba116 100644 --- a/rules/mtd-utils.in +++ b/rules/mtd-utils.in @@ -119,6 +119,14 @@ config MTD_UTILS_FTL_FORMAT Utility to create an FTL (Flash Translation Layer) partition in a memory region +config MTD_UTILS_LSMTD + bool + prompt "lsmtd" + help + Pretty prints a list with hierarchical information about all + available or the specified MTD and UBI devices. Tries to + imitate the lsblk program from util-linux. + config MTD_UTILS_JFFS2_DUMP bool prompt "jffs2dump" diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make index 57b7691fc..7e2f3c13a 100644 --- a/rules/mtd-utils.make +++ b/rules/mtd-utils.make @@ -36,7 +36,7 @@ MTD_UTILS_CONF_OPT:= \ --disable-unit-tests \ --disable-tests \ --disable-install-tests \ - --disable-lsmtd \ + --$(call ptx/endis, PTXCONF_MTD_UTILS_LSMTD)-lsmtd \ --$(call ptx/wwo, PTXCONF_MTD_UTILS_JFFS)-jffs \ --$(call ptx/wwo, PTXCONF_MTD_UTILS_UBIFS)-ubifs \ --without-xattr \ @@ -110,6 +110,10 @@ ifdef PTXCONF_MTD_UTILS_FTL_FORMAT @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/ftl_format) endif +ifdef PTXCONF_MTD_UTILS_LSMTD + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/lsmtd) +endif ifdef PTXCONF_MTD_UTILS_JFFS2_DUMP @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/jffs2dump) -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] build failures when building with --progress but without -j
Hei guys, I tried building recent DistroKit with ptxdist 2019.10.1 on different machines, Debian 9 (stretch), Debian 10 (buster), i686 and amd64, and noticed the following. The build fails with this command (I chose that one, any other meson/ninja build triggers the same failure): p -q --progress compile glib Error message is this one: target: glib.compile ptxdist: executing: PATH=/home/adahl/src/DistroKit-bbb/platform-v7a/sysroot- cross/bin:/home/adahl/src/DistroKit-bbb/platform-v7a/sysroot-cross/sbin:/home/ adahl/src/DistroKit-bbb/platform-v7a/sysroot-host/lib/wrapper:/home/adahl/src/ DistroKit-bbb/platform-v7a/sysroot-host/bin:/home/adahl/src/DistroKit-bbb/ platform-v7a/sysroot-host/sbin:/opt/OSELAS.Toolchain-2016.06.1/arm-v7a-linux- gnueabihf/gcc-5.4.0-glibc-2.23-binutils-2.26-kernel-4.6-sanitized/bin:/usr/ local/lib/ptxdist-2019.10.1/bin:/home/adahl/bin:/usr/local/bin:/usr/bin:/bin:/ usr/local/games:/usr/games DESTDIR="/home/adahl/src/DistroKit-bbb/platform- v7a/packages/glib-2.60.3" PKGCONFIG_WHITELIST_HOST='' PKGCONFIG_WHITELIST_TARGET='libffi libpcre libpcre16 libpcre32 libpcreposix zlib' PKGCONFIG_WHITELIST_SRC='glib' SYSROOT='/home/adahl/src/DistroKit-bbb/ platform-v7a/sysroot-target' V=0 VERBOSE= LC_ALL='C.UTF-8' KBUILD_BUILD_TIMESTAMP=2019-10-01T00:00:00+00:00 KBUILD_BUILD_USER=ptxdist KBUILD_BUILD_HOST=ptxdist ninja -C /home/adahl/src/DistroKit-bbb/platform- v7a/build-target/glib-2.60.3-build -j8 --output-sync=target --no-print- directory ninja: unrecognized option '--output-sync=target' usage: ninja [options] [targets...] Somehow with this combination of options '--output-sync=target' is passed to ninja, which fails. What works is this call: p -q -j10 --progress compile glib The error persists with ptxdist 2019.11.0 and with different toolchain versions and is independent of icecc activated or not. Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 0/2 v4] add scons conf tool and let gpsd to use it
Hei hei, thanks for your effort, this is very much appreciated. :-) On Thu, Oct 31, 2019 at 08:35:22PM +0100, Ladislav Michl wrote: > this is another attempt to bring gpsd to present times. Unlike previous > work done Denis OSTERLAND and later Fabian Godehardt, this one adds > scons tool to PTXdist and makes gpsd to use it. > > This is still work in progress [*], released early to make Alexander > Dahl happy as he expressed interrest in gpsd update :) > > Changelog supplied only per patch. > > ladis > > [*] it basically means it is good enough for my purposes (u-blox NEO-M8U > on serial port), although it would deserve better init system integration, > installing udev rules, etc... I'll forward your patches to the colleague using that BSP, maybe we can test it in the next weeks. Greets Alex -- /"\ ASCII RIBBON | »With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.« / \ HTML MAIL| (Jean-Luc Picard, quoting Judge Aaron Satie) signature.asc Description: PGP signature ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2] u-boot: generate environment image
Hei hei, On Wed, Nov 13, 2019 at 06:05:59PM +0100, Bruno Thomsen wrote: > Add possiblity to generate both a default and/or > a custom environment image. Image can be used during > manufacturing to avoid bootloader console usage and > speed up first boot. Other image use-cases include > device development edition, device demonstration > mode, etc. > > Custom environment image is generated from an user > provided config file with one 'var=value' per line > format. Input config file name is configurable. > > Both outputs has configurable image names so it's > easier to see specific use-case. > > Examples: > u-boot-demo-env.img > u-boot-development-env.img > u-boot-manufacturing-env.img > u-boot-default-env.img > > Signed-off-by: Bruno Thomsen > Tested-by: Alexander Dahl I did not test v2! Will do in a few days, but technically I did not it. Alex > --- > v2: > - remove HOST_U_BOOT_TOOLS dependency > - configurable default env image name > - add custom env image generation option > - move all options to sub menu > > platforms/u-boot.in | 64 + > rules/u-boot.make | 22 > 2 files changed, 86 insertions(+) > > diff --git a/platforms/u-boot.in b/platforms/u-boot.in > index 9bac4a758..629fc9482 100644 > --- a/platforms/u-boot.in > +++ b/platforms/u-boot.in > @@ -71,6 +71,70 @@ config U_BOOT_CONFIG > > endif > > +menuconfig U_BOOT_GENERATE_ENV_IMAGE > + bool > + prompt "Generate environment image " > + > +if U_BOOT_GENERATE_ENV_IMAGE > + > +config U_BOOT_DEFAULT_ENV_IMAGE > + prompt "Generate default environment image" > + bool > + help > + Use U-Boot's mkenvimage to compile a default U-Boot environment > + image for use in e.g. device manufacturing or development. > + > +config U_BOOT_DEFAULT_ENV_IMAGE_FILE > + prompt "Default environment image filename" > + string > + default "u-boot-env.img" > + help > + Change default environment output image name. > + > +config U_BOOT_CUSTOM_ENV_IMAGE > + prompt "Generate custom environment image" > + bool > + help > + Use U-Boot's mkenvimage to compile a custom U-Boot environment > + image based on the text file in U_BOOT_CUSTOM_ENV_IMAGE_SOURCE > + for use in e.g. device manufacturing or development. > + > +config U_BOOT_CUSTOM_ENV_IMAGE_SOURCE > + prompt "Custom environment source" > + string > + default "custom_env.config" > + help > + Text file in PTXDIST_WORKSPACE describing the custom environment. > + The file should have lines in the form var=value, one per line. > + Blank lines and lines starting with a # are ignored. > + > +config U_BOOT_CUSTOM_ENV_IMAGE_FILE > + prompt "Custom environment image filename" > + string > + default "u-boot-custom-env.img" > + help > + Change custom environment output image name. > + > +comment "common options ---" > + > +config U_BOOT_ENV_IMAGE_SIZE > + prompt "Environment image size" > + string > + default "0x2000" > + help > + Enter the U-Boot environment size for generation of image. > + Size can be prefixed with 0x for hexadecimal values. > + Must match size defined in target config and "/etc/fw_env.config". > + > +config U_BOOT_ENV_IMAGE_REDUNDANT > + prompt "Environment image with redundant copy" > + bool > + help > + Use to generate a redundant environment in the image. > + Must match target config and "/etc/fw_env.config". > + > +endif > + > config U_BOOT_BOOT_SCRIPT > prompt "Compile U-Boot boot script" > bool > diff --git a/rules/u-boot.make b/rules/u-boot.make > index 8f9290ea7..c3c426d6d 100644 > --- a/rules/u-boot.make > +++ b/rules/u-boot.make > @@ -94,6 +94,20 @@ ifdef PTXCONF_U_BOOT_BOOT_SCRIPT > @$(U_BOOT_DIR)/tools/mkimage -T script -C none \ > -d $(U_BOOT_BOOT_SCRIPT_TXT) \ > $(U_BOOT_DIR)/boot.scr.uimg > +endif > +ifdef PTXCONF_U_BOOT_DEFAULT_ENV_IMAGE > + $(U_BOOT_MAKE_ENV) $(U_BOOT_DIR)/scripts/get_default_envs.sh | \ > + $(U_BOOT_DIR)/tools/mkenvimage -p 0x0 \ > + $(call ptx/ifdef,PTXCONF_U_BOOT_ENV_IMAGE_REDUNDANT,-r,) \ > + -s $(PTXCONF_U_BOOT_ENV_IMAGE_SIZE) \ > + -o $(U_BOOT_DIR)/$(PTXCONF_U_BOOT_DEFAULT_ENV_IMAGE_FILE) - > +endif > +ifdef PTXCONF_U_BOOT_CUSTOM_ENV_IMAGE > + $(U_BOOT_DIR)/tools/mk
[ptxdist] tool 'runlevel' conflicts between busybox and systemd
Hei hei, we got a build error with ptxdist-2019.11.0 when calling `ptxdist images`: Installing busybox (1.29.3) on root. To remove package dCollected errors: * check_data_file_clashes: Package busybox wants to install file /home/adahl/ Work/bsp/***/platform-v7a/build-target/image-root-tgz/usr/sbin/runlevel But that file is already provided by package * systemd * opkg_solver_install: Cannot install package busybox. ebris, try `opkg remove busybox`. To re-attempt the install, try `opkg install busybox`. This is probably because BUSYBOX_RUNLEVEL and INITMETHOD_SYSTEMD are set at the same time. There should be a guard against that (?), but I'm not sure how to implement this because those busybox config options are generated, right? The build error is gone if we deactivate PTXCONF_BUSYBOX_RUNLEVEL. Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] git-ptx-patches: call git in a pristine environment
Moin,
Am Sonntag, 17. November 2019, 11:31:06 CET schrieb Michael Olbrich:
> On Mon, Nov 11, 2019 at 12:31:29PM +0100, Roland Hieber wrote:
> > The brhaviour of git-format-patch can be customized through user-defined
> > variables from the environment or from the user's .gitconfig, like
> > custom regexes for function context in diff hunk headers, or different
> > cleanup options. These things can lead to fuzz in generated patches
> > which cannot easily be reproduced by different users when re-exporting
> > existing patch stacks.
> >
> > Create a wrapper to call git in a pristine environment in order to
> > minimize any differences between user environments, and use it to format
> > the patch stack.
> >
> > Signed-off-by: Roland Hieber
> > ---
> >
> > scripts/git-ptx-patches | 31 +--
> > 1 file changed, 29 insertions(+), 2 deletions(-)
> >
> > diff --git a/scripts/git-ptx-patches b/scripts/git-ptx-patches
> > index 721aa78ba31c..63a1b3921646 100755
> > --- a/scripts/git-ptx-patches
> > +++ b/scripts/git-ptx-patches
> > @@ -1,5 +1,32 @@
> >
> > #!/bin/bash
> >
> > +# Create a pristine environment to minimize unnecessary fuzz when
> > different +# users use git-ptx-patches on the same patch stack. That is,
> > don't load any +# config files, and pin down environment variables which
> > could influence git's +# behaviour or patch output.
> > +# Maybe we need to save name and e-mail from the user config…
> > +# Note from git-commit-tree(1): if set in the user's environment,
> > GIT_AUTHOR_* +# and GIT_COMMITTER_* still take precedence over the user.*
> > config variables. +PRISTINE_GIT_AUTHOR=$(git config --get user.name)
> > +PRISTINE_GIT_EMAIL=$(git config --get user.email)
> > +PRISTINE_GIT_PARAMS=()
> > +if [ -n "${PRISTINE_GIT_AUTHOR}" ]; then
> > + PRISTINE_GIT_PARAMS+=( -c user.name="${PRISTINE_GIT_AUTHOR}" )
> > +fi
> > +if [ -n "${PRISTINE_GIT_EMAIL}" ]; then
> > + PRISTINE_GIT_PARAMS+=( -c user.email="${PRISTINE_GIT_EMAIL}" )
> > +fi
>
> I don't think we need to save user / email here.
> git is only used for create patches, not create new commits.
I already did this, and not only once:
p --git extract foo
cd platform-bar/build-target/foo-1.2.3
[hack, hack, hack]
git commit -a -m 'baz'
git ptx-patches
…
Greets
Alex
>
> Michael
>
> > +pristine_git() {
> > + # Notes from the git(1) manpage:
> > + # - GIT_DIFF_OPTS takes takes precedence over -U command line parameter
> > + HOME=/nonexistent \
> > + XDG_CONFIG_HOME=/nonexistent \
> > + GIT_CONFIG_NOSYSTEM=true \
> > + GIT_DIFF_OPTS="-u3" \
> > + git "${PRISTINE_GIT_PARAMS[@]}" "$@"
> > +}
> > +GIT="pristine_git"
> > +
> >
> > PTX_PATCHES_HEADER="# generated by git-ptx-patches"
> >
> > function _md5sum() {
> >
> > @@ -116,7 +143,7 @@ case "$remove_old" in
> >
> > esac
> >
> > # git-format-patch --no-signature is supported since git 1.7.2
> >
> > -if git format-patch -h 2>&1 | grep -q signature; then
> > +if ${GIT} format-patch -h 2>&1 | grep -q signature; then
> >
> > GIT_EXTRA_ARGS="--no-signature"
> >
> > fi
> >
> > @@ -129,7 +156,7 @@ fi
> >
> > GIT_EXTRA_ARGS="$GIT_EXTRA_ARGS --summary --stat=80"
> >
> > cat .ptxdist/series.0 > .ptxdist/series
> >
> > -git format-patch -N $GIT_EXTRA_ARGS ${tagopt} -o .ptxdist/patches/
> > ${range} | sed -e 's,^.ptxdist/patches/,,' > .ptxdist/series.auto +${GIT}
> > format-patch -N $GIT_EXTRA_ARGS ${tagopt} -o .ptxdist/patches/ ${range} |
> > sed -e 's,^.ptxdist/patches/,,' > .ptxdist/series.auto>
> > cat .ptxdist/series.auto >> .ptxdist/series
> > cat .ptxdist/series.1 >> .ptxdist/series
> > cat .ptxdist/series | _md5sum >> .ptxdist/series
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v4] u-boot: generate environment image
Hei hei, I will test on Monday, but one short remark below. On Fri, Nov 22, 2019 at 04:42:32PM +0100, Bruno Thomsen wrote: > Add possiblity to generate a default or a custom environment > image. Image can be used during manufacturing to avoid bootloader > console usage and speed up first boot. Other image use-cases > include device development edition, device demonstration > mode, etc. > > Custom environment image is generated from an user provided > config file with one 'var=value' per line format. Input config > file name is configurable. > > Cc: Denis OSTERLAND > Cc: Alexander Dahl > Signed-off-by: Bruno Thomsen > --- > v4: > - u-boot version limitation help. > - env image size is now Kconfig hex input > - custom env source file is now stored in platformconfigdir > - changes in custom env source file trigger rebuild > - use default mkenvimage pad > - cleanup of env images > - fix missing cleanup of imx dtb image Could you please move the missing cleanup to a separate patch? Installing that image was introduced in commit 58c48f349901988fb9bc63b7f2f9bbb30c6ef60d and I think this should be fixed apart from the env stuff. > v3: > - remove multiple env images support > - use static image names > - rebase patches on top of: u-boot: Build out-of-tree > v2: > - remove HOST_U_BOOT_TOOLS dependency > - configurable default env image name > - add custom env image generation option > - move all options to sub menu > > platforms/u-boot.in | 61 + > rules/u-boot.make | 31 ++- > 2 files changed, 91 insertions(+), 1 deletion(-) > > diff --git a/platforms/u-boot.in b/platforms/u-boot.in > index 9bac4a758..e6585b508 100644 > --- a/platforms/u-boot.in > +++ b/platforms/u-boot.in > @@ -71,6 +71,67 @@ config U_BOOT_CONFIG > > endif > > +choice > + prompt "Generate environment image" > + default U_BOOT_NONE_ENV_IMAGE > + help > + U-Boot from version 2018.03 support out-of-tree environment > + image generation. > + > +config U_BOOT_NONE_ENV_IMAGE > + prompt "none" > + bool > + help > + Don't generate an U-Boot environment image. > + > +config U_BOOT_DEFAULT_ENV_IMAGE > + prompt "default" > + bool > + help > + Use U-Boot's mkenvimage to compile a default U-Boot environment > + image for use in e.g. device manufacturing or development. > + > +config U_BOOT_CUSTOM_ENV_IMAGE > + prompt "custom" > + bool > + help > + Use U-Boot's mkenvimage to compile a custom U-Boot environment > + image based on the text file in U_BOOT_CUSTOM_ENV_IMAGE_SOURCE > + for use in e.g. device manufacturing or development. > + > +endchoice > + > +config U_BOOT_CUSTOM_ENV_IMAGE_SOURCE > + prompt "Custom environment source" > + string > + default "custom_env.config" > + depends on U_BOOT_CUSTOM_ENV_IMAGE > + help > + Text file in platform config directory describing the custom > + environment. > + The file should have lines in the form var=value, one per line. > + Blank lines and lines starting with a # are ignored. > + > +if !U_BOOT_NONE_ENV_IMAGE > + > +config U_BOOT_ENV_IMAGE_SIZE > + prompt "Environment image size" > + hex > + default 0x2000 > + help > + Enter the U-Boot environment size in hexadecimal for generation > + of image. A wrong size will typically cause crc error when used. > + Must match size defined in target config and "/etc/fw_env.config". > + > +config U_BOOT_ENV_IMAGE_REDUNDANT > + prompt "Environment image with redundant copy" > + bool > + help > + Use to generate a redundant environment in the image. > + Must match target config and "/etc/fw_env.config". > + > +endif > + > config U_BOOT_BOOT_SCRIPT > prompt "Compile U-Boot boot script" > bool > diff --git a/rules/u-boot.make b/rules/u-boot.make > index e3c2c2389..3d983378e 100644 > --- a/rules/u-boot.make > +++ b/rules/u-boot.make > @@ -43,6 +43,12 @@ U_BOOT_BOOT_SCRIPT_BIN := $(call remove_quotes, \ > $(STATEDIR)/u-boot.compile: $(U_BOOT_BOOT_SCRIPT_TXT) > endif > > +ifdef PTXCONF_U_BOOT_CUSTOM_ENV_IMAGE > +U_BOOT_CUSTOM_ENV_SRC := $(call ptx/in-platformconfigdir, \ > + $(PTXCONF_U_BOOT_CUSTOM_ENV_IMAGE_SOURCE)) > +$(STATEDIR)/u-boot.compile: $(call remove_quotes, $(U_BOOT_CUSTOM_ENV_SRC)) > +endif > + > U_BOOT_WRAPPER_BLACKLIST := \ > $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) > >
Re: [ptxdist] Extra args to mkfs.ubifs with new image creation options
Hello, On Thu, Dec 12, 2019 at 07:23:10PM +0100, Guillermo Rodriguez Garcia wrote: > I am trying to switch from the "legacy" ptxdist image creation options > to the new system based on genimage. This is because I want to > generate an ubi image out of three separate volumes, and the legacy > approach does not support this very well. Did you already find the genimage docs? Look for pengutronix at GitHub. genimage works with config files, everything is set there. > I am still trying to see how it all works; first issue I have found > is, how to specify extra arguments to mkfs.ubifs? In particular I need > to add --space-fixup; however I don't see any place where I could > configure this with the new system. ptxdist ships those genimage config files in folder 'config/images' and you can "overwrite" those in your BSP as you would do with rules. HTH & Greets Alex -- /"\ ASCII RIBBON | »With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.« / \ HTML MAIL| (Jean-Luc Picard, quoting Judge Aaron Satie) signature.asc Description: PGP signature ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] cmocka: new package
Hei hei, seems I stumbled over some magic I was not aware of, see below. On Thu, Dec 05, 2019 at 04:19:15PM +0100, Michael Olbrich wrote: > On Fri, Nov 29, 2019 at 10:11:24AM +0100, Alexander Dahl wrote: > > From: Alexander Dahl > > > > This adds the unit testing framework for C called 'cmocka'. > > > > Signed-off-by: Alexander Dahl > > --- > > I tried modifying the opensc package for building its cmocka based > > tests, but autoconf could not find or interpret the pkg-config file > > provided by cmocka. Maybe someone else wants to look deeper into this? > > What kind of error do you get there? I could solve the prepare stage. Seems like pkg-config behaves differently depending on menuconfig settings in ptxdist? What I tried first: config OPENSC_TESTSUITE bool "install testsuite" depends on CMOCKA This gets me the following in ..latform-v7a/build-target/OpenSC-0.19.0/config.log: configure:15477: checking for cmocka >= 1.0.1 configure:15484: $PKG_CONFIG --exists --print-errors "cmocka >= 1.0.1" arm-v7a-linux-gnueabihf-pkg-config: warning: blocking 'cmocka': not selected by 'opensc' configure:15487: $? = 1 configure:15501: $PKG_CONFIG --exists --print-errors "cmocka >= 1.0.1" arm-v7a-linux-gnueabihf-pkg-config: warning: blocking 'cmocka': not selected by 'opensc' configure:15504: $? = 1 configure:15518: result: no arm-v7a-linux-gnueabihf-pkg-config: warning: blocking 'cmocka': not selected by 'opensc' I used the usual 'select CMOCKA if OPENSC_TESTSUITE' then, which succeeds. Alas, I had to add another 'depends on OPENSC_OPENSSL' there. I can send that patch along with a v2 series, beware it won't build, because compilation fails then, because upstream OpenSC did not put a header file they have in their git tree into their tarball … > > --- > > rules/cmocka.in | 13 ++ > > rules/cmocka.make | 62 +++ > > 2 files changed, 75 insertions(+) > > create mode 100644 rules/cmocka.in > > create mode 100644 rules/cmocka.make > > > > diff --git a/rules/cmocka.in b/rules/cmocka.in > > new file mode 100644 > > index 0..d18cf00ff > > --- /dev/null > > +++ b/rules/cmocka.in > > @@ -0,0 +1,13 @@ > > +## SECTION=test_suites > > + > > +config CMOCKA > > + tristate > > + prompt "cmocka" > > + select HOST_CMAKE > > + help > > + cmocka is ... an elegant unit testing framework for C with > > + support for mock objects. It only requires the standard C > > + library, works on a range of computing platforms (including > > + embedded) and with different compilers. > > + > > +# vim: ft=kconfig noet tw=72 ts=8 sw=8 > > diff --git a/rules/cmocka.make b/rules/cmocka.make > > new file mode 100644 > > index 0..a4d25aece > > --- /dev/null > > +++ b/rules/cmocka.make > > @@ -0,0 +1,62 @@ > > +# -*-makefile-*- > > +# > > +# Copyright (C) 2019 by Alexander Dahl > > +# > > +# For further information about the PTXdist project and license conditions > > +# see the README file. > > +# > > + > > +# > > +# We provide this package > > +# > > +PACKAGES-$(PTXCONF_CMOCKA) += cmocka > > + > > +# > > +# Paths and names > > +# > > +CMOCKA_VER_MINOR := 1.1 > > +CMOCKA_VER_PATCH := 5 > > +CMOCKA_VERSION := $(CMOCKA_VER_MINOR).$(CMOCKA_VER_PATCH) > > +CMOCKA_MD5 := 91f95cd5db88b9b120d191b18d367193 > > +CMOCKA := cmocka-$(CMOCKA_VERSION) > > +CMOCKA_SUFFIX := tar.xz > > +CMOCKA_URL := > > https://cmocka.org/files/$(CMOCKA_VER_MINOR)/$(CMOCKA).$(CMOCKA_SUFFIX) > > CMOCKA_URL:= https://cmocka.org/files/$(basename > $(CMOCKA_VERSION))/$(CMOCKA).$(CMOCKA_SUFFIX) > > Then you can just define CMOCKA_VERSION. Nice, that makes CMOCKA_VERSION := 1.1.5 possible, which is much more readable. I'll put that into v2. Alex > > Michael > > > +CMOCKA_SOURCE := $(SRCDIR)/$(CMOCKA).$(CMOCKA_SUFFIX) > > +CMOCKA_DIR := $(BUILDDIR)/$(CMOCKA) > > +CMOCKA_LICENSE := Apache-2.0 > > +CMOCKA_LICENSE_FILES := > > file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57 > > + > > +# > > > > +# P
[ptxdist] [PATCH v2 0/2] cmocka and packages depending on it
Hei hei, I revised the implicit v1 and added a second patch. However, have a close look at that one, compiling with OPENSC_TESTSUITE currently fails, maybe the upcoming 0.20.0 (rc4 came out today) will fix that? I opened a ticket for that: https://github.com/OpenSC/OpenSC/issues/1885 Greets Alex Alexander Dahl (2): cmocka: new package opensc: Reactivate testsuite option rules/cmocka.in | 13 ++ rules/cmocka.make | 60 +++ rules/opensc.in | 4 ++-- 3 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 rules/cmocka.in create mode 100644 rules/cmocka.make -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 1/2] cmocka: new package
From: Alexander Dahl This adds the unit testing framework for C called 'cmocka'. Signed-off-by: Alexander Dahl --- Notes: v1 -> v2: * use make $(basename …) for building URL from VERSION rules/cmocka.in | 13 ++ rules/cmocka.make | 60 +++ 2 files changed, 73 insertions(+) create mode 100644 rules/cmocka.in create mode 100644 rules/cmocka.make diff --git a/rules/cmocka.in b/rules/cmocka.in new file mode 100644 index 0..d18cf00ff --- /dev/null +++ b/rules/cmocka.in @@ -0,0 +1,13 @@ +## SECTION=test_suites + +config CMOCKA + tristate + prompt "cmocka" + select HOST_CMAKE + help + cmocka is ... an elegant unit testing framework for C with + support for mock objects. It only requires the standard C + library, works on a range of computing platforms (including + embedded) and with different compilers. + +# vim: ft=kconfig noet tw=72 ts=8 sw=8 diff --git a/rules/cmocka.make b/rules/cmocka.make new file mode 100644 index 0..a25939bbe --- /dev/null +++ b/rules/cmocka.make @@ -0,0 +1,60 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Alexander Dahl +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_CMOCKA) += cmocka + +# +# Paths and names +# +CMOCKA_VERSION := 1.1.5 +CMOCKA_MD5 := 91f95cd5db88b9b120d191b18d367193 +CMOCKA := cmocka-$(CMOCKA_VERSION) +CMOCKA_SUFFIX := tar.xz +CMOCKA_URL := https://cmocka.org/files/$(basename $(CMOCKA_VERSION))/$(CMOCKA).$(CMOCKA_SUFFIX) +CMOCKA_SOURCE := $(SRCDIR)/$(CMOCKA).$(CMOCKA_SUFFIX) +CMOCKA_DIR := $(BUILDDIR)/$(CMOCKA) +CMOCKA_LICENSE := Apache-2.0 +CMOCKA_LICENSE_FILES := file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57 + +# +# Prepare +# + +CMOCKA_CONF_TOOL := cmake +CMOCKA_CONF_OPT:= \ + $(CROSS_CMAKE_USR) \ + -DBUILD_TESTING=OFF \ + -DPICKY_DEVELOPER:BOOL=OFF \ + -DUNIT_TESTING:BOOL=OFF \ + -DWITH_CMOCKERY_SUPPORT:BOOL=OFF \ + -DWITH_EXAMPLES:BOOL=OFF \ + -DWITH_STATIC_LIB=OFF + +# +# Target-Install +# + +$(STATEDIR)/cmocka.targetinstall: + @$(call targetinfo) + + @$(call install_init, cmocka) + @$(call install_fixup, cmocka,PRIORITY,optional) + @$(call install_fixup, cmocka,SECTION,base) + @$(call install_fixup, cmocka,AUTHOR,"Alexander Dahl ") + @$(call install_fixup, cmocka,DESCRIPTION,missing) + + @$(call install_lib, cmocka, 0, 0, 0644, libcmocka) + + @$(call install_finish, cmocka) + + @$(call touch) + +# vim: ft=make noet tw=72 ts=8 sw=8 -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 2/2] opensc: Reactivate testsuite option
This allows to run prepare stage successfully, cmocka is found now, but compile stage fails with opensc 0.19.0 because apparently a header file 'p11test_common.h' which is present in opensc git tree is missing in the tarball … Signed-off-by: Alexander Dahl --- rules/opensc.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/opensc.in b/rules/opensc.in index eeda1e43d..6ebe64cf8 100644 --- a/rules/opensc.in +++ b/rules/opensc.in @@ -7,6 +7,7 @@ menuconfig OPENSC select OPENCT if OPENSC_OPENCT select PCSC_LITEif OPENSC_PCSC select OPENSSL if OPENSC_OPENSSL + select CMOCKA if OPENSC_TESTSUITE help Smart card utilities with support for PKCS#15 compatible cards @@ -44,8 +45,7 @@ config OPENSC_TOOLS bool "install tools" config OPENSC_TESTSUITE - # needs cmocka - depends on BROKEN bool "install testsuite" + depends on OPENSC_OPENSSL endif -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] cmocka: new package
Hello, On Fri, Dec 06, 2019 at 11:16:18AM +0100, Michael Olbrich wrote: > On Thu, Dec 05, 2019 at 10:42:54PM +0100, Alexander Dahl wrote: > > On Thu, Dec 05, 2019 at 04:19:15PM +0100, Michael Olbrich wrote: > > > On Fri, Nov 29, 2019 at 10:11:24AM +0100, Alexander Dahl wrote: > > > > From: Alexander Dahl > > > > > > > > This adds the unit testing framework for C called 'cmocka'. > > > > > > > > Signed-off-by: Alexander Dahl > > > > --- > > > > I tried modifying the opensc package for building its cmocka based > > > > tests, but autoconf could not find or interpret the pkg-config file > > > > provided by cmocka. Maybe someone else wants to look deeper into this? > > > > > > What kind of error do you get there? > > > > I could solve the prepare stage. Seems like pkg-config behaves > > differently depending on menuconfig settings in ptxdist? What I tried > > first: > > > > config OPENSC_TESTSUITE > > bool "install testsuite" > > depends on CMOCKA > > > > This gets me the following in > > ..latform-v7a/build-target/OpenSC-0.19.0/config.log: > > > > configure:15477: checking for cmocka >= 1.0.1 > > configure:15484: $PKG_CONFIG --exists --print-errors "cmocka >= 1.0.1" > > arm-v7a-linux-gnueabihf-pkg-config: warning: blocking 'cmocka': not > > selected by 'opensc' > > configure:15487: $? = 1 > > configure:15501: $PKG_CONFIG --exists --print-errors "cmocka >= 1.0.1" > > arm-v7a-linux-gnueabihf-pkg-config: warning: blocking 'cmocka': not > > selected by 'opensc' > > configure:15504: $? = 1 > > configure:15518: result: no > > arm-v7a-linux-gnueabihf-pkg-config: warning: blocking 'cmocka': not > > selected by 'opensc' > > This is expected. With just 'depends on CMOCKA' the build order is > undefined. So our pkg-configs wrapper explicitly blocks any packages > without explicit or implicit dependencies. This way, it always fails and > not just if opensc is built before cmocka. > > > I used the usual 'select CMOCKA if OPENSC_TESTSUITE' then, which > > succeeds. Alas, I had to add another 'depends on OPENSC_OPENSSL' > > there. I can send that patch along with a v2 series, beware it won't > > build, because compilation fails then, because upstream OpenSC did not > > put a header file they have in their git tree into their tarball … > > :-/ Out of curiosity I tried v0.20.0-rc4 and hat one builds successfully. However I don't use that package by myself, so anyone else should test that after OpenSC releases 0.20.0 eventually. Other projects using CMocka: libssh, openvpn, samba, … maybe that package authors also want to test it with CMocka by themselves then? Greets Alex -- /"\ ASCII RIBBON | »With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.« / \ HTML MAIL| (Jean-Luc Picard, quoting Judge Aaron Satie) signature.asc Description: PGP signature ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3] u-boot: generate environment image
Hello Bruno, thanks for your effort. I guess some folks have custom rules for generating env images, so do we. It's good to have a common approach for ordinary use cases to prevent reinventing the wheel. I have some remarks however, see below. ;-) Am Dienstag, 19. November 2019, 17:40:02 CET schrieb Bruno Thomsen: > Add possiblity to generate a default or a custom environment > image. Image can be used during manufacturing to avoid bootloader > console usage and speed up first boot. Other image use-cases > include device development edition, device demonstration > mode, etc. > > Custom environment image is generated from an user provided > config file with one 'var=value' per line format. Input config > file name is configurable. > > Cc: Denis OSTERLAND > Cc: Alexander Dahl > Signed-off-by: Bruno Thomsen > --- > v3: > - remove multiple env images support > - use static image names > - rebase patches on top of: u-boot: Build out-of-tree > v2: > - remove HOST_U_BOOT_TOOLS dependency > - configurable default env image name > - add custom env image generation option > - move all options to sub menu > > platforms/u-boot.in | 57 + > rules/u-boot.make | 22 + > 2 files changed, 79 insertions(+) > > diff --git a/platforms/u-boot.in b/platforms/u-boot.in > index 9bac4a758..1dfb80098 100644 > --- a/platforms/u-boot.in > +++ b/platforms/u-boot.in > @@ -71,6 +71,63 @@ config U_BOOT_CONFIG > > endif > > +choice > + prompt "Generate environment image" > + default U_BOOT_NONE_ENV_IMAGE > + > +config U_BOOT_NONE_ENV_IMAGE > + prompt "none" > + bool > + help > + Don't generate an U-Boot environment image. > + > +config U_BOOT_DEFAULT_ENV_IMAGE > + prompt "default" > + bool > + help > + Use U-Boot's mkenvimage to compile a default U-Boot environment > + image for use in e.g. device manufacturing or development. > + > +config U_BOOT_CUSTOM_ENV_IMAGE > + prompt "custom" > + bool > + help > + Use U-Boot's mkenvimage to compile a custom U-Boot environment > + image based on the text file in U_BOOT_CUSTOM_ENV_IMAGE_SOURCE > + for use in e.g. device manufacturing or development. > + > +endchoice > + > +config U_BOOT_CUSTOM_ENV_IMAGE_SOURCE > + prompt "Custom environment source" > + string > + default "custom_env.config" > + depends on U_BOOT_CUSTOM_ENV_IMAGE > + help > + Text file in PTXDIST_WORKSPACE describing the custom environment. > + The file should have lines in the form var=value, one per line. > + Blank lines and lines starting with a # are ignored. > + > +if !U_BOOT_NONE_ENV_IMAGE > + > +config U_BOOT_ENV_IMAGE_SIZE > + prompt "Environment image size" > + string > + default "0x2000" > + help > + Enter the U-Boot environment size for generation of image. > + Size can be prefixed with 0x for hexadecimal values. > + Must match size defined in target config and "/etc/fw_env.config". Kconfig knows the type "hex" which you could use here. It would prevent invalid user input. > + > +config U_BOOT_ENV_IMAGE_REDUNDANT > + prompt "Environment image with redundant copy" > + bool > + help > + Use to generate a redundant environment in the image. > + Must match target config and "/etc/fw_env.config". > + > +endif > + > config U_BOOT_BOOT_SCRIPT > prompt "Compile U-Boot boot script" > bool > diff --git a/rules/u-boot.make b/rules/u-boot.make > index e3c2c2389..932b4e4af 100644 > --- a/rules/u-boot.make > +++ b/rules/u-boot.make > @@ -100,6 +100,20 @@ ifdef PTXCONF_U_BOOT_BOOT_SCRIPT > @$(U_BOOT_BUILD_DIR)/tools/mkimage -T script -C none \ > -d $(U_BOOT_BOOT_SCRIPT_TXT) \ > $(U_BOOT_BUILD_DIR)/boot.scr.uimg > +endif > +ifdef PTXCONF_U_BOOT_DEFAULT_ENV_IMAGE > + $(U_BOOT_MAKE_ENV) $(U_BOOT_DIR)/scripts/get_default_envs.sh > $(U_BOOT_BUILD_DIR) | \ + $(U_BOOT_BUILD_DIR)/tools/mkenvimage -p > 0x0 \ > + $(call ptx/ifdef,PTXCONF_U_BOOT_ENV_IMAGE_REDUNDANT,-r,) \ > + -s $(PTXCONF_U_BOOT_ENV_IMAGE_SIZE) \ > + -o $(U_BOOT_BUILD_DIR)/u-boot-env.img - This way of calling scripts/get_default_envs.sh is possible since U-Boot v2018.03-rc3, it will probably fail with older U-Boot. We allow arbitrary U- Boot versions with this package and can not easily test on that. Nevertheless I would keep it in, but add a hint in the menu on this re
[ptxdist] [PATCH 1/2] at91bootstrap2: Revise make env and opt
The 'ARCH=$(PTXCONF_BAREBOX_ARCH_STRING)' is present since first version of this package and maybe a leftover from some other package this is based on. However that ARCH variable is not used by the at91boostrap 3.x Makefile and barebox might not even be enabled. The CROSS_COMPILE variable is changed to what other bootloader packages use, and we support passing V=1 now. Signed-off-by: Alexander Dahl --- rules/at91bootstrap2.make | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/at91bootstrap2.make b/rules/at91bootstrap2.make index dcceb17cf..47031fd6c 100644 --- a/rules/at91bootstrap2.make +++ b/rules/at91bootstrap2.make @@ -32,10 +32,10 @@ AT91BOOTSTRAP2_LICENSE := unknown AT91BOOTSTRAP2_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -AT91BOOTSTRAP2_MAKE_OPT := \ - HOSTCC=$(HOSTCC) \ - ARCH=$(PTXCONF_BAREBOX_ARCH_STRING) \ - CROSS_COMPILE=$(COMPILER_PREFIX) +AT91BOOTSTRAP2_MAKE_ENV := \ + CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ + HOSTCC=$(HOSTCC) +AT91BOOTSTRAP2_MAKE_OPT := V=$(PTXDIST_VERBOSE) ifdef PTXCONF_AT91BOOTSTRAP2 $(AT91BOOTSTRAP2_CONFIG): -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] u-boot: Build out-of-tree
Like barebox and kernel, u-boot can be built out-of-tree, only few modifications are necessary. This is especially nice when working in the source tree U-Boot is built from. Cc: Bruno Thomsen Cc: Denis OSTERLAND Signed-off-by: Alexander Dahl --- rules/u-boot.make | 58 ++- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/rules/u-boot.make b/rules/u-boot.make index 1aabe61b1..e3c2c2389 100644 --- a/rules/u-boot.make +++ b/rules/u-boot.make @@ -16,14 +16,16 @@ PACKAGES-$(PTXCONF_U_BOOT) += u-boot # # Paths and names # -U_BOOT_VERSION := $(call remove_quotes,$(PTXCONF_U_BOOT_VERSION)) -U_BOOT_MD5 := $(call remove_quotes,$(PTXCONF_U_BOOT_MD5)) -U_BOOT := u-boot-$(U_BOOT_VERSION) -U_BOOT_SUFFIX := tar.bz2 -U_BOOT_URL := https://ftp.denx.de/pub/u-boot/$(U_BOOT).$(U_BOOT_SUFFIX) -U_BOOT_SOURCE := $(SRCDIR)/$(U_BOOT).$(U_BOOT_SUFFIX) -U_BOOT_DIR := $(BUILDDIR)/$(U_BOOT) -U_BOOT_DEVPKG := NO +U_BOOT_VERSION := $(call remove_quotes,$(PTXCONF_U_BOOT_VERSION)) +U_BOOT_MD5 := $(call remove_quotes,$(PTXCONF_U_BOOT_MD5)) +U_BOOT := u-boot-$(U_BOOT_VERSION) +U_BOOT_SUFFIX := tar.bz2 +U_BOOT_URL := https://ftp.denx.de/pub/u-boot/$(U_BOOT).$(U_BOOT_SUFFIX) +U_BOOT_SOURCE := $(SRCDIR)/$(U_BOOT).$(U_BOOT_SUFFIX) +U_BOOT_DIR := $(BUILDDIR)/$(U_BOOT) +U_BOOT_BUILD_DIR := $(U_BOOT_DIR)-build +U_BOOT_DEVPKG := NO +U_BOOT_BUILD_OOT := KEEP ifdef PTXCONF_U_BOOT_CONFIGSYSTEM_KCONFIG U_BOOT_CONFIG := $(call ptx/in-platformconfigdir, \ @@ -44,10 +46,16 @@ endif U_BOOT_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) +U_BOOT_CONF_OPT:= \ + -C $(U_BOOT_DIR) \ + O=$(U_BOOT_BUILD_DIR) \ + V=$(PTXDIST_VERBOSE) + U_BOOT_MAKE_ENV:= \ CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ HOSTCC=$(HOSTCC) -U_BOOT_MAKE_OPT:= V=$(PTXDIST_VERBOSE) +U_BOOT_MAKE_OPT:= $(U_BOOT_CONF_OPT) + U_BOOT_TAGS_OPT:= ctags cscope etags ifdef PTXCONF_U_BOOT_CONFIGSYSTEM_KCONFIG @@ -57,9 +65,7 @@ endif ifdef PTXCONF_U_BOOT_CONFIGSYSTEM_LEGACY U_BOOT_CONF_ENV:= PATH=$(CROSS_PATH) $(U_BOOT_MAKE_ENV) -U_BOOT_CONF_OPT:= \ - $(U_BOOT_MAKE_OPT) \ - $(call remove_quotes, $(PTXCONF_U_BOOT_CONFIG)) +U_BOOT_CONF_OPT+= $(call remove_quotes, $(PTXCONF_U_BOOT_CONFIG)) U_BOOT_MAKE_PAR:= NO endif @@ -79,7 +85,7 @@ endif ifdef PTXCONF_U_BOOT_CONFIGSYSTEM_LEGACY $(STATEDIR)/u-boot.prepare: @$(call targetinfo) - $(U_BOOT_CONF_ENV) $(MAKE) -C $(U_BOOT_DIR) $(U_BOOT_CONF_OPT) + $(U_BOOT_CONF_ENV) $(MAKE) $(U_BOOT_CONF_OPT) @$(call touch) endif @@ -91,9 +97,9 @@ $(STATEDIR)/u-boot.compile: @$(call targetinfo) @$(call world/compile, U_BOOT) ifdef PTXCONF_U_BOOT_BOOT_SCRIPT - @$(U_BOOT_DIR)/tools/mkimage -T script -C none \ + @$(U_BOOT_BUILD_DIR)/tools/mkimage -T script -C none \ -d $(U_BOOT_BOOT_SCRIPT_TXT) \ - $(U_BOOT_DIR)/boot.scr.uimg + $(U_BOOT_BUILD_DIR)/boot.scr.uimg endif @$(call touch) @@ -111,34 +117,34 @@ $(STATEDIR)/u-boot.install: $(STATEDIR)/u-boot.targetinstall: @$(call targetinfo) - @install -v -D -m644 $(U_BOOT_DIR)/u-boot.bin $(IMAGEDIR)/u-boot.bin + @install -v -D -m644 $(U_BOOT_BUILD_DIR)/u-boot.bin $(IMAGEDIR)/u-boot.bin ifdef PTXCONF_U_BOOT_INSTALL_SREC - @install -v -D -m644 $(U_BOOT_DIR)/u-boot.srec $(IMAGEDIR)/u-boot.srec + @install -v -D -m644 $(U_BOOT_BUILD_DIR)/u-boot.srec $(IMAGEDIR)/u-boot.srec endif ifdef PTXCONF_U_BOOT_INSTALL_ELF - @install -v -D -m644 $(U_BOOT_DIR)/u-boot $(IMAGEDIR)/u-boot.elf + @install -v -D -m644 $(U_BOOT_BUILD_DIR)/u-boot $(IMAGEDIR)/u-boot.elf endif ifdef PTXCONF_U_BOOT_INSTALL_SPL - @install -v -D -m644 $(U_BOOT_DIR)/SPL $(IMAGEDIR)/SPL + @install -v -D -m644 $(U_BOOT_BUILD_DIR)/SPL $(IMAGEDIR)/SPL endif ifdef PTXCONF_U_BOOT_INSTALL_MLO - @install -v -D -m644 $(U_BOOT_DIR)/MLO $(IMAGEDIR)/MLO + @install -v -D -m644 $(U_BOOT_BUILD_DIR)/MLO $(IMAGEDIR)/MLO endif ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_IMG - @install -v -D -m644 $(U_BOOT_DIR)/u-boot.img $(IMAGEDIR)/u-boot.img + @install -v -D -m644 $(U_BOOT_BUILD_DIR)/u-boot.img $(IMAGEDIR)/u-boot.img endif ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_IMX - @install -v -D -m644 $(U_BOOT_DIR)/u-boot.imx $(IMAGEDIR)/u-boot.imx + @install -v -D -m644 $(U_BOOT_BUILD_DIR)/u-boot.imx $(IMAGEDIR)/u-boot.imx endif ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_DTB_IMX - @install -v -D -m644 $(U_BOOT_DIR)/u-boot-dtb.imx $(IMAGEDIR)/u-boot-dtb.imx + @install -v -D -m644 $(U_BOOT_BUILD_DIR)/u-boot-dtb.imx $(IMAGEDIR)/u-boot-dtb.imx endif ifdef
[ptxdist] [PATCH 0/2] bootloader improvements
Hei hei, after finishing a rework of the u-boot.make rule for OOT build, I noticed I had an unsubmitted patch for at91bootstrap2 lying around. Because it's both bootloader stuff, you get both patches in one series. You might want to test the u-boot patch a little more thoroughly! Greets Alex Alexander Dahl (2): at91bootstrap2: Revise make env and opt u-boot: Build out-of-tree rules/at91bootstrap2.make | 8 +++--- rules/u-boot.make | 58 +-- 2 files changed, 36 insertions(+), 30 deletions(-) -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v5 1/2] u-boot: generate environment image
Hello Bruno, thanks for your continued work on this. Overall this one looks good to me now, only some typos in commit message and help text left, but that's no blocker for me (see below for those). :-) I also tested putting the custom_env.config in different layers. Works fine. Tested-by: Alexander Dahl Am Montag, 25. November 2019, 19:03:34 CET schrieb Bruno Thomsen: > Add possiblity to generate a default or a custom environment possibility > image. Image can be used during manufacturing to avoid bootloader > console usage and speed up first boot. Other image use-cases > include device development edition, device demonstration > mode, etc. > > Custom environment image is generated from an user provided > config file with one 'var=value' per line format. Input config > file name is configurable. > > Cc: Denis OSTERLAND > Cc: Alexander Dahl > Signed-off-by: Bruno Thomsen > --- > v5: > - split imx dtb image cleanup into bugfix patch > - removed remove quotes in statedir > - remove quetes in platformconfigdir > - common prefix defines > - common env image name > - remove custom env image install and clean > v4: > - u-boot version limitation help. > - env image size is now Kconfig hex input > - custom env source file is now stored in platformconfigdir > - changes in custom env source file trigger rebuild > - use default mkenvimage pad > - cleanup of env images > - fix missing cleanup of imx dtb image > v3: > - remove multiple env images support > - use static image names > - rebase patches on top of: u-boot: Build out-of-tree > v2: > - remove HOST_U_BOOT_TOOLS dependency > - configurable default env image name > - add custom env image generation option > - move all options to sub menu > > platforms/u-boot.in | 61 + > rules/u-boot.make | 25 +++ > 2 files changed, 86 insertions(+) > > diff --git a/platforms/u-boot.in b/platforms/u-boot.in > index 9bac4a758..21baf7c72 100644 > --- a/platforms/u-boot.in > +++ b/platforms/u-boot.in > @@ -71,6 +71,67 @@ config U_BOOT_CONFIG > > endif > > +choice > + prompt "Generate environment image" > + default U_BOOT_ENV_IMAGE_NONE > + help > + U-Boot from version 2018.03 support out-of-tree environment > + image generation. supports > + > +config U_BOOT_ENV_IMAGE_NONE > + prompt "none" > + bool > + help > + Don't generate an U-Boot environment image. > + > +config U_BOOT_ENV_IMAGE_DEFAULT > + prompt "default" > + bool > + help > + Use U-Boot's mkenvimage to compile a default U-Boot environment > + image for use in e.g. device manufacturing or development. > + > +config U_BOOT_ENV_IMAGE_CUSTOM > + prompt "custom" > + bool > + help > + Use U-Boot's mkenvimage to compile a custom U-Boot environment > + image based on the text file in U_BOOT_ENV_IMAGE_CUSTOM_SOURCE > + for use in e.g. device manufacturing or development. > + > +endchoice > + > +config U_BOOT_ENV_IMAGE_CUSTOM_SOURCE > + prompt "Custom environment source" > + string > + default "custom_env.config" > + depends on U_BOOT_ENV_IMAGE_CUSTOM > + help > + Text file in platform config directory describing the custom > + environment. > + The file should have lines in the form var=value, one per line. > + Blank lines and lines starting with a # are ignored. > + > +if !U_BOOT_ENV_IMAGE_NONE > + > +config U_BOOT_ENV_IMAGE_SIZE > + prompt "Environment image size" > + hex > + default 0x2000 > + help > + Enter the U-Boot environment size in hexadecimal for generation > + of image. A wrong size will typically cause crc error when used. > + Must match size defined in target config and "/etc/fw_env.config". > + > +config U_BOOT_ENV_IMAGE_REDUNDANT > + prompt "Environment image with redundant copy" > + bool > + help > + Use to generate a redundant environment in the image. > + Must match target config and "/etc/fw_env.config". > + > +endif > + > config U_BOOT_BOOT_SCRIPT > prompt "Compile U-Boot boot script" > bool > diff --git a/rules/u-boot.make b/rules/u-boot.make > index e3c2c2389..9609dca97 100644 > --- a/rules/u-boot.make > +++ b/rules/u-boot.make > @@ -43,6 +43,12 @@ U_BOOT_BOOT_SCRIPT_BIN := $(call remove_quotes, \ > $(STATEDIR)/u-boot.compile: $(U_BOOT_BOOT_SCRIPT_TXT) > endif > > +ifdef PTXCONF_U_BOOT_ENV_IMAGE_CUSTOM > +U_BOOT_ENV_IMAGE_CUSTOM_SRC
Re: [ptxdist] [PATCH v5 2/2] u-boot: bugfix: missing imx dtb image clean
This one LGTM.
Tested-by: Alexander Dahl
Am Montag, 25. November 2019, 19:03:35 CET schrieb Bruno Thomsen:
> Fixes: 58c48f349901 ("u-boot: Add u-boot-dtb.imx install option")
>
> Cc: Denis OSTERLAND
> Cc: Alexander Dahl
> Signed-off-by: Bruno Thomsen
> ---
> v5:
> - moved bugfix to seperate patch
> v4-v1:
> - patch did not exist
>
> rules/u-boot.make | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/rules/u-boot.make b/rules/u-boot.make
> index 9609dca97..04d801fc6 100644
> --- a/rules/u-boot.make
> +++ b/rules/u-boot.make
> @@ -195,7 +195,7 @@ $(STATEDIR)/u-boot.clean:
> @$(call clean_pkg, U_BOOT)
> @rm -vf $(IMAGEDIR)/u-boot.bin $(IMAGEDIR)/u-boot.srec
> $(IMAGEDIR)/u-boot.elf @rm -vf $(IMAGEDIR)/u-boot.img $(IMAGEDIR)/SPL
> $(IMAGEDIR)/MLO
> - @rm -vf $(IMAGEDIR)/u-boot.imx
> + @rm -vf $(IMAGEDIR)/u-boot.imx $(IMAGEDIR)/u-boot-dtb.imx
> @rm -vf $(IMAGEDIR)/u-boot-env.img
> @rm -vf $(IMAGEDIR)/u-boot-dtb.bin $(IMAGEDIR)/u-boot-with-spl-pbl.bin
--
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] cmocka: new package
From: Alexander Dahl This adds the unit testing framework for C called 'cmocka'. Signed-off-by: Alexander Dahl --- I tried modifying the opensc package for building its cmocka based tests, but autoconf could not find or interpret the pkg-config file provided by cmocka. Maybe someone else wants to look deeper into this? --- rules/cmocka.in | 13 ++ rules/cmocka.make | 62 +++ 2 files changed, 75 insertions(+) create mode 100644 rules/cmocka.in create mode 100644 rules/cmocka.make diff --git a/rules/cmocka.in b/rules/cmocka.in new file mode 100644 index 0..d18cf00ff --- /dev/null +++ b/rules/cmocka.in @@ -0,0 +1,13 @@ +## SECTION=test_suites + +config CMOCKA + tristate + prompt "cmocka" + select HOST_CMAKE + help + cmocka is ... an elegant unit testing framework for C with + support for mock objects. It only requires the standard C + library, works on a range of computing platforms (including + embedded) and with different compilers. + +# vim: ft=kconfig noet tw=72 ts=8 sw=8 diff --git a/rules/cmocka.make b/rules/cmocka.make new file mode 100644 index 0..a4d25aece --- /dev/null +++ b/rules/cmocka.make @@ -0,0 +1,62 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Alexander Dahl +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_CMOCKA) += cmocka + +# +# Paths and names +# +CMOCKA_VER_MINOR := 1.1 +CMOCKA_VER_PATCH := 5 +CMOCKA_VERSION := $(CMOCKA_VER_MINOR).$(CMOCKA_VER_PATCH) +CMOCKA_MD5 := 91f95cd5db88b9b120d191b18d367193 +CMOCKA := cmocka-$(CMOCKA_VERSION) +CMOCKA_SUFFIX := tar.xz +CMOCKA_URL := https://cmocka.org/files/$(CMOCKA_VER_MINOR)/$(CMOCKA).$(CMOCKA_SUFFIX) +CMOCKA_SOURCE := $(SRCDIR)/$(CMOCKA).$(CMOCKA_SUFFIX) +CMOCKA_DIR := $(BUILDDIR)/$(CMOCKA) +CMOCKA_LICENSE := Apache-2.0 +CMOCKA_LICENSE_FILES := file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57 + +# +# Prepare +# + +CMOCKA_CONF_TOOL := cmake +CMOCKA_CONF_OPT:= \ + $(CROSS_CMAKE_USR) \ + -DBUILD_TESTING=OFF \ + -DPICKY_DEVELOPER:BOOL=OFF \ + -DUNIT_TESTING:BOOL=OFF \ + -DWITH_CMOCKERY_SUPPORT:BOOL=OFF \ + -DWITH_EXAMPLES:BOOL=OFF \ + -DWITH_STATIC_LIB=OFF + +# +# Target-Install +# + +$(STATEDIR)/cmocka.targetinstall: + @$(call targetinfo) + + @$(call install_init, cmocka) + @$(call install_fixup, cmocka,PRIORITY,optional) + @$(call install_fixup, cmocka,SECTION,base) + @$(call install_fixup, cmocka,AUTHOR,"Alexander Dahl ") + @$(call install_fixup, cmocka,DESCRIPTION,missing) + + @$(call install_lib, cmocka, 0, 0, 0644, libcmocka) + + @$(call install_finish, cmocka) + + @$(call touch) + +# vim: ft=make noet tw=72 ts=8 sw=8 -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] u-boot: generate default environment image
Hei hei, did not review carefully, but … Am Donnerstag, 31. Oktober 2019, 18:28:52 CET schrieb Bruno Thomsen: > Can be used during manufacturing to avoid bootloader > console usage and speed up first boot. > > Signed-off-by: Bruno Thomsen > --- > platforms/u-boot.in | 28 > rules/u-boot.make | 11 +++ > 2 files changed, 39 insertions(+) > > diff --git a/platforms/u-boot.in b/platforms/u-boot.in > index 9bac4a758..d9195d7cd 100644 > --- a/platforms/u-boot.in > +++ b/platforms/u-boot.in > @@ -2,6 +2,7 @@ > > menuconfig U_BOOT > select BOOTLOADER > + select HOST_U_BOOT_TOOLS if U_BOOT_DEFAULT_ENV_IMAGE > prompt "U-Boot" > bool > > @@ -71,6 +72,33 @@ config U_BOOT_CONFIG > > endif > > +config U_BOOT_DEFAULT_ENV_IMAGE > + prompt "Generate U-Boot default environment image" > + bool > + help > + Use U-Boot's mkenvimage to compile a U-Boot default environment > + image for use in device manufacturing. > + > +if U_BOOT_DEFAULT_ENV_IMAGE > + > +config U_BOOT_DEFAULT_ENV_IMAGE_SIZE > + prompt "Default environment image size" > + string > + default "0x2000" > + help > + Enter the U-Boot environment size for generation of manufacturing > + image. Size can be prefixed with 0x for hexadecimal values. > + Must match size defined in target config and "/etc/fw_env.config". > + > +config U_BOOT_DEFAULT_ENV_IMAGE_REDUNDANT > + prompt "Default environment image with redundant copy" > + bool > + help > + Use to generate a redundant environment in the default image. > + Must match target config and "/etc/fw_env.config". > + > +endif > + > config U_BOOT_BOOT_SCRIPT > prompt "Compile U-Boot boot script" > bool > diff --git a/rules/u-boot.make b/rules/u-boot.make > index 8f9290ea7..b6e65a95a 100644 > --- a/rules/u-boot.make > +++ b/rules/u-boot.make > @@ -94,6 +94,13 @@ ifdef PTXCONF_U_BOOT_BOOT_SCRIPT > @$(U_BOOT_DIR)/tools/mkimage -T script -C none \ > -d $(U_BOOT_BOOT_SCRIPT_TXT) \ > $(U_BOOT_DIR)/boot.scr.uimg > +endif > +ifdef PTXCONF_U_BOOT_DEFAULT_ENV_IMAGE > + $(U_BOOT_MAKE_ENV) $(U_BOOT_DIR)/scripts/get_default_envs.sh | \ > + $(PTXDIST_SYSROOT_HOST)/bin/mkenvimage -p 0x0 \ > + $(call > ptx/ifdef,PTXCONF_U_BOOT_DEFAULT_ENV_IMAGE_REDUNDANT,-r,) \ > + -s $(PTXCONF_U_BOOT_DEFAULT_ENV_IMAGE_SIZE) \ > + -o $(U_BOOT_DIR)/u-boot-env.img - > endif > @$(call touch) > > @@ -141,6 +148,10 @@ ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_WITH_SPL_PBL > @install -v -D -m644 $(U_BOOT_DIR)/u-boot-with-spl-pbl.bin \ > $(IMAGEDIR)/u-boot-with-spl-pbl.bin > endif > +ifdef PTXCONF_U_BOOT_DEFAULT_ENV_IMAGE > + @install -v -D -m644 $(U_BOOT_DIR)/u-boot-env.img \ > + $(IMAGEDIR)/u-boot-env.img > +endif > > ifdef PTXCONF_U_BOOT_BOOT_SCRIPT > @$(call install_init, u-boot) Tested-by: Alexander Dahl Image looks fine, as far as I can tell. Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/3] mtd-utils: version bump 2.0.2 -> 2.1.1
Hei hei, Am Mittwoch, 2. Oktober 2019, 19:06:44 CEST schrieb Ladislav Michl: > On Wed, Oct 02, 2019 at 03:06:00PM +0200, Alexander Dahl wrote: > > Signed-off-by: Alexander Dahl > > + --without-selinux \ > > We have global selinux option available... I'll try to remember next time. ;-) I guess Michael adapted that line when applying the patches. Thanks for that. Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] libnl3: fix license information
Hei hei, Am Donnerstag, 10. Oktober 2019, 11:25:46 CEST schrieb Michael Olbrich: > 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 > --- > > 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. Acked-by: Alexander Dahl > > Michael > > rules/libnl3.make | 9 - > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/rules/libnl3.make b/rules/libnl3.make > index 5b3af00659c6..191e00126831 100644 > --- a/rules/libnl3.make > +++ b/rules/libnl3.make > @@ -22,7 +22,14 @@ LIBNL3_SUFFIX := tar.gz > LIBNL3_URL := > https://github.com/thom311/libnl/releases/download/$(LIBNL3_RELEASE)/$(LIBN > L3).$(LIBNL3_SUFFIX) LIBNL3_SOURCE:= $(SRCDIR)/$(LIBNL3).$(LIBNL3_SUFFIX) > LIBNL3_DIR := $(BUILDDIR)/$(LIBNL3) > -LIBNL3_LICENSE := LGPL-2.1-only > +LIBNL3_LICENSE := LGPL-2.1-only AND BSD-3-Clause > +LIBNL3_LICENSE_FILES := \ > + file://COPYING;md5=4fbd65380cdd255951079008b364516c \ > + > file://lib/xfrm/ae.c;startline=3;endline=32;md5=6813917a92b539b07534e1a79f > 5a6aca + > +ifdef PTXCONF_LIBNL3_ENABLE_CLI > +LIBNL3_LICENSE += AND GPL-2.0-only > +endif > > # > # autoconf Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] perl: Add patch for compatibility with recent libcrypt implementations.
Hei hei, this is slightly offtopic, but let me answer anyways … On Thu, Oct 10, 2019 at 02:45:03PM +0200, Björn Esser wrote: > On Do, 2019-10-10 at 14:39 +0200, Roland Hieber wrote: > > On Thu, Oct 10, 2019 at 10:44:45AM +0200, Björn Esser wrote: > > > Signed-off-by: Björn Esser > > > --- > > > .../0001-It-s-lpthread-not-lpthreads.patch| 7 +++- > > > ...-fix-build-failure-with-recent-glibc.patch | 39 > > > +++ > > > patches/perl-5.18.2/series| 3 +- > > > 3 files changed, 47 insertions(+), 2 deletions(-) > > > create mode 100644 patches/perl-5.18.2/0002-fix-build-failure- > > > with-recent-glibc.patch > > > > > > diff --git a/patches/perl-5.18.2/0001-It-s-lpthread-not- > > > lpthreads.patch b/patches/perl-5.18.2/0001-It-s-lpthread-not- > > > lpthreads.patch > > > index 319cefb2e..7a7bb1beb 100644 > > > --- a/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch > > > +++ b/patches/perl-5.18.2/0001-It-s-lpthread-not-lpthreads.patch > > > @@ -1,15 +1,20 @@ > > > From: Michael Olbrich > > > Date: Wed, 23 Apr 2014 09:02:25 +0200 > > > Subject: [PATCH] It's -lpthread not -lpthreads > > > +MIME-Version: 1.0 > > > +Content-Type: text/plain; charset=UTF-8 > > > +Content-Transfer-Encoding: 8bit > > > > Hmm, I wonder how you got these additional headers? :-) > > > > - Roland > > > Git adds them, when you have signoff enabled globally in your > gitconfig… Not exactly. Git adds those on `git format-patch` if the commit message in your patch contains other characters than 7 bit us-ascii. In this case there's an 'ö' in the name in the s-o-b line. This is also what happens if you recreate a patch series in ptxdist with `git ptx-patches` and one of the commit messages contains stuff encoded in utf-8 which does not fit in us-ascii. You also get such lines if the content (not the commit message) of your patch contains 8-bit chars and you send it with `git send-email`. Git (2.20) does not add those lines to the patch on `git format-patch` though. Greets Alex -- /"\ ASCII RIBBON | »With the first link, the chain is forged. The first \ / CAMPAIGN | speech censured, the first thought forbidden, the X AGAINST | first freedom denied, chains us all irrevocably.« / \ HTML MAIL| (Jean-Luc Picard, quoting Judge Aaron Satie) signature.asc Description: PGP signature ___ ptxdist mailing list ptxdist@pengutronix.de
