[ptxdist] [PATCH] configure_helper: allow passing --force to ptxdist
Signed-off-by: Roland Hieber
---
scripts/configure_helper.py | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/scripts/configure_helper.py b/scripts/configure_helper.py
index 3af7b416a4f7..a29d80ecf0f3 100755
--- a/scripts/configure_helper.py
+++ b/scripts/configure_helper.py
@@ -163,7 +163,7 @@ def abort(message):
print("\nSee '%s --help' for more details." % cmd)
exit(1)
-def ask_ptxdist(pkg):
+def ask_ptxdist(pkg, force):
ptxdist = os.environ.get("PTXDIST", os.environ.get("ptxdist",
"ptxdist"))
cmdline = [ ptxdist, "-k", "make",
"/print-%s_DIR" % pkg,
@@ -174,6 +174,9 @@ def ask_ptxdist(pkg):
"/print-CROSS_MESON_USR",
"/print-CROSS_AUTOCONF_USR",
"/print-PTXDIST_SYSROOT_HOST" ]
+ if force:
+ cmdline.insert(1, "--force")
+
try:
p = subprocess.Popen(cmdline,
stdout=subprocess.PIPE,
@@ -485,6 +488,8 @@ parser.add_argument("-s", "--only-src", help="the only
source directory",
dest="only")
parser.add_argument("--sort", help="sort the options before comparing",
dest="sort", action="store_true")
+parser.add_argument("-f", "--force", help="pass --force when calling ptxdist",
+ dest="force", action="store_true")
args = parser.parse_args()
@@ -512,7 +517,7 @@ ptx_pkg_conf_opt = []
pkg_subdir = ""
tool = None
if args.pkg:
- (tool, d, pkg_subdir, pkg_conf_opt, sysroot_host) = ask_ptxdist(ptx_PKG)
+ (tool, d, pkg_subdir, pkg_conf_opt, sysroot_host) =
ask_ptxdist(ptx_PKG, args.force)
ptx_pkg_label = "rules/%s.make" % ptx_pkg
if tool == "autoconf":
parsed_pkg_conf_opt = parse_configure_args(pkg_conf_opt, [])
--
2.25.0.rc1
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH v2] configure_helper: allow passing --force to ptxdist
Signed-off-by: Roland Hieber
---
v2: update doc/contributing.rst too
doc/contributing.rst| 3 +++
scripts/configure_helper.py | 9 +++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/doc/contributing.rst b/doc/contributing.rst
index 31dadcb0bba5..705f01377d32 100644
--- a/doc/contributing.rst
+++ b/doc/contributing.rst
@@ -130,6 +130,9 @@ needed. This tool contains a blacklist to filter out these
options.
``--sort``
Sort the options before comparing
+``-f, --force``
+Call PTXdist with ``--force``
+
There are several different ways to configure arguments:
.. code-block:: sh
diff --git a/scripts/configure_helper.py b/scripts/configure_helper.py
index 3af7b416a4f7..a29d80ecf0f3 100755
--- a/scripts/configure_helper.py
+++ b/scripts/configure_helper.py
@@ -163,7 +163,7 @@ def abort(message):
print("\nSee '%s --help' for more details." % cmd)
exit(1)
-def ask_ptxdist(pkg):
+def ask_ptxdist(pkg, force):
ptxdist = os.environ.get("PTXDIST", os.environ.get("ptxdist",
"ptxdist"))
cmdline = [ ptxdist, "-k", "make",
"/print-%s_DIR" % pkg,
@@ -174,6 +174,9 @@ def ask_ptxdist(pkg):
"/print-CROSS_MESON_USR",
"/print-CROSS_AUTOCONF_USR",
"/print-PTXDIST_SYSROOT_HOST" ]
+ if force:
+ cmdline.insert(1, "--force")
+
try:
p = subprocess.Popen(cmdline,
stdout=subprocess.PIPE,
@@ -485,6 +488,8 @@ parser.add_argument("-s", "--only-src", help="the only
source directory",
dest="only")
parser.add_argument("--sort", help="sort the options before comparing",
dest="sort", action="store_true")
+parser.add_argument("-f", "--force", help="pass --force when calling ptxdist",
+ dest="force", action="store_true")
args = parser.parse_args()
@@ -512,7 +517,7 @@ ptx_pkg_conf_opt = []
pkg_subdir = ""
tool = None
if args.pkg:
- (tool, d, pkg_subdir, pkg_conf_opt, sysroot_host) = ask_ptxdist(ptx_PKG)
+ (tool, d, pkg_subdir, pkg_conf_opt, sysroot_host) =
ask_ptxdist(ptx_PKG, args.force)
ptx_pkg_label = "rules/%s.make" % ptx_pkg
if tool == "autoconf":
parsed_pkg_conf_opt = parse_configure_args(pkg_conf_opt, [])
--
2.25.0.rc1
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/3] host-ua-nodeset: New package.
On Mon, Jan 13, 2020 at 02:35:55PM +0100, Björn Esser wrote: > The OPC Foundation UA Nodeset. Needed to build open62541. > > Signed-off-by: Björn Esser > --- > rules/host-ua-nodeset.in | 6 ++ > rules/host-ua-nodeset.make | 44 ++ > 2 files changed, 50 insertions(+) > create mode 100644 rules/host-ua-nodeset.in > create mode 100644 rules/host-ua-nodeset.make > > diff --git a/rules/host-ua-nodeset.in b/rules/host-ua-nodeset.in > new file mode 100644 > index 0..c582ec934 > --- /dev/null > +++ b/rules/host-ua-nodeset.in > @@ -0,0 +1,6 @@ > +## SECTION=hosttools_noprompt > + > +config HOST_UA_NODESET > + tristate > + help > + OPC UA NodeSets Hm, that's not a very helpful help text... but I guess for hosttools_noprompt this doesn't matter. - Roland > diff --git a/rules/host-ua-nodeset.make b/rules/host-ua-nodeset.make > new file mode 100644 > index 0..0b846f31d > --- /dev/null > +++ b/rules/host-ua-nodeset.make > @@ -0,0 +1,44 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2019 by Bjoern Esser > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +HOST_PACKAGES-$(PTXCONF_HOST_UA_NODESET) += host-ua-nodeset > + > +# > +# Paths and names > +# > +HOST_UA_NODESET_VERSION := 1.04.4-2020-01-08 > +HOST_UA_NODESET_MD5 := ce7b39c7f2d65617f76e0301f654a9ea > +HOST_UA_NODESET := ua-nodeset-$(HOST_UA_NODESET_VERSION) > +HOST_UA_NODESET_SUFFIX := tar.gz > +HOST_UA_NODESET_URL := > https://github.com/OPCFoundation/UA-Nodeset/archive/UA-$(HOST_UA_NODESET_VERSION)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) > +HOST_UA_NODESET_SOURCE := > $(SRCDIR)/$(HOST_UA_NODESET).$(HOST_UA_NODESET_SUFFIX) > +HOST_UA_NODESET_DIR := $(HOST_BUILDDIR)/$(HOST_UA_NODESET) > + > +# > > +# Compile > +# > > + > +$(STATEDIR)/host-ua-nodeset.compile: > + @$(call targetinfo) > + @$(call touch) > + > +# > > +# Install > +# > > + > +$(STATEDIR)/host-ua-nodeset.install: > + @$(call targetinfo) > + > + @mkdir -p $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset > + @cp -a $(HOST_BUILDDIR)/$(HOST_UA_NODESET)/* \ > + $(HOST_UA_NODESET_PKGDIR)/usr/share/ua-nodeset > + > + @$(call touch) > -- > 2.25.0.rc1 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [ptxdist-commit] 05/06: postgresql: Fix installation of executables.
, -, /usr/lib/postgresql) > > -- > To stop receiving notification emails like this one, please contact > the administrator of this repository. > > ___ > ptxdist-commit mailing list > ptxdist-com...@pengutronix.de -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2 1/4] pam: new package
On Mon, Jan 27, 2020 at 09:52:30AM +0100, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > --- > Note: Package states, that alternatively GPL can be used as a license. > There is no GPL version specification and also some files claims LGPL > can be used. Also without specifying version. Debian package references > /usr/share/common-licenses/GPL which is symlink to actual GPL version > (GPL-3). Based on package age, we could probably read license as > GPL-2.0-or-later. Yeah, I think we can use GPL-2.0-or-later here, given that there are some PAM modules that specifically mention this version (e.g. modules/pam_loginuid/). Please also include AND LGPL-2.0-or-later because of modules/pam_mkhomedir/ and modules/pam_issue/. Otherwise looks fine to me. Thanks! - Roland > > Changes: > - v2: Add license info, install_alternative config files individually > > rules/pam.in | 10 ++ > rules/pam.make | 82 ++ > 2 files changed, 92 insertions(+) > create mode 100644 rules/pam.in > create mode 100644 rules/pam.make > > diff --git a/rules/pam.in b/rules/pam.in > new file mode 100644 > index 0..75d5ef42c > --- /dev/null > +++ b/rules/pam.in > @@ -0,0 +1,10 @@ > +## SECTION=security > + > +config PAM > + tristate > + prompt "PAM" > + select LIBC_CRYPT > + help > + Linux-PAM (Pluggable Authentication Modules for Linux) is a suite > + of shared libraries that enable the local system administrator to > + choose how applications authenticate users. > diff --git a/rules/pam.make b/rules/pam.make > new file mode 100644 > index 0..2ae37c40e > --- /dev/null > +++ b/rules/pam.make > @@ -0,0 +1,82 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2020 by Ladislav Michl > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_PAM) += pam > + > +# > +# Paths and names > +# > +PAM_VERSION := 1.3.1 > +PAM_MD5 := 558ff53b0fc0563ca97f79e911822165 > +PAM := Linux-PAM-$(PAM_VERSION) > +PAM_SUFFIX := tar.xz > +PAM_URL := > https://github.com/linux-pam/linux-pam/releases/download/v$(PAM_VERSION)/$(PAM).$(PAM_SUFFIX) > +PAM_SOURCE := $(SRCDIR)/$(PAM).$(PAM_SUFFIX) > +PAM_DIR := $(BUILDDIR)/$(PAM) > +PAM_LICENSE := BSD-3-Clause OR GPL-2.0-or-later > +PAM_LICENSE_FILES := \ > + file://Copyright;md5=7eb5c1bf854e8881005d673599ee74d3 \ > + file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3 > + > +# > > +# Prepare > +# > > + > +# > +# autoconf > +# > +PAM_CONF_TOOL:= autoconf > +PAM_CONF_OPT := \ > + $(CROSS_AUTOCONF_USR) \ > + $(GLOBAL_LARGE_FILE_OPTION) \ > + --disable-lckpwdf \ > + --disable-cracklib \ > + --disable-audit \ > + --disable-db \ > + --disable-nis \ > + --disable-selinux \ > + --disable-regenerate-docu \ > + --disable-nls \ > + --disable-rpath > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/pam.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, pam) > + @$(call install_fixup, pam,PRIORITY,optional) > + @$(call install_fixup, pam,SECTION,base) > + @$(call install_fixup, pam,AUTHOR,"Ladislav Michl > ") > + @$(call install_fixup, pam,DESCRIPTION,"Pluggable Authentication > Modules for Linux") > + > + @$(call install_lib, pam, 0, 0, 0644, libpamc) > + @$(call install_lib, pam, 0, 0, 0644, libpam_misc) > + @$(call install_lib, pam, 0, 0, 0644, libpam) > + > + @$(call install_tree, pam, 0, 0, -, /usr/lib/security) > + > + @$(call install_alternative, pam, 0, 0, 0644, /etc/environment) > + @$(call install_alternative, pam, 0, 0, 0644, /etc/security/access.conf) > + @$(call install_alternative, pam, 0, 0, 0644, /etc/security/group.conf) > + @$(call install_alternative, pam, 0, 0, 0644, /etc/security/limits.conf) > + @$(call install_alternative, pam, 0, 0, 0644, > /etc/security/namespace.conf) > + @$(call install_alternative, pam, 0, 0, 0755, > /etc/security/namespace.init) > + @$(call install_alternative, pam, 0, 0, 0644, > /etc/security/pam_env.conf) > + @$(ca
Re: [ptxdist] [PATCH v2 1/4] pam: new package
On Mon, Jan 27, 2020 at 04:57:12PM +0100, Ladislav Michl wrote: > On Mon, Jan 27, 2020 at 10:57:48AM +0100, Roland Hieber wrote: > > On Mon, Jan 27, 2020 at 09:52:30AM +0100, Ladislav Michl wrote: > > > Signed-off-by: Ladislav Michl > > > --- > > > Note: Package states, that alternatively GPL can be used as a license. > > > There is no GPL version specification and also some files claims LGPL > > > can be used. Also without specifying version. Debian package references > > > /usr/share/common-licenses/GPL which is symlink to actual GPL version > > > (GPL-3). Based on package age, we could probably read license as > > > GPL-2.0-or-later. > > > > Yeah, I think we can use GPL-2.0-or-later here, given that there are > > some PAM modules that specifically mention this version (e.g. > > modules/pam_loginuid/). Please also include AND LGPL-2.0-or-later > > because of modules/pam_mkhomedir/ and modules/pam_issue/. > > Hmm, do we expect C operator precedence or better write it like this: > PAM_LICENSE := BSD-3-Clause OR (GPL-2.0-or-later AND LGPL-2.0-or-later) > > I wouldn't use extra parentheses... I think SPDX syntax requires parentheses in any case, but I'm not sure. Too many parentheses are not wrong however, and better readable. - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3] pam: new package
On Tue, Jan 28, 2020 at 08:48:39PM +0100, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > --- > Changes: > - v2: Add license info, install_alternative config files individually > - v3: Specify GPL-2.0-or-later AND LGPL-2.0-or-later Reviewed-by: Roland Hieber > > rules/pam.in | 10 ++ > rules/pam.make | 82 ++ > 2 files changed, 92 insertions(+) > create mode 100644 rules/pam.in > create mode 100644 rules/pam.make > > diff --git a/rules/pam.in b/rules/pam.in > new file mode 100644 > index 0..75d5ef42c > --- /dev/null > +++ b/rules/pam.in > @@ -0,0 +1,10 @@ > +## SECTION=security > + > +config PAM > + tristate > + prompt "PAM" > + select LIBC_CRYPT > + help > + Linux-PAM (Pluggable Authentication Modules for Linux) is a suite > + of shared libraries that enable the local system administrator to > + choose how applications authenticate users. > diff --git a/rules/pam.make b/rules/pam.make > new file mode 100644 > index 0..b665ce147 > --- /dev/null > +++ b/rules/pam.make > @@ -0,0 +1,82 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2020 by Ladislav Michl > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_PAM) += pam > + > +# > +# Paths and names > +# > +PAM_VERSION := 1.3.1 > +PAM_MD5 := 558ff53b0fc0563ca97f79e911822165 > +PAM := Linux-PAM-$(PAM_VERSION) > +PAM_SUFFIX := tar.xz > +PAM_URL := > https://github.com/linux-pam/linux-pam/releases/download/v$(PAM_VERSION)/$(PAM).$(PAM_SUFFIX) > +PAM_SOURCE := $(SRCDIR)/$(PAM).$(PAM_SUFFIX) > +PAM_DIR := $(BUILDDIR)/$(PAM) > +PAM_LICENSE := BSD-3-Clause OR (GPL-2.0-or-later AND LGPL-2.0-or-later) > +PAM_LICENSE_FILES := \ > + file://Copyright;md5=7eb5c1bf854e8881005d673599ee74d3 \ > + file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3 > + > +# > > +# Prepare > +# > > + > +# > +# autoconf > +# > +PAM_CONF_TOOL:= autoconf > +PAM_CONF_OPT := \ > + $(CROSS_AUTOCONF_USR) \ > + $(GLOBAL_LARGE_FILE_OPTION) \ > + --disable-lckpwdf \ > + --disable-cracklib \ > + --disable-audit \ > + --disable-db \ > + --disable-nis \ > + --disable-selinux \ > + --disable-regenerate-docu \ > + --disable-nls \ > + --disable-rpath > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/pam.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, pam) > + @$(call install_fixup, pam,PRIORITY,optional) > + @$(call install_fixup, pam,SECTION,base) > + @$(call install_fixup, pam,AUTHOR,"Ladislav Michl > ") > + @$(call install_fixup, pam,DESCRIPTION,"Pluggable Authentication > Modules for Linux") > + > + @$(call install_lib, pam, 0, 0, 0644, libpamc) > + @$(call install_lib, pam, 0, 0, 0644, libpam_misc) > + @$(call install_lib, pam, 0, 0, 0644, libpam) > + > + @$(call install_tree, pam, 0, 0, -, /usr/lib/security) > + > + @$(call install_alternative, pam, 0, 0, 0644, /etc/environment) > + @$(call install_alternative, pam, 0, 0, 0644, /etc/security/access.conf) > + @$(call install_alternative, pam, 0, 0, 0644, /etc/security/group.conf) > + @$(call install_alternative, pam, 0, 0, 0644, /etc/security/limits.conf) > + @$(call install_alternative, pam, 0, 0, 0644, > /etc/security/namespace.conf) > + @$(call install_alternative, pam, 0, 0, 0755, > /etc/security/namespace.init) > + @$(call install_alternative, pam, 0, 0, 0644, > /etc/security/pam_env.conf) > + @$(call install_alternative, pam, 0, 0, 0644, /etc/security/time.conf) > + > + @$(call install_finish, pam) > + > + @$(call touch) > + > +# vim: syntax=make > -- > 2.25.0 > > -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v5 3/3] open62541: new package
On Fri, Feb 14, 2020 at 01:50:23PM +0100, Michael Olbrich wrote: > On Wed, Feb 05, 2020 at 11:42:41AM +0100, Ulrich Ölmann wrote: [...] > > diff --git a/rules/open62541.make b/rules/open62541.make > > new file mode 100644 > > index ..62e030ed3752 > > --- /dev/null > > +++ b/rules/open62541.make > > @@ -0,0 +1,140 @@ > > +# -*-makefile-*- > > +# > > +# Copyright (C) 2018 by Robert Schwebel > > +# Copyright (C) 2019 by Bjoern Esser > > +# > > +# See CREDITS for details about who has contributed to this project. > > +# > > +# For further information about the PTXdist project and license conditions > > +# see the README file. > > +# > > + > > +# > > +# We provide this package > > +# > > +PACKAGES-$(PTXCONF_OPEN62541) += open62541 > > + > > +# > > +# Paths and names > > +# > > +OPEN62541_VERSION := 1.0 > > +OPEN62541_MD5 := b8e02d7310e8b48faf52efc539fa9496 > > +OPEN62541 := open62541-$(OPEN62541_VERSION) > > +OPEN62541_SUFFIX := tar.gz > > +OPEN62541_URL := > > https://github.com/open62541/open62541/archive/v$(OPEN62541_VERSION)/$(OPEN62541).$(OPEN62541_SUFFIX) > > +OPEN62541_SOURCE := $(SRCDIR)/$(OPEN62541).$(OPEN62541_SUFFIX) > > +OPEN62541_DIR := $(BUILDDIR)/$(OPEN62541) > > +OPEN62541_LICENSE := MPL-2.0 > > +OPEN62541_LICENSE_FILES:= > > file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad > > + > > +OPEN62541_MDNSD_VERSION:= > > 4bd993e0fdd06d54c8fd0b8f416cda6a8db18585 > > +OPEN62541_MDNSD_MD5:= 0961fc8dc253753ec8ea157104671498 > > +OPEN62541_MDNSD_URL:= > > https://github.com/Pro/mdnsd/archive/$(OPEN62541_MDNSD_VERSION)/open62541-mdnsd-$(OPEN62541_MDNSD_VERSION).tar.gz > > +OPEN62541_MDNSD_SOURCE := > > $(SRCDIR)/open62541-mdnsd-$(OPEN62541_MDNSD_VERSION).tar.gz > > The suffix deserves a separate variable. I'm curious why, is it used by anything other than the URL? - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] kernel-headers: build out-of-tree
On Wed, Feb 26, 2020 at 06:45:55PM +0100, Michael Olbrich wrote: > On Tue, Feb 25, 2020 at 10:20:34AM -0500, Sandy Patterson wrote: > > I am not sure if the following patch is what was intended with the change > > to OOT=KEEP change for kernel. We have a folder within our BSP with a > > kernel tree and we symlink to that folder using local_src/kernel. > > and local_src/kernel-header.. > > > > We use an external kernel source tree and kernel headers from the same > > folder. It seems with our kernel at least building the kernel-headers in > > tree causes the out-of-tree kernel to fail to build. > > It's a valid use-case. Can you make the commit message a bit more generic > (no 'we' or 'I' but a general description of the use-case). > > Also, the signed-of-by is missing. > > And something (probably your mail program) broke the patch. There are a lot > of descriptions online, on how to send patches with various mail programs. > If that doesn't work then a patch as attachment is ok as well. Of which I learned recently: https://git-send-email.io/ - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3] tf-a: new package for ARM trusted firmware A
On Tue, Feb 25, 2020 at 10:44:18AM +0100, Ahmad Fatoum wrote: > Hello Philipp, > > On 2/25/20 10:20 AM, Philipp Zabel wrote: > >> +Enter the TF-A git commitsh you want to build. Usally a tagged release > >^ ^ > > Some missing vowels here. Also, the git documentation uses spells it > > "commit-ish" [1], but in most places it just says "commit". > > Will fix it. It is usually a tag, that's why I don't want it to say > "Enter the git commit". > > > What about the other licenses listed in docs/licenses.rst, such as NCSA, > > and Zlib? Does any of this code make it into the TF-A binary? > > hm. they are all compatible with BSD-3-Clause if only distributing: > BSD-3-Clause AND BSD-2-Clause AND NCSA AND Zlib > > When patching some parts of the code, the patches need to be dually licensed, I don't understand why this is the case, even if docs/license.rst says so. If libfdt authors and STM allows us to choose between BSD or GPL-2.0, we can choose to distribute our patches under any one of those. (And if we choose BSD, which also TF-A did, we don't even need to license our contributions as BSD since BSD has no copyleft). Sure, our patches probably won't be accepted upstream by libfdt or STM under only those licenses, but that's another problem. In any way I think it's best to resolve this by keeping the original disjunctive license statements: BSD-3-Clause AND BSD-2-Clause # main license and FreeBSD libc AND (GPL-2.0-or-later OR BSD-2-Clause) # libfdt AND (NCSA OR MIT) # LLVM compiler-rt AND Zlib# zlib AND (GPL-2.0-or-later OR BSD-3-Clause) # STM platform code This way it is clear that we can choose between GPL and BSD for parts of the code, even if the most reasonable outcome of the calculation of all license terms is effectively BSD-3-Clause. - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/3] os-release: Make date string reproducible
On Thu, Feb 27, 2020 at 03:44:48PM +0100, Alexander Dahl wrote: > Signed-off-by: Alexander Dahl > --- > rules/os-release.make | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/rules/os-release.make b/rules/os-release.make > index 5156156a0..ba607aa38 100644 > --- a/rules/os-release.make > +++ b/rules/os-release.make > @@ -56,7 +56,7 @@ $(STATEDIR)/os-release.targetinstall: $(PTXDIST_PTXCONFIG) > $(PTXDIST_PLATFORMCON > @PTXDIST_VERSION@, $(PTXDIST_VERSION_FULL)) > > @$(call install_replace, os-release, /usr/lib/os-release, \ > - @DATE@, $(shell date +%FT%T%z)) > + @DATE@, $(shell date --utc --date @$(SOURCE_DATE_EPOCH) > '+%FT%T%z')) This sets PTXDIST_BUILD_DATE. I think SOURCE_DATE_EPOCH was not used here deliberately, otherwise the date would always be the same, and what's the use of the variable then? Which leads to the question: why is there a date at all here, and what useful additional information does it provide? The only thing I've come up with so far is that it acts as a monotonically increasing version number for the image, so you can compare images in terms of recency. Therefore this date should be as new as possible. On the other hand it should be also as stable as possible for reproducibility. So I think we should rather set the build date to the modification time of the newest source file in the BSP. We could do that by defining a variable in scripts/lib/ the same manner as PTXDIST_BSP_AUTOVERSION. Same goes for /etc/issue in your next patch. - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/3] os-release: Make date string reproducible
On Fri, Feb 28, 2020 at 11:16:09AM +0100, Roland Hieber wrote: > On Thu, Feb 27, 2020 at 03:44:48PM +0100, Alexander Dahl wrote: > > Signed-off-by: Alexander Dahl > > --- > > rules/os-release.make | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/rules/os-release.make b/rules/os-release.make > > index 5156156a0..ba607aa38 100644 > > --- a/rules/os-release.make > > +++ b/rules/os-release.make > > @@ -56,7 +56,7 @@ $(STATEDIR)/os-release.targetinstall: > > $(PTXDIST_PTXCONFIG) $(PTXDIST_PLATFORMCON > > @PTXDIST_VERSION@, $(PTXDIST_VERSION_FULL)) > > > > @$(call install_replace, os-release, /usr/lib/os-release, \ > > - @DATE@, $(shell date +%FT%T%z)) > > + @DATE@, $(shell date --utc --date @$(SOURCE_DATE_EPOCH) > > '+%FT%T%z')) > > So I think we > should rather set the build date to the modification time of the newest > source file in the BSP. We could do that by defining a variable in > scripts/lib/ the same manner as PTXDIST_BSP_AUTOVERSION. That isn't as easy as I thought, as file mtimes get updated when doing a VCS checkout. Also we would have to list all files in the BSP (and all base layers), which could potentially be a very I/O heavy operation, or need to deal with blacklists or whitelists of folders, but then needed to make sure nothing in that folders is included in a bash script / kconfig file / Makefile. Instead we could use the date of ./tarball-version (like PTXDIST_BSP_AUTOVERSION does too) or the current VCS commit; or if the BSP is not a VCS repo, or if the worktree has local changes, fall back to searching for the most recent file in the current BSP. Does this sound reasonable? - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] platforms: document precedence rules for TARGET_EXTRA_*FLAGS
scripts/wrapper/libwrapper.sh adds these global options before the rest of its command line, so later options from the package's build system will overwrite them. Document this fact in case anybody wonders why these options cannot be used to overwrite the default passed by the package. Signed-off-by: Roland Hieber --- platforms/toolchain_options.in | 16 1 file changed, 16 insertions(+) diff --git a/platforms/toolchain_options.in b/platforms/toolchain_options.in index afae2a67cd11..0361bf6e7e8f 100644 --- a/platforms/toolchain_options.in +++ b/platforms/toolchain_options.in @@ -95,22 +95,38 @@ config TARGET_EXTRA_CPPFLAGS help Extra options for the C preprocessor. + Note: if conflicting preprocessor options are passed, the options + specified by the package's build system take precedence over those + specified here. + config TARGET_EXTRA_CFLAGS string prompt "Extra CFLAGS (c)" help Extra options for the C compiler. + Note: if conflicting compiler options are passed, the options + specified by the package's build system take precedence over those + specified here. + config TARGET_EXTRA_CXXFLAGS string prompt "Extra CXXFLAGS (c++)" help Extra options for the C++ compiler. + Note: if conflicting compiler options are passed, the options + specified by the package's build system take precedence over those + specified here. + config TARGET_EXTRA_LDFLAGS string prompt "Extra LDFLAGS (ld)" help Extra options for the linker. + Note: if conflicting linker options are passed, the options + specified by the package's build system take precedence over those + specified here. + endmenu -- 2.25.0 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/3] shadow: Fix typo in .in rule
On Tue, Mar 10, 2020 at 02:23:58PM +0100, Alexander Dahl wrote:
> Found with codespell.
>
> Fixes: 467db38b42ea ("shadow: new package")
> Signed-off-by: Alexander Dahl
> ---
> rules/shadow.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/rules/shadow.in b/rules/shadow.in
> index 8e1fa2270..da6de28e9 100644
> --- a/rules/shadow.in
> +++ b/rules/shadow.in
> @@ -20,7 +20,7 @@ config SHADOW_ADMIN
> prompt "install account administration commands"
> help
> Enable this option if you want to install commands
> - which manipulate user accout (administer /etc/passwd,
> + which manipulate user account (administer /etc/passwd,
s/acount/accounts/
- Roland
> /etc/shadow and /etc/group, /etc/gshadow ...)
>
> endif
> --
> 2.20.1
>
>
> _______
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany| Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 3/3] doc: Fix typos found by codespell
On Tue, Mar 10, 2020 at 02:23:59PM +0100, Alexander Dahl wrote: > Signed-off-by: Alexander Dahl > --- > doc/daily_work.inc | 8 > doc/dev_manual.rst | 4 ++-- > doc/environment.rst | 4 ++-- > doc/including_bsp_doc.inc | 4 ++-- > doc/nfsroot.inc | 2 +- > doc/ref_make_macros.inc | 6 +++--- > doc/ref_make_variables.inc | 2 +- > doc/user_adapting.inc | 2 +- > doc/user_manual.inc | 2 +- > doc/user_manual_section.rst | 2 +- > 10 files changed, 18 insertions(+), 18 deletions(-) Oh well, all of those files need varying degrees of copy editing, but for now this patch is an improvement. Reviewed-by: Roland Hieber > diff --git a/doc/daily_work.inc b/doc/daily_work.inc > index 14c4aabef..bb9f8af65 100644 > --- a/doc/daily_work.inc > +++ b/doc/daily_work.inc > @@ -391,7 +391,7 @@ command line parameters. > limit the system load to the given value. > > .. Important:: using ``-ji`` and ``-je`` can overload the system > - immediatley. These settings are very hard. > + immediately. These settings are very hard. > > A much softer setup is to just use the ``-j`` parameter. This will > run > up to tasks at the same time which will be spread over > everything > @@ -982,7 +982,7 @@ to define what is to build, to install and to distribute. > in a sane way. Never add libraries to the \*_LDFLAGS variable. Always add > them to the \*_LIBADD variable (for a library) or \*_LDADD (for an > executable) > instead. This is important because the autotools forward all these > variable > -based parameters in a specifc order to the tools (compiler and linker). > +based parameters in a specific order to the tools (compiler and linker). > > **EXTRA_DIST** > Include here all files which must be part of the distribution and are not > @@ -1300,7 +1300,7 @@ non-interactive user, e.g. a different application. > > .. _external_dependencies_variants: > > -Controling Package Dependencies in more Detail > +Controlling Package Dependencies in more Detail > -- > > In section :ref:`external_dependencies` a simple method is shown how to > define > @@ -1370,7 +1370,7 @@ macro (refer :ref:`install_tree,reference`) uses the > file permissions it finds > in the build machine's filesystem also for the target filesystem image. With > a different ``umask`` than ``0022`` at build-time this may fail badly at > run-time with strange erroneous behaviour (for example some daemons with > -regular user permissions cannot acces their own configuration files). > +regular user permissions cannot access their own configuration files). > > Read Only Filesystem > > diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst > index 84dc486c7..50827b6a9 100644 > --- a/doc/dev_manual.rst > +++ b/doc/dev_manual.rst > @@ -1069,7 +1069,7 @@ enabled. To add these dependencies on demand, the menu > file looks like: > > endif > > -.. important:: Do not add these ``select`` statements to the correspondig > menu entry. > +.. important:: Do not add these ``select`` statements to the corresponding > menu entry. >They must belong to the main menu entry of the package to ensure that >the calculation of the dependencies between the packages is done in a >correct manner. > @@ -1255,7 +1255,7 @@ There can be various reasons why a package must be > patched: > > - or anything else (this case is the most common one) > > -Ideally, those problems should be adressed in the original project, > +Ideally, those problems should be addressed in the original project, > so any patches you add to your BSP or to PTXdist should also be submitted > upstream. > The upstream project can often provide better feedback, they can integrate > your > patch into a new release, and also maintain your changes as part of the > project. > diff --git a/doc/environment.rst b/doc/environment.rst > index f4994f644..18aecec4e 100644 > --- a/doc/environment.rst > +++ b/doc/environment.rst > @@ -177,7 +177,7 @@ One of the most important tasks for the ``configure`` > script is to find > out whether all the programs PTXdist depends on are already present on the > development host. The script will stop with an error message in case > something is missing. If this happens, the missing tools have to be > -installed from the distribution befor re-running the ``configure`` > +installed from the distribution before re-running the ``configure`` > script. > > When the ``configure`` script is finished successfully, we can now run > @@ -562,7 +562,7 @@ This step is only rele
Re: [ptxdist] [PATCH 06/34] dropbear: Add license information
On Tue, Mar 10, 2020 at 03:23:30PM +0100, Alexander Dahl wrote: > Hello Roland, > > Am Mittwoch, 29. Mai 2019, 11:31:55 CET schrieb Roland Hieber: > > On Wed, May 29, 2019 at 10:00:00AM +0200, Alexander Dahl wrote: > > > 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_SUFFI > > > > > X) > > > > > 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? > > Oh, and sshpty.[ch] includes a license which I couldn't find in the SPDX > > repo: > > > > * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland > > *All rights reserved > > * > > * As far as I am concerned, the code I have written for this software > > * can be used freely for any purpose. Any derived versions of this > > * software must be clearly marked as such, and if the derived work is > > * incompatible with the protocol description in the RFC file, it must > > be * called by a name other than "ssh" or "Secure Shell". > > > > So I would add an "AND unknown" here too, until my license request [0] is > > approved :) > > > > [0]: http://13.57.134.254/app/license_requests/39/ > > What's the state on this one? Any updates? Or should I just add your "ADD > unknown"? Ah right – the GitHub issue [2] didn't trigger a reminder to answer to this mail :) It got approved as "SSH-short", so no need for "unknown". [2]: https://github.com/spdx/license-list-XML/pull/936 - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3] ncdu: Add new package
On Thu, Mar 12, 2020 at 03:08:52PM +0100, Alexander Dahl wrote: > Signed-off-by: Alexander Dahl > --- > > Notes: > Changes: > > + since (implicit) v1 from 2016: > - Rewrote from scratch, forgot about that old patch … > - Upgrade to recent 1.14.2 > - Add license file hash > - Semi automatic ./configure option handling with the new ptx/wow > > + since (implicit) v2 from 2020: > - Add hidden config option NCDU_WIDE_CHAR and let that depend on > NCURSES_WIDE_CHAR like suggested by Michael Olbrich back in 2016 > > rules/ncdu.in | 14 > rules/ncdu.make | 59 + > 2 files changed, 73 insertions(+) > create mode 100644 rules/ncdu.in > create mode 100644 rules/ncdu.make > > diff --git a/rules/ncdu.in b/rules/ncdu.in > new file mode 100644 > index 0..362fc733f > --- /dev/null > +++ b/rules/ncdu.in > @@ -0,0 +1,14 @@ > +## SECTION=disk_and_file > + > +config NCDU > + tristate > + prompt "ncdu" > + select NCURSES > + help > + Disk usage analyzer with ncurses interface. > + > +config NCDU_WIDE_CHAR > + bool > + default NCURSES_WIDE_CHAR > + > +# vim: ft=kconfig noet tw=72 ts=8 sw=8 > diff --git a/rules/ncdu.make b/rules/ncdu.make > new file mode 100644 > index 0..ee539ad09 > --- /dev/null > +++ b/rules/ncdu.make > @@ -0,0 +1,59 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2016,2020 by Alexander Dahl > +# > +# See CREDITS for details about who has contributed to this project. This line keeps sneaking back in... :D > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_NCDU) += ncdu > + > +# > +# Paths and names > +# > +NCDU_VERSION := 1.14.2 > +NCDU_MD5 := 6c7e88b0c205f124f397de701402ad3a > +NCDU := ncdu-$(NCDU_VERSION) > +NCDU_SUFFIX := tar.gz > +NCDU_URL := https://dev.yorhel.nl/download/$(NCDU).$(NCDU_SUFFIX) > +NCDU_SOURCE := $(SRCDIR)/$(NCDU).$(NCDU_SUFFIX) > +NCDU_DIR := $(BUILDDIR)/$(NCDU) > +NCDU_LICENSE := MIT > +NCDU_LICENSE_FILES := file://COPYING;md5=1a8f907df32388f0d4b8cc88479f9a6a > + > +# > > +# Prepare > +# > > + > +NCDU_CONF_TOOL := autoconf > +NCDU_CONF_OPT:= \ > + $(CROSS_AUTOCONF_USR) \ > + $(GLOBAL_LARGE_FILE_OPTION) \ > + --$(call ptx/wow, PTXCONF_NCDU_WIDE_CHAR)-ncurses \ > + --$(call ptx/wwo, PTXCONF_NCDU_WIDE_CHAR)-ncursesw > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/ncdu.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, ncdu) > + @$(call install_fixup, ncdu,PRIORITY,optional) > + @$(call install_fixup, ncdu,SECTION,base) > + @$(call install_fixup, ncdu,AUTHOR,"Alexander Dahl ") > + @$(call install_fixup, ncdu,DESCRIPTION,missing) > + > + @$(call install_copy, ncdu, 0, 0, 0755, -, /usr/bin/ncdu) > + > + @$(call install_finish, ncdu) > + > + @$(call touch) > + > +# vim: ft=make noet tw=72 ts=8 sw=8 > -- > 2.20.1 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC PATCH 3/3] host-mfgtools: new package
On Tue, Mar 24, 2020 at 02:53:23PM +, Denis Osterland-Heim wrote: > Tool to USB boot i.MX systems from NXP via Android fastboot. > > Signed-off-by: Denis Osterland-Heim > --- > rules/host-mfgtools.in | 13 > rules/host-mfgtools.make | 43 > 2 files changed, 56 insertions(+) > create mode 100644 rules/host-mfgtools.in > create mode 100644 rules/host-mfgtools.make > > diff --git a/rules/host-mfgtools.in b/rules/host-mfgtools.in > new file mode 100644 > index 0..c9046f10d > --- /dev/null > +++ b/rules/host-mfgtools.in > @@ -0,0 +1,13 @@ > +## SECTION=hosttools > + > +config HOST_MFGTOOLS > + tristate > + default y if ALLYES > + prompt "uuu (Universal Update Utility), mfgtools 3.0" > + select HOST_CMAKE > + select HOST_LIBUSB > + select HOST_ZLIB > + select HOST_BZIP2 > + select HOST_LIBZIP > + help > + Freescale/NXP I.MX Chip image deploy tools. > diff --git a/rules/host-mfgtools.make b/rules/host-mfgtools.make > new file mode 100644 > index 0..fb4b2cf05 > --- /dev/null > +++ b/rules/host-mfgtools.make > @@ -0,0 +1,43 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2020 by Denis Osterland-Heim > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +HOST_PACKAGES-$(PTXCONF_HOST_MFGTOOLS) += host-mfgtools > + > +# > +# Paths and names > +# > +HOST_MFGTOOLS_VERSION:= 1.3.136-9-g47ddef5 Apparently this commit was released a few days ago as version 1.3.154: <https://github.com/NXPmicro/mfgtools/releases> > +HOST_MFGTOOLS_MD5:= 1555253943e1f39746694365c7f89eb1 > +HOST_MFGTOOLS:= mfgtools-$(HOST_MFGTOOLS_VERSION) > +HOST_MFGTOOLS_SUFFIX := tar.gz > +HOST_MFGTOOLS_URL:= > https://github.com/NXPmicro/mfgtools.git;tag=47ddef51d6c24b1f917f348d0f62b4af38852994 So you can use the default release tarball here, and use the default extract stage below. > +HOST_MFGTOOLS_SOURCE := $(SRCDIR)/$(HOST_MFGTOOLS).$(HOST_MFGTOOLS_SUFFIX) > +HOST_MFGTOOLS_DIR:= $(HOST_BUILDDIR)/$(HOST_MFGTOOLS) > +HOST_MFGTOOLS_LICENSE:= BSD-3-Clause > +HOST_MFGTOOLS_LICENSE_FILES := \ > + file://LICENSE;md5=38ec0c18112e9a92cffc4951661e85a5 > + > +# > > +# Extract > +# > > + > +$(STATEDIR)/host-mfgtools.extract: > + @$(call targetinfo) > + @$(call clean, $(HOST_MFGTOOLS_DIR)) > + @$(call extract, HOST_MFGTOOLS) > + @echo "uuu_$(HOST_MFGTOOLS_VERSION)" > > $(HOST_MFGTOOLS_DIR)/.tarball-version NB: The released tarballs also don't have this file, is it really needed? - Roland > + @$(call patchin, HOST_MFGTOOLS) > + @$(call touch) > + > +# > > +# Prepare > +# > > + > +HOST_MFGTOOLS_CONF_TOOL := cmake > + > +# vim: syntax=make > -- > 2.25.2 > > > > 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. > - Informationen zum Datenschutz, insbesondere zu Ihren Rechten, erhalten Sie > unter https://www.diehl.com/group/de/transparenz-und-informationspflichten/ > > 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. > - For general information on data protection and your respective rights > please visit > https://www.diehl.com/group/en/transparency-and-information-obligations/ > > ___ > ptxdist mailing list > pt
Re: [ptxdist] [RFC PATCH 1/3] imx-uuc: new package
> und/oder Publikation dieser E-Mail ist strengstens untersagt. > - Informationen zum Datenschutz, insbesondere zu Ihren Rechten, erhalten Sie > unter https://www.diehl.com/group/de/transparenz-und-informationspflichten/ > > 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. > - For general information on data protection and your respective rights > please visit > https://www.diehl.com/group/en/transparency-and-information-obligations/ > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC PATCH 1/3] imx-uuc: new package
On Wed, Mar 25, 2020 at 07:43:46PM +0100, Roland Hieber wrote: > On Tue, Mar 24, 2020 at 02:53:23PM +, Denis Osterland-Heim wrote: > > NXP user space util used by mfgtool. > > > > Signed-off-by: Denis Osterland-Heim > > --- > > rules/imx-uuc.in | 7 ++ > > rules/imx-uuc.make | 62 ++ > > 2 files changed, 69 insertions(+) > > create mode 100644 rules/imx-uuc.in > > create mode 100644 rules/imx-uuc.make > > > > diff --git a/rules/imx-uuc.in b/rules/imx-uuc.in > > new file mode 100644 > > index 0..ec0cbcd3a > > --- /dev/null > > +++ b/rules/imx-uuc.in > > @@ -0,0 +1,7 @@ > > +## SECTION=communication > > + > > +config IMX_UUC > > + tristate > > + prompt "imx-uuc" > > + help > > + A Daemon wait for Freescale/NXP mfgtools host's command. > > diff --git a/rules/imx-uuc.make b/rules/imx-uuc.make > > new file mode 100644 > > index 0..d275ec8af > > --- /dev/null > > +++ b/rules/imx-uuc.make > > @@ -0,0 +1,62 @@ > > +# -*-makefile-*- > > +# > > +# Copyright (C) 2016-2020 by Denis Osterland > > +# > > +# See CREDITS for details about who has contributed to this project. > > This line keeps coming back to haunt us… :) > https://git.pengutronix.de/cgit/ptxdist/commit?h=cbd6bda680c6 > > > +# > > +# For further information about the PTXdist project and license conditions > > +# see the README file. > > +# > > + > > +PACKAGES-$(PTXCONF_IMX_UUC) += imx-uuc > > + > > +# > > +# Paths and names > > +# > > +IMX_UUC_VERSION:= d6afb27e55d73d7ad08cd2dd51c784d8ec9694dc > > +IMX_UUC_MD5:= 1a807ab59464385309b92794b43b5caa Sorry, I slipped while writing the mail. What I wanted to write in the first place: Nitpick: I don't know how picky opkg-based systems are with having monotonically increasing version numbers, but in case someone uses them to update software in the field, you could make them happy by providing a fake 'git describe' tag as a version: IMX_UUC_VERSION:= 0.0-1-gd6afb27e55d73d7ad08cd2dd51c784d8ec9694dc and then increase the -1 every time for a version bump. This way git can extract the commit ID from the version info and opkg versions are increasing monotonically. The MD5 will be different though. - Roland > > +IMX_UUC:= imx-uuc-$(IMX_UUC_VERSION) > > +IMX_UUC_SUFFIX := tar.gz > > +IMX_UUC_URL:= > > https://github.com/NXPmicro/imx-uuc.git;tag=$(IMX_UUC_VERSION) > > +IMX_UUC_SOURCE := $(SRCDIR)/$(IMX_UUC).$(IMX_UUC_SUFFIX) > > +IMX_UUC_DIR:= $(BUILDDIR)/$(IMX_UUC) > > +IMX_UUC_LICENSE:= GPL-2.0-or-later > > +IMX_UUC_LICENSE_FILES := \ > > + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 > > + > > +# > > > > +# Prepare > > +# > > > > + > > +IMX_UUC_CONF_TOOL := NO > > + > > +# > > > > +# Compile > > +# > > > > + > > +IMX_UUC_MAKE_ENV := $(CROSS_ENV) > > + > > +# > > > > +# Target-Install > > +# > > > > + > > +$(STATEDIR)/imx-uuc.targetinstall: > > + @$(call targetinfo) > > + > > + @$(call install_init, imx-uuc) > > + @$(call install_fixup, imx-uuc,PRIORITY,optional) > > + @$(call install_fixup, imx-uuc,SECTION,base) > > + @$(call install_fixup, imx-uuc,AUTHOR,"Denis Osterland > > ") > > + @$(call install_fixup, imx-uuc,DESCRIPTION,missing) > > + > > + @$(call install_copy, imx-uuc, 0, 0, 0755, -, /usr/bin/uuc) > > + @$(call install_copy, imx-uuc, 0, 0, 0755, -, /usr/bin/ufb) > > + @$(call install_copy, imx-uuc, 0, 0, 0755, -, /usr/bin/sdimage) > > + @$(call install_alternative, imx-uuc, 0, 0, 0755, /linuxrc) > > Upstream has a bold choice of config file locations... > > - Roland > > > + @$(call install_alternative, imx-uuc, 0, 0, 0644, /fat) > > + > > + @$(call install_finish, imx-uuc) > > + > > + @$(call touch) > > + > > +# vim: syntax=make > > -- > > 2.25.2 > > > > > >
Re: [ptxdist] [RFC PATCH 1/3] imx-uuc: new package
On Wed, Mar 25, 2020 at 07:52:54PM +0100, Roland Hieber wrote: > On Wed, Mar 25, 2020 at 07:43:46PM +0100, Roland Hieber wrote: > > On Tue, Mar 24, 2020 at 02:53:23PM +, Denis Osterland-Heim wrote: > > > NXP user space util used by mfgtool. > > > > > > Signed-off-by: Denis Osterland-Heim > > > --- > > > rules/imx-uuc.in | 7 ++ > > > rules/imx-uuc.make | 62 ++ > > > 2 files changed, 69 insertions(+) > > > create mode 100644 rules/imx-uuc.in > > > create mode 100644 rules/imx-uuc.make > > > > > > diff --git a/rules/imx-uuc.in b/rules/imx-uuc.in > > > new file mode 100644 > > > index 0..ec0cbcd3a > > > --- /dev/null > > > +++ b/rules/imx-uuc.in > > > @@ -0,0 +1,7 @@ > > > +## SECTION=communication > > > + > > > +config IMX_UUC > > > + tristate > > > + prompt "imx-uuc" > > > + help > > > + A Daemon wait for Freescale/NXP mfgtools host's command. Oh, and also keep the tabs as indentation here, not spaces (except for the two spaces before the help text). > > > diff --git a/rules/imx-uuc.make b/rules/imx-uuc.make > > > new file mode 100644 > > > index 0..d275ec8af > > > --- /dev/null > > > +++ b/rules/imx-uuc.make > > > @@ -0,0 +1,62 @@ > > > +# -*-makefile-*- > > > +# > > > +# Copyright (C) 2016-2020 by Denis Osterland > > > +# > > > +# See CREDITS for details about who has contributed to this project. > > > > This line keeps coming back to haunt us… :) > > https://git.pengutronix.de/cgit/ptxdist/commit?h=cbd6bda680c6 > > > > > +# > > > +# For further information about the PTXdist project and license > > > conditions > > > +# see the README file. > > > +# > > > + > > > +PACKAGES-$(PTXCONF_IMX_UUC) += imx-uuc > > > + > > > +# > > > +# Paths and names > > > +# > > > +IMX_UUC_VERSION:= d6afb27e55d73d7ad08cd2dd51c784d8ec9694dc > > > +IMX_UUC_MD5:= 1a807ab59464385309b92794b43b5caa Same here: tabs for alignment before the :=. > Sorry, I slipped while writing the mail. What I wanted to write in the > first place: > > Nitpick: I don't know how picky opkg-based systems are with having > monotonically increasing version numbers, but in case someone uses them > to update software in the field, you could make them happy by providing > a fake 'git describe' tag as a version: > > IMX_UUC_VERSION:= 0.0-1-gd6afb27e55d73d7ad08cd2dd51c784d8ec9694dc > > and then increase the -1 every time for a version bump. This way git > can extract the commit ID from the version info and opkg versions are > increasing monotonically. The MD5 will be different though. > > - Roland > > > > +IMX_UUC:= imx-uuc-$(IMX_UUC_VERSION) > > > +IMX_UUC_SUFFIX := tar.gz > > > +IMX_UUC_URL:= > > > https://github.com/NXPmicro/imx-uuc.git;tag=$(IMX_UUC_VERSION) > > > +IMX_UUC_SOURCE := $(SRCDIR)/$(IMX_UUC).$(IMX_UUC_SUFFIX) > > > +IMX_UUC_DIR:= $(BUILDDIR)/$(IMX_UUC) > > > +IMX_UUC_LICENSE:= GPL-2.0-or-later > > > +IMX_UUC_LICENSE_FILES:= \ > > > + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 > > > + > > > +# > > > > > > +# Prepare > > > +# > > > > > > + > > > +IMX_UUC_CONF_TOOL:= NO > > > + > > > +# > > > > > > +# Compile > > > +# > > > > > > + > > > +IMX_UUC_MAKE_ENV := $(CROSS_ENV) > > > + > > > +# > > > > > > +# Target-Install > > > +# > > > > > > + > > > +$(STATEDIR)/imx-uuc.targetinstall: > > > + @$(call targetinfo) And here too, otherwise make will complain for recipes. - Roland > > > + > > > + @$(call install_init, imx-uuc) > > > + @$(call install_fixup, imx-uuc,PRIORITY,optional) > > > + @$(call install_fixup, imx-uuc,SECTION,base) > > > + @$(
Re: [ptxdist] wayland-protocols: version bump 1.18 -> 1.20
On Fri, Mar 27, 2020 at 10:52:09AM +0100, Michael Olbrich wrote: > Thanks, applied. > > Michael > > [sent from post-receive hook] Whee \o/ -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Scripted 'applied' mails
On Fri, Mar 27, 2020 at 11:10:20AM +0100, Michael Olbrich wrote: > Hi, > > As you may have noticed, I sent out some scripted 'patch applied' mails. > I've been working on my tooling a bit and this is one of the results from > this. > > This is still work in progress, so please speak up if you notice any > problems with this. I am also interested in suggestions about the content > of the mail. Anything I should add? The commit hash would be nice to have, and the branch name too for the sake of completeness. But for now, this is already a big improvement! - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] readme: fix spelling
For both patches: Reviewed-by: Roland Hieber On Mon, Apr 06, 2020 at 02:02:27PM +0200, Felicitas Jung wrote: > Signed-off-by: Felicitas Jung > --- > README | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/README b/README > index 54e64343d..60ac8b152 100644 > --- a/README > +++ b/README > @@ -18,7 +18,7 @@ to build everything and > > to install it. When you start using PTXdist, make sure your $PATH > environment variable points to /bin, because that's where > -the ptxdist frontend program is being installed to. > +the PTXdist frontend program is being installed to. > > For developers who want to work with git versions of PTXdist it is only > necessary to run "./autogen.sh && ./configure && make" and set the PATH > @@ -39,7 +39,7 @@ and you'll find a root tree in ./platform-/root/, and > disk images > in ./platform-/images/. Voilà. > > All magic necessary to do these things in a cross enviroment are written > -into "recipies", living in rules/*.make, and config menues in > +into "recipes", living in rules/*.make, and config menues in > rules/*.in. > > Documentation > -- > 2.20.1 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] fbgrab: remove from staging
Signed-off-by: Roland Hieber --- rules/fbgrab.in | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/rules/fbgrab.in b/rules/fbgrab.in index dfa83fa4e477..909b10da38bd 100644 --- a/rules/fbgrab.in +++ b/rules/fbgrab.in @@ -1,6 +1,4 @@ -## SECTION=staging -## old section: -### SECTION=multimedia_framebuffer +# SECTION=multimedia_framebuffer config FBGRAB select LIBPNG @@ -11,7 +9,3 @@ config FBGRAB linux framebuffer and converting it to a png-picture. For details see: https://github.com/GunnarMonell/fbgrab - - STAGING: remove in ptxdist-2021.04.0 - Old version, broken download and obsolete. There is a new version - on gitub that could be used. -- 2.26.0.rc2 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] fbgrab: version bump 1.0 -> 1.3.1
The old URL is broken, but the new GitHub project doesn't have the old releases, so bump the version. When the rule file is evaluated, the cross pkg-config wrapper may not exist yet, which will lead to confusing error messages during the build. But it turns out that calling pkg-config is not actually necessary because libpng is installed to the standard locations, and fbgrab builds just fine using '-lpng -lz' in its Makefile. Also set FBGRAB_CONF_TOOL for uniformity across rule files. fbgrab.c only says "This program is free Software, see the COPYING file". COPYING contains a GPL-2.0 license text, therefore the "-only" part is inferred. Reported-by: Felicitas Jung Signed-off-by: Roland Hieber --- rules/fbgrab.make | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/rules/fbgrab.make b/rules/fbgrab.make index eb05a024e4d4..ea7f07f6000a 100644 --- a/rules/fbgrab.make +++ b/rules/fbgrab.make @@ -15,22 +15,29 @@ PACKAGES-$(PTXCONF_FBGRAB) += fbgrab # # Paths and names # -FBGRAB_VERSION := 1.0 -FBGRAB_MD5 := 7af4d8774684182ed690d5da82d6d234 +FBGRAB_VERSION := 1.3.1 +FBGRAB_MD5 := d2f1f9a096954c252335317216dcd501 FBGRAB := fbgrab-$(FBGRAB_VERSION) FBGRAB_SUFFIX := tar.gz -FBGRAB_URL := http://fbgrab.monells.se/$(FBGRAB).$(FBGRAB_SUFFIX) +FBGRAB_URL := https://github.com/GunnarMonell/fbgrab/archive/$(FBGRAB_VERSION).$(FBGRAB_SUFFIX) FBGRAB_SOURCE := $(SRCDIR)/$(FBGRAB).$(FBGRAB_SUFFIX) FBGRAB_DIR := $(BUILDDIR)/$(FBGRAB) +FBGRAB_LICENSE := GPL-2.0-only +FBGRAB_LICENSE_FILES := \ + file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \ + file://fbgrab.c;startline=6;endline=6;md5=03e379b2e488fbda4e42aa556e9cec93 + +# +# Prepare +# + +FBGRAB_CONF_TOOL := NO # # Compile # -# overwrite some vars in the makefile -FBGRAB_MAKE_OPT= \ - $(CROSS_ENV_CC) \ - LDLIBS='`eval PATH=$(CROSS_PATH) $(CROSS_PKG_CONFIG) --libs libpng`' +FBGRAB_MAKE_ENV := $(CROSS_ENV_CC) # # Target-Install -- 2.26.0.rc2 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 2/2] fbgrab: version bump 1.0 -> 1.3.1
The old URL is broken, but the new GitHub project doesn't have the old
releases, so bump the version.
Remove patches, the respective issues have been fixed upstream.
When the rule file is evaluated, the cross pkg-config wrapper may not
exist yet, which will lead to confusing error messages during the build.
But it turns out that calling pkg-config is not actually necessary
because libpng is installed to the standard locations, and fbgrab builds
just fine using '-lpng -lz' in its Makefile.
Also set FBGRAB_CONF_TOOL for uniformity across rule files.
fbgrab.c only says "This program is free Software, see the COPYING
file". COPYING contains a GPL-2.0 license text, therefore the "-only"
part is inferred.
Reported-by: Felicitas Jung
Signed-off-by: Roland Hieber
---
...ake-makefile-cross-compilation-aware.patch | 37 ---
.../0002-fbgrab-include-zlib.h.patch | 24
patches/fbgrab-1.0/series | 5 ---
rules/fbgrab.make | 21 +++
4 files changed, 14 insertions(+), 73 deletions(-)
delete mode 100644
patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch
delete mode 100644 patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch
delete mode 100644 patches/fbgrab-1.0/series
diff --git
a/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch
b/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch
deleted file mode 100644
index e783991b3289..
--- a/patches/fbgrab-1.0/0001-make-makefile-cross-compilation-aware.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Roland Hostettler
-Date: Tue, 16 Aug 2011 17:35:19 +0200
-Subject: [PATCH] make makefile cross compilation aware
-
-The upstream makefile is not usable for cross compilation.
-[wsa] Simplified 'strip' support
-
-Signed-off-by: Robert Schwebel
-Signed-off-by: Wolfram Sang
- Makefile | 11 +--
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 14c63cb..8ae5dc8 100644
a/Makefile
-+++ b/Makefile
-@@ -4,13 +4,12 @@
- ###
-
- fbgrab: fbgrab.c
-- splint +posixlib fbgrab.c
-- gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
-+# splint +posixlib fbgrab.c
-+ ${CC} ${CPPFLAGS} fbgrab.c ${LDLIBS} -o fbgrab
-
- install:
-- strip fbgrab
-- install fbgrab /usr/bin/fbgrab
-- install fbgrab.1.man /usr/man/man1/fbgrab.1
-+ install -s fbgrab ${DESTDIR}/usr/bin/fbgrab
-+ install fbgrab.1.man ${DESTDIR}/usr/man/man1/fbgrab.1
-
- clean:
-- rm -f fbgrab *~ \#*\#
-\ No newline at end of file
-+ rm -f fbgrab *~ \#*\#
diff --git a/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch
b/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch
deleted file mode 100644
index 22474f7ca4cb..
--- a/patches/fbgrab-1.0/0002-fbgrab-include-zlib.h.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Robert Schwebel
-Date: Tue, 16 Aug 2011 17:36:49 +0200
-Subject: [PATCH] fbgrab: include zlib.h
-
-Newer libpng versions do not include zlib.h in their api any more, so if
-we use symbols from there, we should include zlib.h directly.
-
-Signed-off-by: Robert Schwebel
- fbgrab.c |1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/fbgrab.c b/fbgrab.c
-index fc89f5a..0c959f6 100644
a/fbgrab.c
-+++ b/fbgrab.c
-@@ -23,6 +23,7 @@
- #include
- #include/* to handle vt changing */
- #include /* PNG lib */
-+#include /* zlib */
- #include /* to handle framebuffer ioctls */
-
- #define VERSION "1.0 beta 1"
diff --git a/patches/fbgrab-1.0/series b/patches/fbgrab-1.0/series
deleted file mode 100644
index 45420ced9d62..
--- a/patches/fbgrab-1.0/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-make-makefile-cross-compilation-aware.patch
-0002-fbgrab-include-zlib.h.patch
-# 07f6b94abfd5520604fa320ff0fa961c - git-ptx-patches magic
diff --git a/rules/fbgrab.make b/rules/fbgrab.make
index eb05a024e4d4..ea7f07f6000a 100644
--- a/rules/fbgrab.make
+++ b/rules/fbgrab.make
@@ -15,22 +15,29 @@ PACKAGES-$(PTXCONF_FBGRAB) += fbgrab
#
# Paths and names
#
-FBGRAB_VERSION := 1.0
-FBGRAB_MD5 := 7af4d8774684182ed690d5da82d6d234
+FBGRAB_VERSION := 1.3.1
+FBGRAB_MD5 := d2f1f9a096954c252335317216dcd501
FBGRAB := fbgrab-$(FBGRAB_VERSION)
FBGRAB_SUFFIX := tar.gz
-FBGRAB_URL := http://fbgrab.monells.se/$(FBGRAB).$(FBGRAB_SUFFIX)
+FBGRAB_URL :=
https://github.com/GunnarMonell/fbgrab/archive/$(FBGRAB_VERSION).$(FBGRAB_SUFFIX)
FBGRAB_SOURCE := $(SRCDIR)/$(FBGRAB).$(FBGRAB_SUFFIX)
FBGRAB_DIR := $(BUILDDIR)/$(FBGRAB)
+FBGRAB_LICENSE := GPL-2.0-only
+FBGRAB_LICENSE_FILES := \
+ file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \
+
file://fbgrab.c;startline=6;endline=6;md5=03e379b2e488fbda4e42aa556e9cec93
+
+#
[ptxdist] [PATCH v2 1/2] fbgrab: remove from staging
Signed-off-by: Roland Hieber --- rules/fbgrab.in | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/rules/fbgrab.in b/rules/fbgrab.in index dfa83fa4e477..bc8e9cf88f97 100644 --- a/rules/fbgrab.in +++ b/rules/fbgrab.in @@ -1,6 +1,4 @@ -## SECTION=staging -## old section: -### SECTION=multimedia_framebuffer +## SECTION=multimedia_framebuffer config FBGRAB select LIBPNG @@ -11,7 +9,3 @@ config FBGRAB linux framebuffer and converting it to a png-picture. For details see: https://github.com/GunnarMonell/fbgrab - - STAGING: remove in ptxdist-2021.04.0 - Old version, broken download and obsolete. There is a new version - on gitub that could be used. -- 2.26.0.rc2 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] fbgrab: version bump 1.0 -> 1.3.1
On Thu, Apr 09, 2020 at 10:23:26AM +0200, Ladislav Michl wrote: > On Wed, Apr 08, 2020 at 12:56:40PM +0200, Roland Hieber wrote: > > The old URL is broken, but the new GitHub project doesn't have the old > > releases, so bump the version. > > What about reordering patches, just in case someone does bisecting? > This way package is pulled from staging, but still broken... It was already broken before moving it out of staging, so that single patch shouldn't do much difference for bisecting. - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2 1/2] fbgrab: remove from staging
Sorry, forgot to pass --notes to format-patch... here they are: v1 -> v2: - remove old patches - fix SECTION syntax in menu file On Thu, Apr 09, 2020 at 11:11:21AM +0200, Roland Hieber wrote: > Signed-off-by: Roland Hieber > --- > rules/fbgrab.in | 8 +--- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/rules/fbgrab.in b/rules/fbgrab.in > index dfa83fa4e477..bc8e9cf88f97 100644 > --- a/rules/fbgrab.in > +++ b/rules/fbgrab.in > @@ -1,6 +1,4 @@ > -## SECTION=staging > -## old section: > -### SECTION=multimedia_framebuffer > +## SECTION=multimedia_framebuffer > > config FBGRAB > select LIBPNG > @@ -11,7 +9,3 @@ config FBGRAB > linux framebuffer and converting it to a png-picture. > > For details see: https://github.com/GunnarMonell/fbgrab > - > - STAGING: remove in ptxdist-2021.04.0 > - Old version, broken download and obsolete. There is a new version > - on gitub that could be used. > -- > 2.26.0.rc2 > > > ___________ > ptxdist mailing list > ptxdist@pengutronix.de > -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] fbgrab: version bump 1.0 -> 1.3.1
On Thu, Apr 09, 2020 at 02:41:30PM +0200, Ladislav Michl wrote: > On Thu, Apr 09, 2020 at 11:15:33AM +0200, Roland Hieber wrote: > > On Thu, Apr 09, 2020 at 10:23:26AM +0200, Ladislav Michl wrote: > > > On Wed, Apr 08, 2020 at 12:56:40PM +0200, Roland Hieber wrote: > > > > The old URL is broken, but the new GitHub project doesn't have the old > > > > releases, so bump the version. > > > > > > What about reordering patches, just in case someone does bisecting? > > > This way package is pulled from staging, but still broken... > > > > It was already broken before moving it out of staging, so that single > > Sure, that's why it was moved to staging. > > > patch shouldn't do much difference for bisecting. > > That "much difference" above is read as "create _yet_ another point of > brokeness" ;-) In principle I agree with you, but I only saw your comment after sending out the v2. Maybe mol can fix it up during applying. - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/4] libwpe: new package
On Wed, Apr 08, 2020 at 09:29:59PM +0200, Lucas Stach wrote: > General-purpose library for the WebPlatformForEmbedded-flavored port of > WebKit. > > Signed-off-by: Lucas Stach > --- > rules/libwpe.in | 12 + > rules/libwpe.make | 63 +++ > 2 files changed, 75 insertions(+) > create mode 100644 rules/libwpe.in > create mode 100644 rules/libwpe.make > > diff --git a/rules/libwpe.in b/rules/libwpe.in > new file mode 100644 > index ..6b566d06a5c9 > --- /dev/null > +++ b/rules/libwpe.in > @@ -0,0 +1,12 @@ > +## SECTION=system_libraries > + > +config LIBWPE > + tristate > + prompt "libwpe" > + select HOST_CMAKE > + select HOST_NINJA > + select MESALIB > + select MESALIB_EGL > + select LIBXKBCOMMON > + help > + General-purpose library for the WebPlatformForEmbedded-flavored port > of WebKit. > diff --git a/rules/libwpe.make b/rules/libwpe.make > new file mode 100644 > index ..cc24f995db48 > --- /dev/null > +++ b/rules/libwpe.make > @@ -0,0 +1,63 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2018 by Steffen Trumtrar > +# > +# See CREDITS for details about who has contributed to this project. Please remove, as always. - Roland > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_LIBWPE) += libwpe > + > +# > +# Paths and names > +# > +LIBWPE_VERSION := 1.6.0 > +LIBWPE_LIBRARY_VERSION := 1.0 > +LIBWPE_MD5 := 6e8a2c279dcc3617db5ec7ac4c03d628 > +LIBWPE := libwpe-$(LIBWPE_VERSION) > +LIBWPE_SUFFIX:= tar.xz > +LIBWPE_URL := > https://wpewebkit.org/releases/$(LIBWPE).$(LIBWPE_SUFFIX) > +LIBWPE_SOURCE:= $(SRCDIR)/$(LIBWPE).$(LIBWPE_SUFFIX) > +LIBWPE_DIR := $(BUILDDIR)/$(LIBWPE) > +LIBWPE_LICENSE := BSD-2-Clause > +LIBWPE_LICENSE_FILES := file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc > + > +# > > +# Prepare > +# > > + > +# > +# cmake > +# > +LIBWPE_CONF_TOOL := cmake > +LIBWPE_CONF_OPT := \ > + $(CROSS_CMAKE_USR) \ > + -G Ninja \ > + -DBUILD_DOCS=OFF \ > + -DWPE_BACKEND= \ > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/libwpe.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, libwpe) > + @$(call install_fixup, libwpe,PRIORITY,optional) > + @$(call install_fixup, libwpe,SECTION,base) > + @$(call install_fixup, libwpe,AUTHOR,"Steffen Trumtrar > ") > + @$(call install_fixup, libwpe,DESCRIPTION,missing) > + > + @$(call install_lib, libwpe, 0, 0, 0644, > libwpe-$(LIBWPE_LIBRARY_VERSION)) > + > + @$(call install_finish, libwpe) > + > + @$(call touch) > + > +# vim: syntax=make > -- > 2.20.1 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] binutils: add license information
On Fri, Apr 17, 2020 at 09:39:35AM +0200, Michael Tretter wrote: > On Fri, Apr 17, 2020 at 08:47:34AM +0200, Michael Olbrich wrote: > > On Thu, Apr 16, 2020 at 10:43:19AM +0200, Michael Tretter wrote: > > > Signed-off-by: Michael Tretter > > > --- > > > rules/binutils.make | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/rules/binutils.make b/rules/binutils.make > > > index ca1080bc811d..094347e3f8bf 100644 > > > --- a/rules/binutils.make > > > +++ b/rules/binutils.make > > > @@ -22,6 +22,7 @@ BINUTILS_SUFFIX := tar.bz2 > > > BINUTILS_URL := $(call ptx/mirror, GNU, > > > binutils/$(BINUTILS).$(BINUTILS_SUFFIX)) > > > BINUTILS_SOURCE := $(SRCDIR)/$(BINUTILS).$(BINUTILS_SUFFIX) > > > BINUTILS_DIR := $(BUILDDIR)/$(BINUTILS) > > > +BINUTILS_LICENSE := GPL-2.0-or-later AND GPL-3.0-or-later AND > > > LGPL-2.0-or-later AND LGPL-3.0-or-later > > > > No. The version is derived from the toolchain, so we cannot be sure that > > this is always correct. What we need to do is export the license > > information in the toolchain and import it here when possible. We already > > do the same thing for glibc and gcclibs. > > Hm. The difference between glibc/gcclibs and the binutils is that for binutils > only the version is extracted from the toolchain and the binutils are build > from source in the BSP. Thus, we could also extract the license information > from the downloaded source code, which would be the same license as in the > toolchain. I'm not sure if this is actually simpler than exporting the > license information in the toolchain. In any case, the respective _LICENSE_FILES variable should be set somewhere too. - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] host-mfgtools: version bump 1.3.167 -> 1.3.169
On Tue, Apr 21, 2020 at 10:15:01AM +, Denis Osterland-Heim wrote:
> Signed-off-by: Denis Osterland-Heim
> ---
> Hi,
>
> the 167 source tarball has two toplevel directories, one with the git
> submodule content and one without. This was an accident by upstream and
> is fixed in 169. It worked on my machine but on older machines (Ubuntu
> 16.04) it failed because of mv can not override directories.
> I am not sure why it works on my PC.
Michael already pushed a fix for this on master in commit
e5d4c7c479293eb34345 ("host-mfgtools: fix random extract failures") by
handling it in the extract stage. Please rebase onto the current master
to test the version bump, and test if the extract step is still needed :)
- Roland
>
> Regards Denis
>
> rules/host-mfgtools.make | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/rules/host-mfgtools.make b/rules/host-mfgtools.make
> index fd8966548..d40017458 100644
> --- a/rules/host-mfgtools.make
> +++ b/rules/host-mfgtools.make
> @@ -11,8 +11,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MFGTOOLS) += host-mfgtools
> #
> # Paths and names
> #
> -HOST_MFGTOOLS_VERSION:= 1.3.167
> -HOST_MFGTOOLS_MD5:= 08fba433dd11525c9b425ad1ff91b85b
> +HOST_MFGTOOLS_VERSION:= 1.3.169
> +HOST_MFGTOOLS_MD5:= 957655df30b80ed8cdff217544af6136
> HOST_MFGTOOLS:= mfgtools-$(HOST_MFGTOOLS_VERSION)
> HOST_MFGTOOLS_SUFFIX := tar.gz
> HOST_MFGTOOLS_URL:=
> https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(HOST_MFGTOOLS_VERSION)/uuu_source-$(HOST_MFGTOOLS_VERSION).$(HOST_MFGTOOLS_SUFFIX)
> --
> 2.26.2
>
>
>
> 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.
> - Informationen zum Datenschutz, insbesondere zu Ihren Rechten, erhalten Sie
> unter https://www.diehl.com/group/de/transparenz-und-informationspflichten/
>
> 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.
> - For general information on data protection and your respective rights
> please visit
> https://www.diehl.com/group/en/transparency-and-information-obligations/
>
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany| Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH] doc: daily_work: fix "title underline too short" warning
Signed-off-by: Roland Hieber --- doc/daily_work.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/daily_work.inc b/doc/daily_work.inc index bb9f8af659ac..a37aac4c3339 100644 --- a/doc/daily_work.inc +++ b/doc/daily_work.inc @@ -1301,7 +1301,7 @@ non-interactive user, e.g. a different application. .. _external_dependencies_variants: Controlling Package Dependencies in more Detail --- +--- In section :ref:`external_dependencies` a simple method is shown how to define an external package dependency a particular package can have in order to build -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] python: move to staging
Use of Python 2 has been widely discouraged for some years [citation needed], and remaining users should start migrating to Python 3 [1]. Move Python 2 to staging to reflect that. [1]: https://www.python.org/dev/peps/pep-0404/#id13 Signed-off-by: Roland Hieber -- v2: - adapt removal date after final python v2.7.18 release - only move the python package for now. all reverse dependencies will depend on STAGING for now; we can find out later whether they build with python3 too. --- rules/python.in | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rules/python.in b/rules/python.in index 75390188876e..7afc622b9786 100644 --- a/rules/python.in +++ b/rules/python.in @@ -1,4 +1,6 @@ -## SECTION=scripting_languages +## SECTION=staging +## old section: +### SECTION=scripting_languages menuconfig PYTHON tristate "python" @@ -25,6 +27,9 @@ menuconfig PYTHON comes with extensive standard libraries, and can be learned in a few days. + STAGING: remove in PTXdist 2021.05.0 due to Python 2 End-of-Life: + <https://mail.python.org/archives/list/python-announce-l...@python.org/thread/OFCIETIXLX34X7FVK5B5WPZH22HXV342/>. + if PYTHON config PYTHON_NCURSES -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] doc: ref_make_variables: link to the SPDX license list
Signed-off-by: Roland Hieber --- doc/ref_make_variables.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/ref_make_variables.inc b/doc/ref_make_variables.inc index b770b1b49f18..56912bb2e364 100644 --- a/doc/ref_make_variables.inc +++ b/doc/ref_make_variables.inc @@ -223,7 +223,8 @@ Package Definition 'gdbserver' for an example. ``_LICENSE`` - The license of the package. The SPDX license identifiers should be used + The license of the package. + An `SPDX license identifier <https://spdx.org/licenses/>`_ should be used here. Use ``proprietary`` for proprietary packages and ``ignore`` for packages without their own license, e.g. meta packages or packages that only install files from ``projectroot/``. -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] doc: working with licensing information in packages
Co-authored-by: Felicitas Jung Signed-off-by: Felicitas Jung Signed-off-by: Roland Hieber --- doc/contributing.rst| 5 + doc/daily_work.inc | 2 + doc/daily_work_licenses.inc | 208 doc/ref_make_variables.inc | 4 + 4 files changed, 219 insertions(+) create mode 100644 doc/daily_work_licenses.inc diff --git a/doc/contributing.rst b/doc/contributing.rst index 705f01377d32..7352b46dfcf0 100644 --- a/doc/contributing.rst +++ b/doc/contributing.rst @@ -90,6 +90,11 @@ For new packages, the generated templates contain commented-out default sections. These are meant as a helper to simplify creating custom stages. Any remaining default stages must be removed. +New packages should also have licensing information in the ``_LICENSE`` +and ``_LICENSE_FILES`` variables. +Refer to the section :ref:`licensing_in_packages` for more information. + + Helper Scripts -- diff --git a/doc/daily_work.inc b/doc/daily_work.inc index a37aac4c3339..f68d25bf7cb5 100644 --- a/doc/daily_work.inc +++ b/doc/daily_work.inc @@ -1472,3 +1472,5 @@ be enabled. A used mount option of the overlayfs in the default newer. If your kernel does not meet this requirement you can provide your own local and adapted variant of the mentioned mount unit. + +.. include:: daily_work_licenses.inc diff --git a/doc/daily_work_licenses.inc b/doc/daily_work_licenses.inc new file mode 100644 index ..7e90b7ba541d --- /dev/null +++ b/doc/daily_work_licenses.inc @@ -0,0 +1,208 @@ +.. _licensing_in_packages: + +Tracking licensing information in packages +-- + +PTXdist aims to track licensing information for every package. +This includes the license(s) under which a package can be distributed, +as well as the respective files in the package's source tree that state those terms. +Sadly there is no widely adopted standard for machine-readable licensing +information in source code (`yet <https://reuse.software>`_), +so here are a few hints where to look. + +There are many older package rules in PTXdist which don't specify licensing information. +If you want to help complete the database, +you can use ``grep -L _LICENSE_FILES rules/*.make`` (in the PTXdist tree) to find those rules. +Note however that this cannot find wrong or incomplete licensing information. + +Finding licensing information +~ + +You should first select and extract the package in question, and then have a +look at in the extracted package sources (usually something like +``platform-nnn/build-target/mypackage-1.0`` in your BSP, if in doubt see +``ptxdist package-info mypackage``). + +* Check for files named ``COPYING``, ``COPYRIGHT``, or ``LICENSE``. + These often only contain the license text and, in case of GPL, no information + if the code is available under the *-only* or *-or-later* variant. + Sometimes these files are in a folder ``/doc`` or ``/legal``. + +* Check the ``README``, if there is any. + Often there is important information there, e.g. in case of GPL if the + software is *GPL-x.x-or-later* or *GPL-x.x-only*. + +* Check some relevant-sounding files, like ``main.c`` for license headers. + Often additional information can be found here. + +* If you want to be extra sure, use a license compliance toolchain (e.g. + `FOSSology <https://www.fossology.org/>`__) on the project. + +On the other hand, there are some things that can be ignored for our purposes: + +* Everything that is auto-generated, either by a script in the project source, + or by the build system previous to packaging. + The generator itself cannot hold copyright, although the authors of the + templates used for the generation or the authors of the generator can. + +* Most files belonging to the build system don't make it into the compiled code + and can therefore be ignored (e.g. configure scripts, Makefiles). + These cases sometimes can be hard to detect – if unsure, include the file in + your research. + +Distillation down to license identifiers + + +We use the `SPDX license identifiers <https://spdx.org/licenses/>`_. + +Either the license is clear, e.g. because it says "GPL 2.0" (roughly check the +license content to be sure), or you can use tools like +`FOSSology <https://www.fossology.org>`__, +`licensecheck <https://wiki.debian.org/CopyrightReviewTools#Command-line_tools_in_Debian>`_, +or `spdx-license-match <https://github.com/rohieb/spdx-license-match>`_ +to detect license material in the project. + +License texts don't have to match exactly, you should apply the +`SPDX Matching Guidelines <https://spdx.org/spdx-license-list/matching-guidelines>`_ +accordingly. +The important part here is that the project's license and the SPDX identifier +describe the same licensing terms. +"Rather close" or "mostly si
[ptxdist] [PATCH] ptxd_make_world_prepare: fix typo in error message
The package name in the line above was moved from host-python to
host-python3, but the same change in the error message was forgotten.
Fixes: 8d02a8a6e3891da78c8c ("host-python-scons: switch to python3")
Signed-off-by: Roland Hieber
---
scripts/lib/ptxd_make_world_prepare.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/lib/ptxd_make_world_prepare.sh
b/scripts/lib/ptxd_make_world_prepare.sh
index be2a131e4830..9ba2e78e26fb 100644
--- a/scripts/lib/ptxd_make_world_prepare.sh
+++ b/scripts/lib/ptxd_make_world_prepare.sh
@@ -206,7 +206,7 @@ ptxd_make_world_prepare() {
;;
scons)
if ! [[ "${pkg_build_deps}" =~ "host-python3-${pkg_conf_tool}" ]];
then
- ptxd_bailout "'${pkg_label}' uses '${pkg_conf_tool}' but does
not select 'host-python-${pkg_conf_tool}'"
+ ptxd_bailout "'${pkg_label}' uses '${pkg_conf_tool}' but does
not select 'host-python3-${pkg_conf_tool}'"
fi
;;
esac
--
2.26.2
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] ptxd_lib_dgen: optimize ordering only when packages are being fully built
There are use cases where -j is useful to have on the command line to
speed up runs with large amount of packages, but when targetinstall
stages are not needed at all. For example:
ptxdist -j license-check
ptxdist -j make license-report
ptxdist -j extract
Commit 2e695987211c2c2e6e19 ("ptxd_lib_dgen: add order-only dependency
to extract") introduced better interleaving of extract stages to
optimise IO load during full builds. This also had the effect that in
the above cases all targetinstall stages of dependencies were built too,
even when they are not needed at all. Improve that use case by adding a
flag in the environment and only set it in case of 'ptxdist go',
'ptxdist images' or 'ptxdist image '.
Signed-off-by: Roland Hieber
---
bin/ptxdist | 3 +++
scripts/lib/ptxd_lib_dgen.awk | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/bin/ptxdist b/bin/ptxdist
index 4a372ff6392c..6034d170fcdc 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -1764,10 +1764,12 @@ EOF
exit
;;
go|images)
+ PTXDIST_OPTIMIZE_IO=true
do_${cmd}
exit
;;
image)
+ PTXDIST_OPTIMIZE_IO=true
if [ ${#} -eq 0 ]; then
echo "No image given."
exit 1
@@ -2564,6 +2566,7 @@ setup_export() {
PTXDIST_ICECC_CREATE_ENV \
PTXDIST_LOG_PROMPT \
PTXDIST_OUTPUT_SYNC \
+ PTXDIST_OPTIMIZE_IO \
PTXDIST_DIRTY \
PTXDIST_FORCE \
PTXDIST_PEDANTIC \
diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk
index 8ee88827b1f8..8c09c531129e 100644
--- a/scripts/lib/ptxd_lib_dgen.awk
+++ b/scripts/lib/ptxd_lib_dgen.awk
@@ -17,6 +17,7 @@ BEGIN {
DGEN_DEPS_PRE = ENVIRON["PTX_DGEN_DEPS_PRE"];
DGEN_DEPS_POST = ENVIRON["PTX_DGEN_DEPS_POST"];
DGEN_RULESFILES_MAKE= ENVIRON["PTX_DGEN_RULESFILES_MAKE"];
+ OPTIMIZE_IO = ENVIRON["PTXDIST_OPTIMIZE_IO"]
PTXDIST_TEMPDIR = ENVIRON["PTXDIST_TEMPDIR"];
PARALLEL= ENVIRON["PTXDIST_PARALLELMFLAGS_EXTERN"]
DIRTY = ENVIRON["PTXDIST_DIRTY"];
@@ -503,7 +504,7 @@ function write_deps_pkg_active(this_PKG, this_pkg, prefix) {
for (i = 1; i <= n; i++) {
this_dep = PKG_to_pkg[this_DEP_array[i]]
- if (PARALLEL != "-j1")
+ if (PARALLEL != "-j1" && OPTIMIZE_IO == "true")
print "$(STATEDIR)/" this_pkg ".extract:| "
"$(STATEDIR)/" this_dep ".install.post" > DGEN_DEPS_POST;
print "$(STATEDIR)/" this_pkg ".extract.post:" DEP "
$(STATEDIR)/" this_dep ".install.post" > DGEN_DEPS_POST;
print "$(STATEDIR)/" this_pkg ".install.unpack:" DEP "
$(STATEDIR)/" this_dep ".install.post" > DGEN_DEPS_POST;
@@ -545,7 +546,7 @@ function write_deps_pkg_active_virtual(this_PKG, this_pkg,
prefix) {
else
virtual = "base";
}
- if (PARALLEL != "-j1")
+ if (PARALLEL != "-j1" && OPTIMIZE_IO == "true")
print "$(STATEDIR)/" this_pkg ".extract:| "
"$(STATEDIR)/" virtual ".install"> DGEN_DEPS_POST;
print "$(STATEDIR)/" this_pkg ".extract.post:" DEP "
$(STATEDIR)/" virtual ".install"> DGEN_DEPS_POST;
print "$(STATEDIR)/" this_pkg ".install.unpack:" DEP "
$(STATEDIR)/" virtual ".install"> DGEN_DEPS_POST;
--
2.26.2
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] ptxdist: add licensecheck command
Make it possible to check all MD5 sums of license files by building all
report stages without also building the license report (which produces
tons of LaTeX output).
Signed-off-by: Roland Hieber
---
bin/ptxdist | 6 ++
doc/ref_parameter.inc| 3 +++
rules/post/ptxd_make_license_report.make | 2 ++
3 files changed, 11 insertions(+)
diff --git a/bin/ptxdist b/bin/ptxdist
index 1e10c08d47f2..4a372ff6392c 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -752,6 +752,7 @@ Misc:
it is known by "make"
printnext assumes that the contents of is another
variable and print the contents of this variable
+ licensecheck check md5sums of license files for all packages
list-packagesprint a list of all selected packages
local-src []overwrite a package source with a
locally provided
directory containing the sourcecode.
@@ -1776,6 +1777,11 @@ EOF
ptxd_make_log "${images[@]}"
exit
;;
+ licensecheck)
+ check_premake_compiler &&
+ ptxd_make_log report
+ exit
+ ;;
list-packages)
check_config &&
check_deps || return
diff --git a/doc/ref_parameter.inc b/doc/ref_parameter.inc
index 74689b9d3cff..aaac8956f147 100644
--- a/doc/ref_parameter.inc
+++ b/doc/ref_parameter.inc
@@ -234,6 +234,9 @@ Misc Actions
contents of this variable. Shell variables are currently not checked here.
All other rules for ``print`` apply.
+``licensecheck``
+ For all selected packages, check the MD5 sums of license files.
+
``list-packages``
print a list of all selected packages. This list does not include the
host and cross tools.
diff --git a/rules/post/ptxd_make_license_report.make
b/rules/post/ptxd_make_license_report.make
index 47dc176668d0..1a13c3ad4964 100644
--- a/rules/post/ptxd_make_license_report.make
+++ b/rules/post/ptxd_make_license_report.make
@@ -15,6 +15,8 @@ PTX_PACKAGES_TARGET := \
$(PTX_PACKAGES_INSTALL) \
$(EXTRA_PACKAGES)
+report: $(addprefix $(STATEDIR)/,$(addsuffix .report,$(PTX_PACKAGES_SELECTED)))
+
PHONY += license-report
license-report: \
--
2.26.2
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] ptxd_lib_dgen: optimize ordering only when packages are being fully built
On Mon, May 25, 2020 at 11:28:20AM +0200, Roland Hieber wrote:
> There are use cases where -j is useful to have on the command line to
> speed up runs with large amount of packages, but when targetinstall
> stages are not needed at all. For example:
>
> ptxdist -j license-check
> ptxdist -j make license-report
> ptxdist -j extract
>
> Commit 2e695987211c2c2e6e19 ("ptxd_lib_dgen: add order-only dependency
> to extract") introduced better interleaving of extract stages to
> optimise IO load during full builds. This also had the effect that in
gah, optimise... optimize... one reason why I had to debug my own patch
for one hour this morning... ^^ (well, not important here :))
- Roland
> the above cases all targetinstall stages of dependencies were built too,
> even when they are not needed at all. Improve that use case by adding a
> flag in the environment and only set it in case of 'ptxdist go',
> 'ptxdist images' or 'ptxdist image '.
>
> Signed-off-by: Roland Hieber
> ---
> bin/ptxdist | 3 +++
> scripts/lib/ptxd_lib_dgen.awk | 5 +++--
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/bin/ptxdist b/bin/ptxdist
> index 4a372ff6392c..6034d170fcdc 100755
> --- a/bin/ptxdist
> +++ b/bin/ptxdist
> @@ -1764,10 +1764,12 @@ EOF
> exit
> ;;
> go|images)
> + PTXDIST_OPTIMIZE_IO=true
> do_${cmd}
> exit
> ;;
> image)
> + PTXDIST_OPTIMIZE_IO=true
> if [ ${#} -eq 0 ]; then
> echo "No image given."
> exit 1
> @@ -2564,6 +2566,7 @@ setup_export() {
> PTXDIST_ICECC_CREATE_ENV \
> PTXDIST_LOG_PROMPT \
> PTXDIST_OUTPUT_SYNC \
> + PTXDIST_OPTIMIZE_IO \
> PTXDIST_DIRTY \
> PTXDIST_FORCE \
> PTXDIST_PEDANTIC \
> diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk
> index 8ee88827b1f8..8c09c531129e 100644
> --- a/scripts/lib/ptxd_lib_dgen.awk
> +++ b/scripts/lib/ptxd_lib_dgen.awk
> @@ -17,6 +17,7 @@ BEGIN {
> DGEN_DEPS_PRE = ENVIRON["PTX_DGEN_DEPS_PRE"];
> DGEN_DEPS_POST = ENVIRON["PTX_DGEN_DEPS_POST"];
> DGEN_RULESFILES_MAKE= ENVIRON["PTX_DGEN_RULESFILES_MAKE"];
> + OPTIMIZE_IO = ENVIRON["PTXDIST_OPTIMIZE_IO"]
> PTXDIST_TEMPDIR = ENVIRON["PTXDIST_TEMPDIR"];
> PARALLEL= ENVIRON["PTXDIST_PARALLELMFLAGS_EXTERN"]
> DIRTY = ENVIRON["PTXDIST_DIRTY"];
> @@ -503,7 +504,7 @@ function write_deps_pkg_active(this_PKG, this_pkg,
> prefix) {
> for (i = 1; i <= n; i++) {
> this_dep = PKG_to_pkg[this_DEP_array[i]]
>
> - if (PARALLEL != "-j1")
> + if (PARALLEL != "-j1" && OPTIMIZE_IO == "true")
> print "$(STATEDIR)/" this_pkg ".extract:| "
> "$(STATEDIR)/" this_dep ".install.post" > DGEN_DEPS_POST;
> print "$(STATEDIR)/" this_pkg ".extract.post:" DEP "
> $(STATEDIR)/" this_dep ".install.post" > DGEN_DEPS_POST;
> print "$(STATEDIR)/" this_pkg ".install.unpack:" DEP "
> $(STATEDIR)/" this_dep ".install.post" > DGEN_DEPS_POST;
> @@ -545,7 +546,7 @@ function write_deps_pkg_active_virtual(this_PKG,
> this_pkg, prefix) {
> else
> virtual = "base";
> }
> - if (PARALLEL != "-j1")
> + if (PARALLEL != "-j1" && OPTIMIZE_IO == "true")
> print "$(STATEDIR)/" this_pkg ".extract:| "
> "$(STATEDIR)/" virtual ".install"> DGEN_DEPS_POST;
> print "$(STATEDIR)/" this_pkg ".extract.post:" DEP "
> $(STATEDIR)/" virtual ".install"> DGEN_DEPS_POST;
> print "$(STATEDIR)/" this_pkg ".install.unpack:" DEP "
> $(STATEDIR)/" virtual ".install"> DGEN_DEPS_POST;
> --
> 2.26.2
>
>
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany| Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH v2 2/2] ptxd_lib_dgen: optimize ordering only when dependencies are needed
There are use cases where -j is useful to have on the command line to
speed up runs with large amount of packages, but when the install stages
are not needed at all. For example:
ptxdist -j license-check
ptxdist -j make license-report
ptxdist -j extract
Commit 2e695987211c2c2e6e19 ("ptxd_lib_dgen: add order-only dependency
to extract") introduced better interleaving of extract stages to
optimize IO load during full builds. This also had the effect that in
the above cases all install stages of dependencies were built too, even
when they are not needed at all.
Improve those use cases by only optimizing the extract stage ordering if
at least the prepare stage(s) of the packages being requested are needed
(since the prepare stage depends on the install stages of dependencies,
those will be needed anyway).
Signed-off-by: Roland Hieber
---
v2: also set PTXDIST_OPTIMIZE_IO in prepare, compile, install,
targetinstall, tags, nfsroot; and adapt log message accordingly
On Mon, May 25, 2020 at 02:47:33PM +0200, Michael Olbrich wrote:
> Hmmm, I think anything, that includes prepare stages should get this flag.
> Or maybe reverse the logic and flag commands where this should be skipped.
> I don't know which would be easier.
>
> Michael
Like this?
A positive list is still easier :)
- Roland
---
bin/ptxdist | 9 -
scripts/lib/ptxd_lib_dgen.awk | 5 +++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/bin/ptxdist b/bin/ptxdist
index 4a372ff6392c..0d85c1290868 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -1579,7 +1579,10 @@ parse_second()
standard target, directly into make
- extract|prepare|compile|install|targetinstall|tags)
+ prepare|compile|install|targetinstall|tags)
+ PTXDIST_OPTIMIZE_IO=true
+ ;& # fallthrough
+ extract)
local cmd_post
declare -a pkgs
@@ -1764,10 +1767,12 @@ EOF
exit
;;
go|images)
+ PTXDIST_OPTIMIZE_IO=true
do_${cmd}
exit
;;
image)
+ PTXDIST_OPTIMIZE_IO=true
if [ ${#} -eq 0 ]; then
echo "No image given."
exit 1
@@ -1823,6 +1828,7 @@ EOF
exit
;;
nfsroot)
+ PTXDIST_OPTIMIZE_IO=true
check_premake_compiler &&
ptxd_make_log ptxd_make_nfsd
exit
@@ -2564,6 +2570,7 @@ setup_export() {
PTXDIST_ICECC_CREATE_ENV \
PTXDIST_LOG_PROMPT \
PTXDIST_OUTPUT_SYNC \
+ PTXDIST_OPTIMIZE_IO \
PTXDIST_DIRTY \
PTXDIST_FORCE \
PTXDIST_PEDANTIC \
diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk
index 8ee88827b1f8..8c09c531129e 100644
--- a/scripts/lib/ptxd_lib_dgen.awk
+++ b/scripts/lib/ptxd_lib_dgen.awk
@@ -17,6 +17,7 @@ BEGIN {
DGEN_DEPS_PRE = ENVIRON["PTX_DGEN_DEPS_PRE"];
DGEN_DEPS_POST = ENVIRON["PTX_DGEN_DEPS_POST"];
DGEN_RULESFILES_MAKE= ENVIRON["PTX_DGEN_RULESFILES_MAKE"];
+ OPTIMIZE_IO = ENVIRON["PTXDIST_OPTIMIZE_IO"]
PTXDIST_TEMPDIR = ENVIRON["PTXDIST_TEMPDIR"];
PARALLEL= ENVIRON["PTXDIST_PARALLELMFLAGS_EXTERN"]
DIRTY = ENVIRON["PTXDIST_DIRTY"];
@@ -503,7 +504,7 @@ function write_deps_pkg_active(this_PKG, this_pkg, prefix) {
for (i = 1; i <= n; i++) {
this_dep = PKG_to_pkg[this_DEP_array[i]]
- if (PARALLEL != "-j1")
+ if (PARALLEL != "-j1" && OPTIMIZE_IO == "true")
print "$(STATEDIR)/" this_pkg ".extract:| "
"$(STATEDIR)/" this_dep ".install.post" > DGEN_DEPS_POST;
print "$(STATEDIR)/" this_pkg ".extract.post:" DEP "
$(STATEDIR)/" this_dep ".install.post" > DGEN_DEPS_POST;
print "$(STATEDIR)/" this_pkg ".install.unpack:" DEP "
$(STATEDIR)/" this_dep ".install.post" > DGEN_DEPS_POST;
@@ -545,7 +546,7 @@ function write_deps_pkg_active_virtual(this_PKG, this_pkg,
prefix) {
else
virtual = "base";
}
- if (PARALLEL != "-j1")
+ if (PARALLEL != "-j1" && OPTIMIZE_IO == "true")
Re: [ptxdist] [PATCH 2/2] doc: working with licensing information in packages
Any comments here? - Roland On Mon, May 11, 2020 at 12:03:06PM +0200, Roland Hieber wrote: > Co-authored-by: Felicitas Jung > Signed-off-by: Felicitas Jung > Signed-off-by: Roland Hieber > --- > doc/contributing.rst| 5 + > doc/daily_work.inc | 2 + > doc/daily_work_licenses.inc | 208 > doc/ref_make_variables.inc | 4 + > 4 files changed, 219 insertions(+) > create mode 100644 doc/daily_work_licenses.inc > > diff --git a/doc/contributing.rst b/doc/contributing.rst > index 705f01377d32..7352b46dfcf0 100644 > --- a/doc/contributing.rst > +++ b/doc/contributing.rst > @@ -90,6 +90,11 @@ For new packages, the generated templates contain > commented-out default > sections. These are meant as a helper to simplify creating custom stages. > Any remaining default stages must be removed. > > +New packages should also have licensing information in the ``_LICENSE`` > +and ``_LICENSE_FILES`` variables. > +Refer to the section :ref:`licensing_in_packages` for more information. > + > + > Helper Scripts > -- > > diff --git a/doc/daily_work.inc b/doc/daily_work.inc > index a37aac4c3339..f68d25bf7cb5 100644 > --- a/doc/daily_work.inc > +++ b/doc/daily_work.inc > @@ -1472,3 +1472,5 @@ be enabled. A used mount option of the overlayfs in the > default > newer. > If your kernel does not meet this requirement you can provide your own local > and adapted variant of the mentioned mount unit. > + > +.. include:: daily_work_licenses.inc > diff --git a/doc/daily_work_licenses.inc b/doc/daily_work_licenses.inc > new file mode 100644 > index ..7e90b7ba541d > --- /dev/null > +++ b/doc/daily_work_licenses.inc > @@ -0,0 +1,208 @@ > +.. _licensing_in_packages: > + > +Tracking licensing information in packages > +-- > + > +PTXdist aims to track licensing information for every package. > +This includes the license(s) under which a package can be distributed, > +as well as the respective files in the package's source tree that state > those terms. > +Sadly there is no widely adopted standard for machine-readable licensing > +information in source code (`yet <https://reuse.software>`_), > +so here are a few hints where to look. > + > +There are many older package rules in PTXdist which don't specify licensing > information. > +If you want to help complete the database, > +you can use ``grep -L _LICENSE_FILES rules/*.make`` (in the PTXdist tree) to > find those rules. > +Note however that this cannot find wrong or incomplete licensing information. > + > +Finding licensing information > +~ > + > +You should first select and extract the package in question, and then have a > +look at in the extracted package sources (usually something like > +``platform-nnn/build-target/mypackage-1.0`` in your BSP, if in doubt see > +``ptxdist package-info mypackage``). > + > +* Check for files named ``COPYING``, ``COPYRIGHT``, or ``LICENSE``. > + These often only contain the license text and, in case of GPL, no > information > + if the code is available under the *-only* or *-or-later* variant. > + Sometimes these files are in a folder ``/doc`` or ``/legal``. > + > +* Check the ``README``, if there is any. > + Often there is important information there, e.g. in case of GPL if the > + software is *GPL-x.x-or-later* or *GPL-x.x-only*. > + > +* Check some relevant-sounding files, like ``main.c`` for license headers. > + Often additional information can be found here. > + > +* If you want to be extra sure, use a license compliance toolchain (e.g. > + `FOSSology <https://www.fossology.org/>`__) on the project. > + > +On the other hand, there are some things that can be ignored for our > purposes: > + > +* Everything that is auto-generated, either by a script in the project > source, > + or by the build system previous to packaging. > + The generator itself cannot hold copyright, although the authors of the > + templates used for the generation or the authors of the generator can. > + > +* Most files belonging to the build system don't make it into the compiled > code > + and can therefore be ignored (e.g. configure scripts, Makefiles). > + These cases sometimes can be hard to detect – if unsure, include the file > in > + your research. > + > +Distillation down to license identifiers > + > + > +We use the `SPDX license identifiers <https://spdx.org/licenses/>`_. > + > +Either the license is clear, e.g. because it says "GPL 2.0" (roughly check > the > +licen
Re: [ptxdist] [PATCH] openvpn: allow use of iproute2
On Tue, May 26, 2020 at 02:01:43PM +0200, Ladislav Michl wrote:
> Gentle ping...
>
> On Wed, May 13, 2020 at 12:39:10PM +0200, Ladislav Michl wrote:
> > On Mon, Jan 06, 2020 at 11:59:56AM +0100, Michael Olbrich wrote:
> > > On Fri, Dec 06, 2019 at 11:36:13AM +0100, Ladislav Michl wrote:
> > > > Let OpenVPN use ip command when BUSYBOX_IP is not selected. This
> > > > allows OpenVPN to be used in Busybox-less environments.
> > >
> > > Hmmm, what does the -{en,dis}able-iproute2 option do exactly?
> > > Could we enable it unconditionally or does BUSYBOX_IP not provide all the
> > > necessary features?
> >
> > Well, what about using 'ip' by default and legacy interface as a fallback?
>
> Any other idea to support openvpn in busybox-less setup is welcome as well ;-)
For the record, your patch made sense to me, but I haven't tested it.
- Roland
> > --- 8< ---
> >
> > From: Ladislav Michl
> > Subject: [PATCH] openvpn: select IPROUTE2 without BUSYBOX only
> >
> > OpenVPN can be configured to use 'ip' command by specifying
> > --enable-iproute2, otherwise legacy net-tools commands 'ifconfig'
> > and 'route' are used.
> >
> > Use (rt)netlink interface provided by 'ip' tool by default with
> > fallback to legacy one. This allows OpenVPN package to be used
> > in Busybox-less environments without requiring legacy net-tools.
> >
> > Signed-off-by: Ladislav Michl
> > ---
> > rules/openvpn.in | 15 ++-
> > rules/openvpn.make | 2 +-
> > 2 files changed, 11 insertions(+), 6 deletions(-)
> >
> > diff --git a/rules/openvpn.in b/rules/openvpn.in
> > index 6958e2940..37bf36cf4 100644
> > --- a/rules/openvpn.in
> > +++ b/rules/openvpn.in
> > @@ -9,11 +9,12 @@ menuconfig OPENVPN
> > select IPTABLES if OPENVPN_INSTALL_SAMPLE_CONFIGS &&
> > RUNTIME
> > select IPTABLES_INSTALL_TOOLS if OPENVPN_INSTALL_SAMPLE_CONFIGS &&
> > RUNTIME
> > select BRIDGE_UTILS if OPENVPN_INSTALL_SAMPLE_SCRIPTS &&
> > RUNTIME
> > - select IPROUTE2 if !BUSYBOX_IP && RUNTIME
> > - select IPROUTE2_IP if !BUSYBOX_IP && RUNTIME
> > - select BUSYBOX_IFCONFIG if RUNTIME
> > - select BUSYBOX_NETSTAT if RUNTIME
> > - select BUSYBOX_ROUTEif RUNTIME
> > + select IPROUTE2 if !BUSYBOX && RUNTIME
> > + select IPROUTE2_IP if !BUSYBOX && RUNTIME
> > + select BUSYBOX_IFCONFIG if BUSYBOX && !BUSYBOX_IP && RUNTIME
> > + select BUSYBOX_ROUTEif BUSYBOX && !BUSYBOX_IP && RUNTIME
> > + select BUSYBOX_FEATURE_IP_LINK if BUSYBOX && BUSYBOX_IP && RUNTIME
> > + select BUSYBOX_FEATURE_IP_ROUTE if BUSYBOX && BUSYBOX_IP && RUNTIME
> > help
> > virtual private network daemon
> >
> > @@ -35,6 +36,10 @@ menuconfig OPENVPN
> >
> > if OPENVPN
> >
> > +config OPENVPN_IPROUTE2
> > + bool
> > + default BUSYBOX_IP || IPROUTE2_IP
> > +
> > config OPENVPN_SMALL
> > bool
> > prompt "Enable smaller executable size"
> > diff --git a/rules/openvpn.make b/rules/openvpn.make
> > index dc05384df..0c4f99ff2 100644
> > --- a/rules/openvpn.make
> > +++ b/rules/openvpn.make
> > @@ -67,7 +67,7 @@ OPENVPN_CONF_OPT := \
> > --enable-port-share \
> > --disable-debug \
> > --$(call ptx/endis, PTXCONF_OPENVPN_SMALL)-small \
> > - --disable-iproute2 \
> > + --$(call ptx/endis, PTXCONF_OPENVPN_IPROUTE2)-iproute2 \
> > --enable-def-auth \
> > --enable-pf \
> > --disable-plugin-auth-pam \
> > --
> > 2.26.2
> >
> >
> > ___
> > ptxdist mailing list
> > ptxdist@pengutronix.de
>
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany| Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PULL] rules: add license information
add license information xerces: add license information xmlstarlet: add license information xorg-app-iceauth: add license information xorg-app-rgb: add license information xorg-app-setxkbmap: add license information xorg-app-xauth: add license information xorg-app-xdm: add license information xorg-app-xev: add license information xorg-app-xhost: add license information xorg-app-xinit: add license information xorg-app-xprop: add license information xorg-app-xrdb: add license information xorg-app-xset: add license information xorg-app-xsetroot: add license information xorg-app-xvinfo: add license information xorg-data-xbitmaps: add license information xorg-driver-input-evdev: add license information xorg-driver-input-keyboard: add license information xorg-driver-input-mouse: add license information xorg-driver-input-tslib: add license information xorg-driver-input-void: add license information xorg-driver-video-apm: add license information xorg-driver-video-ati: add license information xorg-driver-video-dummy: add license information xorg-driver-video-fbdev: add license information xorg-driver-video-intel: add license information xorg-driver-video-vesa: add license information xorg-font-adobe-100dpi: add license information xorg-font-adobe-75dpi: add license information xorg-font-adobe-utopia-100dpi: add license information xorg-font-adobe-utopia-75dpi: add license information xorg-font-adobe-utopia-type1: add license information xorg-font-arabic-misc: add license information xorg-font-bh-100dpi: add license information xorg-font-bh-75dpi: add license information xorg-font-bh-lucidatypewriter-100dpi: add license information xorg-font-bh-lucidatypewriter-75dpi: add license information xorg-font-bitstream-100dpi: add license information xorg-font-bitstream-75dpi: add license information xorg-font-bitstream-speedo: add license information xorg-font-bitstream-type1: add license information xorg-font-cronyx-cyrillic: add license information xorg-font-cursor-misc: add license information xorg-font-daewoo-misc: add license information xorg-font-dec-misc: add license information xorg-font-encodings: add license information xorg-font-ibm-type1: add license information xorg-font-isas-misc: add license information xorg-font-jis-misc: add license information xorg-font-micro-misc: add license information xorg-font-misc-cyrillic: add license information xorg-font-misc-ethiopic: add license information xorg-font-misc-meltho: add license information xorg-font-misc-misc: add license information xorg-font-mutt-misc: add license information xorg-font-schumacher-misc: add license information xorg-font-screen-cyrillic: add license information xorg-font-sony-misc: add license information xorg-font-sun-misc: add license information xorg-font-winitzki-cyrillic: add license information xorg-font-xfree86-type1: add license information xorg-lib-dmx: add license information xorg-lib-xkbui: add license information Roland Hieber (8): bing: add license information binutils: add license information cairomm: add license information commoncpp: add license information classpath: add license information libndp: add license files ptxdist-configs: set license identifier sqlite: adapt SPDX identifier rules/argtable2.make| 2 ++ rules/bing.make | 2 ++ rules/binutils.make | 11 +++ rules/cairomm.make | 4 rules/calibrator.make | 2 ++ rules/canfestival.make | 4 rules/cbmbasic.make | 2 ++ rules/chrony.make | 4 rules/ckermit.make | 2 ++ rules/classpath.make| 4 rules/commoncpp2.make | 5 + rules/daemonize.make| 2 ++ rules/dash.make | 4 rules/db.make | 3 ++- rules/dbench.make | 5 - rules/failmalloc.make | 4 rules/fftw.make | 4 rules/frodo.make| 2 ++ rules/glibmm.make | 4 rules/gnuplot.make | 2 ++ rules/gpsd.make | 2 ++ rules/grep.make | 5 + rules/gtk2.make | 4
Re: [ptxdist] [PULL] rules: add license information
On Wed, May 27, 2020 at 01:22:04PM +0200, Roland Hieber wrote: > Hi, > > Felicitas has spent a good amount of time adding missing _LICENSE > and _LICENSE_FILES variables to (mostly older) package rules. I've > looked over her series, and there were some remaining Makefile syntax > errors, which I've fixed, and I also did a review of those rules that > failed during the build. For the other rules, I'm trusting her legal > expertise :-) While at it, I also fixed some issues which I discovered > on the way. > > With this series, 93% of all target package rules now have license > information, which is an increase of 18%. > > Since this series consists of 169 patches, I'm rather submitting it as a > pull request than single patch mails. > > - Roland > > > The following changes since commit bd48b8940bef84b08ae6e20e622b839c2ec25d6b: > > host-cdrkit: version bump 1.1.10 -> 1.1.11 (2020-05-24 19:40:24 +0200) > > are available in the Git repository at: > > ssh://pub...@git.pengutronix.de/rhi/ptxdist rhi/licenses For anyone else, that's git://git.pengutronix.de/rhi/ptxdist too. - Roland > for you to fetch changes up to 0715d4d6fd8ef5c23ca62729b44300ab546059dc: > > sqlite: adapt SPDX identifier (2020-05-27 13:02:33 +0200) > > > Felicitas Jung (161): > argtables2: add license information > memstat: add license information > calibrator: add license information > canfestival: add license information > cbmbasic: add license information > chrony: add license information > ckermit: add license information > daemonize: add license information > dash: add license information > dbench: add license information > db: add license information > failmalloc: add license information > fftw: add license information > frodo: add license information > glibmm: add license information > gnuplot: add license information > gpsd: add license information > grep: add license information > gtk2: add license information > haserl: add license information > hdparm: add license information > hpanel: add license information > ifplugd: add license information > inadyn: add license information > jamvm: add license information > inotify: add license information > jed: add license information > joe: add license information > jvisu: add license information > kexec-tools: add license information > libcaca: add license information > libcgicc: add license information > libcroco: add license information > libezv24: add license information > libfsl-vpu: add license information > libgd: add license information > libsgf: add license information > libid3tag: add license information > liblist: add license information > libmemcached: add license information > libmng: add license information > libnet: add license information > libnetpbm: add license information > liboop: add license information > libpv: add license information > librn: add license information > librsvg: add license information > libsigcpp: add license information > libssh2: add license information > libtremor: add license information > libx86: add license information > libxmlconfig: add license information > links: add license information > lrzsz: add license information > lsh: add license information > lsof: add license information > ltrace: add license information > ltt-control: add license information > madplay: add license information > memcached: add license information > mgetty: add license information > mmpong: add license information > mtd-oopslog: add license information > nanocom: add license information > networkmanager-openvpn: add license information > nickel: add license information > openntpd: add license information > oprofile: add license information > pangomm: add license information > pcmciautils: add license information > php5: add license information > pnputils: add license information > pop3spam: add license information > proftpd: add license information > pureftpd: add license information > pv: add license information > python3: add license information > python-routing: add license information > python-rplicmp: add license information > qwt: add license informa
Re: [ptxdist] [PATCH 1/3] libmodbus3: correct license
On Wed, May 27, 2020 at 11:04:23PM +0200, Bastian Krause wrote:
> libmodbus reverted its license with v3.0.0, commit 1275387 ("Revert
> libmodbus licence from LGPLv3 to LGPLv2.1") to LGPL-2.1-or-later.
> 820e15f ("SPDX: change LGPL-2.1+ to LGPL-2.1-or-later") updates the SPDX
> identifier in file headers to the recent version.
>
> Signed-off-by: Bastian Krause
> ---
> rules/libmodbus3.make | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
> index f206ec4aa..412401cbe 100644
> --- a/rules/libmodbus3.make
> +++ b/rules/libmodbus3.make
> @@ -21,7 +21,7 @@ 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
Could you please also add the respective files stating that license to
the LIBMODBUS3_LICENSE_FILES variable? See [1] for syntax, especially
the md5sum parameter, so we notice when that changes again :) I guess it
should be COPYRIGHT.LESSER and the respective lines from README.md.
[1]: https://www.ptxdist.org/doc/ref_manual.html#package-definition
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany| Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PULL] rules: add license information
On Wed, May 27, 2020 at 09:41:05AM -0500, keith_str...@grayhill.com wrote: > unsubscribe You wrote to the list address instead of ptxdist-requ...@pengutronix.de, but I just unsubscribed you manually via the admin interface (and adapted the list footer accordingly to include that info...) - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 2/2] doc: working with licensing information in packages
On Fri, May 29, 2020 at 08:23:46AM +0200, Michael Olbrich wrote: > On Mon, May 11, 2020 at 12:03:06PM +0200, Roland Hieber wrote: > > Co-authored-by: Felicitas Jung > > Signed-off-by: Felicitas Jung > > Signed-off-by: Roland Hieber > > --- > > doc/contributing.rst| 5 + > > doc/daily_work.inc | 2 + > > doc/daily_work_licenses.inc | 208 > > doc/ref_make_variables.inc | 4 + > > 4 files changed, 219 insertions(+) > > create mode 100644 doc/daily_work_licenses.inc > > > > diff --git a/doc/contributing.rst b/doc/contributing.rst > > index 705f01377d32..7352b46dfcf0 100644 > > --- a/doc/contributing.rst > > +++ b/doc/contributing.rst > > @@ -90,6 +90,11 @@ For new packages, the generated templates contain > > commented-out default > > sections. These are meant as a helper to simplify creating custom stages. > > Any remaining default stages must be removed. > > > > +New packages should also have licensing information in the > > ``_LICENSE`` > > +and ``_LICENSE_FILES`` variables. > > +Refer to the section :ref:`licensing_in_packages` for more information. > > + > > + > > Helper Scripts > > -- > > > > diff --git a/doc/daily_work.inc b/doc/daily_work.inc > > index a37aac4c3339..f68d25bf7cb5 100644 > > --- a/doc/daily_work.inc > > +++ b/doc/daily_work.inc > > @@ -1472,3 +1472,5 @@ be enabled. A used mount option of the overlayfs in > > the default > > newer. > > If your kernel does not meet this requirement you can provide your own > > local > > and adapted variant of the mentioned mount unit. > > + > > +.. include:: daily_work_licenses.inc > > diff --git a/doc/daily_work_licenses.inc b/doc/daily_work_licenses.inc > > new file mode 100644 > > index ..7e90b7ba541d > > --- /dev/null > > +++ b/doc/daily_work_licenses.inc > > @@ -0,0 +1,208 @@ > > +.. _licensing_in_packages: > > + > > +Tracking licensing information in packages > > +-- > > + > > +PTXdist aims to track licensing information for every package. > > +This includes the license(s) under which a package can be distributed, > > +as well as the respective files in the package's source tree that state > > those terms. > > +Sadly there is no widely adopted standard for machine-readable licensing > > +information in source code (`yet <https://reuse.software>`_), > > +so here are a few hints where to look. > > + > > +There are many older package rules in PTXdist which don't specify > > licensing information. > > +If you want to help complete the database, > > +you can use ``grep -L _LICENSE_FILES rules/*.make`` (in the PTXdist tree) > > to find those rules. > > +Note however that this cannot find wrong or incomplete licensing > > information. > > + > > +Finding licensing information > > +~ > > + > > +You should first select and extract the package in question, and then have > > a > > +look at in the extracted package sources (usually something like > > +``platform-nnn/build-target/mypackage-1.0`` in your BSP, if in doubt see > > +``ptxdist package-info mypackage``). > > + > > +* Check for files named ``COPYING``, ``COPYRIGHT``, or ``LICENSE``. > > + These often only contain the license text and, in case of GPL, no > > information > > + if the code is available under the *-only* or *-or-later* variant. > > + Sometimes these files are in a folder ``/doc`` or ``/legal``. > > + > > +* Check the ``README``, if there is any. > > + Often there is important information there, e.g. in case of GPL if the > > + software is *GPL-x.x-or-later* or *GPL-x.x-only*. > > + > > +* Check some relevant-sounding files, like ``main.c`` for license headers. > > + Often additional information can be found here. > > This is too lax for me. Unless there is an explicit statement that all code > has the same license, all source files must be checked. Especially older > projects have a few files that where copied from somewhere else and have a > different license. Yes, right. > > + > > +* If you want to be extra sure, use a license compliance toolchain (e.g. > > + `FOSSology <https://www.fossology.org/>`__) on the project. > > + > > +On the other hand, there are some things that can be ignored for our > > purposes: > > + > > +* Everything that is auto-generated, either by a script in the proj
[ptxdist] [PATCH v2 1/2] ptxdist: add licensecheck command
Make it possible to check all MD5 sums of license files by building all
report stages without also building the license report (which produces
tons of LaTeX output).
Signed-off-by: Roland Hieber
---
v2: name the make target "licensecheck" instead of report, and add it to
PHONY
bin/ptxdist | 6 ++
doc/ref_parameter.inc| 3 +++
rules/post/ptxd_make_license_report.make | 4
3 files changed, 13 insertions(+)
diff --git a/bin/ptxdist b/bin/ptxdist
index 1e10c08d47f2..6635a96a1cf5 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -752,6 +752,7 @@ Misc:
it is known by "make"
printnext assumes that the contents of is another
variable and print the contents of this variable
+ licensecheck check md5sums of license files for all packages
list-packagesprint a list of all selected packages
local-src []overwrite a package source with a
locally provided
directory containing the sourcecode.
@@ -1776,6 +1777,11 @@ EOF
ptxd_make_log "${images[@]}"
exit
;;
+ licensecheck)
+ check_premake_compiler &&
+ ptxd_make_log license-check
+ exit
+ ;;
list-packages)
check_config &&
check_deps || return
diff --git a/doc/ref_parameter.inc b/doc/ref_parameter.inc
index 74689b9d3cff..aaac8956f147 100644
--- a/doc/ref_parameter.inc
+++ b/doc/ref_parameter.inc
@@ -234,6 +234,9 @@ Misc Actions
contents of this variable. Shell variables are currently not checked here.
All other rules for ``print`` apply.
+``licensecheck``
+ For all selected packages, check the MD5 sums of license files.
+
``list-packages``
print a list of all selected packages. This list does not include the
host and cross tools.
diff --git a/rules/post/ptxd_make_license_report.make
b/rules/post/ptxd_make_license_report.make
index 47dc176668d0..a2d65cc2f450 100644
--- a/rules/post/ptxd_make_license_report.make
+++ b/rules/post/ptxd_make_license_report.make
@@ -15,6 +15,10 @@ PTX_PACKAGES_TARGET := \
$(PTX_PACKAGES_INSTALL) \
$(EXTRA_PACKAGES)
+PHONY += license-check
+
+license-check: $(addprefix $(STATEDIR)/,$(addsuffix
.report,$(PTX_PACKAGES_SELECTED)))
+
PHONY += license-report
license-report: \
--
2.26.2
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 2/2] doc: working with licensing information in packages
On Fri, May 29, 2020 at 10:55:57AM +0200, Michael Olbrich wrote: > On Fri, May 29, 2020 at 10:27:04AM +0200, Roland Hieber wrote: > > On Fri, May 29, 2020 at 08:23:46AM +0200, Michael Olbrich wrote: > > > On Mon, May 11, 2020 at 12:03:06PM +0200, Roland Hieber wrote: > > > > +License versions, and GPL-vv-only or GPL-vv-or-later? > > > > +^ > > > > + > > > > +If the ``COPYING`` file is a GPL text, it is still uncertain if the > > > > correct > > > > +license identifier is *GPL-vv-only* or *GPL-vv-or-later*. > > > > +The GPL text itself does not give information on that in its terms and > > > > +conditions. > > > > +Sometimes there is a notice at the top of the COPYING or the README > > > > file stating > > > > +whether *"-only"* or *"-or-later"* applies – this is the easy case. > > > > +Otherwise: check headers in relevant files. > > > > + > > > > +If no license information can be found, but one file mentions e.g. > > > > *"GPL-vv or > > > > +later"*, use that information for the whole project. > > > > +E.g.: no license information can be found except a ``COPYING`` which > > > > contains > > > > +a GPL-2.0 text → the license is GPL-2.0-only. > > > > + > > > > +Sometimes the best information available is statements like > > > > +*"this code is under GPL"* without any version information. > > > > +Such cases should be interpreted as the most liberal reading, > > > > +i.e. *GPL-1.0-or-later* (any possible GPL version). > > > > > > I'm not sure this is good. I would say, when in doubt then be restrictive. > > > After all, this is about compliance. If we comply with the more > > > restrictive > > > interpretation then we also comply with more liberal interpretations. > > > > What would being restrictive look like? We don't have any good pointers > > as to what license to use here. > > Use the version from the license text. Or are you saying there is no > license text as well? I'm not sure if that's even distributable. Do you > have an example for this? https://git.pengutronix.de/cgit/rhi/ptxdist/commit/?h=6dc705e869353f24d3cd1be7698afcd119e8da95 - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] libcroco: move to staging
Suggested-by: Michael Olbrich Signed-off-by: Roland Hieber --- rules/libcroco.in | 9 - rules/librsvg.in | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/rules/libcroco.in b/rules/libcroco.in index ab709be2f1e0..4f5af324e634 100644 --- a/rules/libcroco.in +++ b/rules/libcroco.in @@ -1,4 +1,6 @@ -## SECTION=multimedia_gtk +## SECTION=staging +### old section: +### SECTION=multimedia_gtk menuconfig LIBCROCO tristate @@ -32,6 +34,11 @@ menuconfig LIBCROCO Note that the xml manipulation toolkit used by the libcroco selection engine at the moment is libxml2. + STAGING: remove in PTXdist 2021.05.0 + + Old version that needs to be updated, and license is unclear + (headers say LGPL-2.1-or-later, COPYING contains LGPL-2.0) + if LIBCROCO config LIBCROCO_CHECKS diff --git a/rules/librsvg.in b/rules/librsvg.in index 3a149ef9c110..461dbaf95609 100644 --- a/rules/librsvg.in +++ b/rules/librsvg.in @@ -31,6 +31,7 @@ config LIBRSVG_SVGZ config LIBRSVG_CROCO bool + depends on STAGING prompt "libcroco support" help Libcroco is a general CSS parsing and manipulation library. -- 2.26.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 2/2] doc: working with licensing information in packages
On Fri, May 29, 2020 at 02:03:00PM +0200, Michael Olbrich wrote: > On Fri, May 29, 2020 at 11:40:49AM +0200, Roland Hieber wrote: > > On Fri, May 29, 2020 at 10:55:57AM +0200, Michael Olbrich wrote: > > > On Fri, May 29, 2020 at 10:27:04AM +0200, Roland Hieber wrote: > > > > On Fri, May 29, 2020 at 08:23:46AM +0200, Michael Olbrich wrote: > > > > > On Mon, May 11, 2020 at 12:03:06PM +0200, Roland Hieber wrote: > > > > > > +License versions, and GPL-vv-only or GPL-vv-or-later? > > > > > > +^ > > > > > > + > > > > > > +If the ``COPYING`` file is a GPL text, it is still uncertain if > > > > > > the correct > > > > > > +license identifier is *GPL-vv-only* or *GPL-vv-or-later*. > > > > > > +The GPL text itself does not give information on that in its terms > > > > > > and > > > > > > +conditions. > > > > > > +Sometimes there is a notice at the top of the COPYING or the > > > > > > README file stating > > > > > > +whether *"-only"* or *"-or-later"* applies – this is the easy case. > > > > > > +Otherwise: check headers in relevant files. > > > > > > + > > > > > > +If no license information can be found, but one file mentions e.g. > > > > > > *"GPL-vv or > > > > > > +later"*, use that information for the whole project. > > > > > > +E.g.: no license information can be found except a ``COPYING`` > > > > > > which contains > > > > > > +a GPL-2.0 text → the license is GPL-2.0-only. > > > > > > + > > > > > > +Sometimes the best information available is statements like > > > > > > +*"this code is under GPL"* without any version information. > > > > > > +Such cases should be interpreted as the most liberal reading, > > > > > > +i.e. *GPL-1.0-or-later* (any possible GPL version). > > > > > > > > > > I'm not sure this is good. I would say, when in doubt then be > > > > > restrictive. > > > > > After all, this is about compliance. If we comply with the more > > > > > restrictive > > > > > interpretation then we also comply with more liberal interpretations. > > > > > > > > What would being restrictive look like? We don't have any good pointers > > > > as to what license to use here. > > > > > > Use the version from the license text. Or are you saying there is no > > > license text as well? I'm not sure if that's even distributable. Do you > > > have an example for this? > > > > https://git.pengutronix.de/cgit/rhi/ptxdist/commit/?h=6dc705e869353f24d3cd1be7698afcd119e8da95 > > "The whole package, starting with version 1.1.22, is distributed under· > the GNU GPL license, found in the accompanying file 'COPYING'." > > And the COPYING file does not exist... But check the latest version: The > COPYING exist there and it's GPL-2.0 and with the wording above I'd say > GPL-2.0-only. Given that this release is from 2007, I'd rather file another staging patch than do a version bump... But what does that mean for the documentation patch above? Of course it very much concerns only edge cases, but then, edge cases is what that section is really about ^^ So I think only the wording needs to be adapted to clarify that it applies only when not even a GPL text is available. Or what was the reason in your view that the package was not even distributable? - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] mgetty: move to staging
The current version was released in 2007, so probably no one cares. Signed-off-by: Roland Hieber --- rules/mgetty.in | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/rules/mgetty.in b/rules/mgetty.in index 79d7b9b52323..b8c969773da6 100644 --- a/rules/mgetty.in +++ b/rules/mgetty.in @@ -1,4 +1,7 @@ -## SECTION=communication +## SECTION=staging +## old section: +### SECTION=communication +# menuconfig MGETTY tristate prompt "mgetty & sendfax " @@ -15,6 +18,12 @@ menuconfig MGETTY within shell scripts. Its input are pages in "g3" format, either created with ghostscript or with pbm2g3. + STAGING: remove in PTXdist 2021.05.0 + + Really old version that needs to be updated, and license is unclear + (README says "this is GPL" but doesn't say which version, and no GPL + text is included) + if MGETTY config MGETTY_CONFIG -- 2.26.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 2/2] doc: working with licensing information in packages
On Tue, Jun 02, 2020 at 03:16:34PM +0200, Michael Olbrich wrote: > On Sun, May 31, 2020 at 09:56:15PM +0200, Roland Hieber wrote: > > On Fri, May 29, 2020 at 02:03:00PM +0200, Michael Olbrich wrote: > > > On Fri, May 29, 2020 at 11:40:49AM +0200, Roland Hieber wrote: > > > > https://git.pengutronix.de/cgit/rhi/ptxdist/commit/?h=6dc705e869353f24d3cd1be7698afcd119e8da95 > > > > > > "The whole package, starting with version 1.1.22, is distributed under· > > > the GNU GPL license, found in the accompanying file 'COPYING'." > > > > > > And the COPYING file does not exist... But check the latest version: The > > > COPYING exist there and it's GPL-2.0 and with the wording above I'd say > > > GPL-2.0-only. > > > > Given that this release is from 2007, I'd rather file another staging > > patch than do a version bump... > > ok, can you rebase your branch to remove corresponding the license patch? Yes, I'll send a PULL v2. > > But what does that mean for the documentation patch above? Of course it > > very much concerns only edge cases, but then, edge cases is what that > > section is really about ^^ So I think only the wording needs to be > > adapted to clarify that it applies only when not even a GPL text is > > available. Or what was the reason in your view that the package was not > > even distributable? > > For the documentation, the main thing is "don't assume". If it's really > unclear, then just use 'custom' and add all relevant texts to the license > files. Then whoever creates a BSP must decide for themself if the license > is acceptable. > The license identifier is just a hint. And it must be the correct one not > just whatever is closest. Otherwise it's useless. Right, that sounds reasonable. Also I found old documentation in the dev_manual.rst, which I'll integrate into this patch. It also fits better in the developer manual instead of the daily use chapter. - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH v2 1/3] libmodbus3: correct license
On Tue, Jun 02, 2020 at 03:28:39PM +0200, Michael Olbrich wrote:
> On Fri, May 29, 2020 at 03:06:51PM +0200, Bastian Krause wrote:
> >
> > On 5/29/20 10:44 AM, Michael Olbrich wrote:
> > > On Thu, May 28, 2020 at 11:04:24AM +0200, Bastian Krause wrote:
> > >> libmodbus reverted its license with v3.0.0, commit 1275387 ("Revert
> > >> libmodbus licence from LGPLv3 to LGPLv2.1") to LGPL-2.1-or-later.
> > >> 820e15f ("SPDX: change LGPL-2.1+ to LGPL-2.1-or-later") updates the SPDX
> > >> identifier in file headers to the recent version.
> > >> The README.md states "or later" part of the license, so add that to
> > >> LIBMODBUS3_LICENSE_FILES.
> > >>
> > >> The tests are licensed under BSD-3-Clause since v3.1.2, commit bdd5379
> > >> ("Switch test programs to a BSD license").
> > >>
> > >> Signed-off-by: Bastian Krause
> > >> ---
> > >> Changes since (implicit) v1:
> > >> - add " AND BSD-3-Clause" to license since the tests are licensed under
> > >> BSD-3-Clause
> > >> - add LIBMODBUS3_LICENSE_FILES
> > >> ---
> > >> rules/libmodbus3.make | 21 -
> > >> 1 file changed, 12 insertions(+), 9 deletions(-)
> > >>
> > >> diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
> > >> index f206ec4aa..06721aa05 100644
> > >> --- a/rules/libmodbus3.make
> > >> +++ b/rules/libmodbus3.make
> > >> @@ -14,15 +14,18 @@ PACKAGES-$(PTXCONF_LIBMODBUS3) += libmodbus3
> > >> #
> > >> # Paths and names
> > >> #
> > >> -LIBMODBUS3_VERSION := 3.1.4
> > >> -LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
> > >> -LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
> > >> -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_VERSION := 3.1.4
> > >> +LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
> > >> +LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
> > >> +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-2.1-or-later AND BSD-3-Clause
> > >> +LIBMODBUS3_LICENSE_FILES:= \
> > >> +file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
> > >> +
> > >> file://README.md;startline=17;endline=17;md5=c0937f6beb7c75412b9259e48222e077
> > >> \
> > >
> > > I don't think this line adds anything. The source files make the
> > > 'or-later'
> > > clear and we don't have anything like this for any other package.
> >
> > Okay, should I add a source file with startline/endline pointing to the
> > SPDX identifier instead?
>
> Yes, I think that's better.
>
> > >
> > >> +
> > >> file://tests/version.c;startline=4;endline=4;md5=b23faac1da952fa6845fd4fb63a20ffe
> > >
> > > This is not sufficient. For BSD style licenses the copyright line is
> > > relevant and must be added.
> > > And we need the license text which is missing :-/.
> > >
> > > The BSD-3-Clause license states:
> > > "Redistributions of source code must retain the above copyright notice,
> > > this list of conditions and the following disclaimer."
> > >
> > > The license is in the git repo but not the release tarball :-/. I've
> > > reported this upstream[1].
>
> Hmmm, anyways, this is about the test, and we don't install those anyways,
> so I don't think we need the license here. Opinions?
At least not including it would be consistent with all other packages
in which this was done, so I would opt for it here too.
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany| Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] doc: ref_manual: break up large HTML file into smaller chapters
This chapter is getting very long and could also profit from an extra
table of contents.
Signed-off-by: Roland Hieber
---
doc/{ref_make_macros.inc => ref_make_macros.rst} | 0
...ref_make_variables.inc => ref_make_variables.rst} | 0
doc/ref_manual.rst | 12 ++--
doc/{ref_parameter.inc => ref_parameter.rst} | 0
...rule_file_layout.inc => ref_rule_file_layout.rst} | 0
5 files changed, 6 insertions(+), 6 deletions(-)
rename doc/{ref_make_macros.inc => ref_make_macros.rst} (100%)
rename doc/{ref_make_variables.inc => ref_make_variables.rst} (100%)
rename doc/{ref_parameter.inc => ref_parameter.rst} (100%)
rename doc/{ref_rule_file_layout.inc => ref_rule_file_layout.rst} (100%)
diff --git a/doc/ref_make_macros.inc b/doc/ref_make_macros.rst
similarity index 100%
rename from doc/ref_make_macros.inc
rename to doc/ref_make_macros.rst
diff --git a/doc/ref_make_variables.inc b/doc/ref_make_variables.rst
similarity index 100%
rename from doc/ref_make_variables.inc
rename to doc/ref_make_variables.rst
diff --git a/doc/ref_manual.rst b/doc/ref_manual.rst
index 44d031010e72..850d7239914b 100644
--- a/doc/ref_manual.rst
+++ b/doc/ref_manual.rst
@@ -1,9 +1,9 @@
PTXdist Reference
=
-.. include:: ref_make_variables.inc
-.. include:: ref_make_macros.inc
-.. include:: ref_rule_file_layout.inc
-
-
-.. include:: ref_parameter.inc
+.. toctree::
+
+ ref_make_variables
+ ref_make_macros
+ ref_rule_file_layout
+ ref_parameter
diff --git a/doc/ref_parameter.inc b/doc/ref_parameter.rst
similarity index 100%
rename from doc/ref_parameter.inc
rename to doc/ref_parameter.rst
diff --git a/doc/ref_rule_file_layout.inc b/doc/ref_rule_file_layout.rst
similarity index 100%
rename from doc/ref_rule_file_layout.inc
rename to doc/ref_rule_file_layout.rst
--
2.20.1
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v2 1/2] doc: ref_manual: move section start into ref_parameter.inc
Signed-off-by: Roland Hieber --- v2: Oops, this patch was missing in v1. doc/ref_manual.rst| 10 -- doc/ref_parameter.inc | 11 +++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/doc/ref_manual.rst b/doc/ref_manual.rst index 6541da3eaa00..44d031010e72 100644 --- a/doc/ref_manual.rst +++ b/doc/ref_manual.rst @@ -5,15 +5,5 @@ PTXdist Reference .. include:: ref_make_macros.inc .. include:: ref_rule_file_layout.inc -.. _ptxdist_parameter_reference: - -PTXdist parameter reference - -PTXdist is a command line tool, which is basically called as: - -.. code-block:: bash - -$ ptxdist [options] .. include:: ref_parameter.inc diff --git a/doc/ref_parameter.inc b/doc/ref_parameter.inc index aaac8956f147..4f5fbbe4ac68 100644 --- a/doc/ref_parameter.inc +++ b/doc/ref_parameter.inc @@ -1,3 +1,14 @@ +.. _ptxdist_parameter_reference: + +PTXdist parameter reference +--- + +PTXdist is a command line tool, which is basically called as: + +.. code-block:: bash + +$ ptxdist [options] + Setup and Project Actions ~ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v2 2/2] doc: ref_manual: break up large HTML file into smaller chapters
This chapter is getting very long and could also profit from an extra
table of contents.
Signed-off-by: Roland Hieber
---
v2: no changes
doc/{ref_make_macros.inc => ref_make_macros.rst} | 0
...ref_make_variables.inc => ref_make_variables.rst} | 0
doc/ref_manual.rst | 12 ++--
doc/{ref_parameter.inc => ref_parameter.rst} | 0
...rule_file_layout.inc => ref_rule_file_layout.rst} | 0
5 files changed, 6 insertions(+), 6 deletions(-)
rename doc/{ref_make_macros.inc => ref_make_macros.rst} (100%)
rename doc/{ref_make_variables.inc => ref_make_variables.rst} (100%)
rename doc/{ref_parameter.inc => ref_parameter.rst} (100%)
rename doc/{ref_rule_file_layout.inc => ref_rule_file_layout.rst} (100%)
diff --git a/doc/ref_make_macros.inc b/doc/ref_make_macros.rst
similarity index 100%
rename from doc/ref_make_macros.inc
rename to doc/ref_make_macros.rst
diff --git a/doc/ref_make_variables.inc b/doc/ref_make_variables.rst
similarity index 100%
rename from doc/ref_make_variables.inc
rename to doc/ref_make_variables.rst
diff --git a/doc/ref_manual.rst b/doc/ref_manual.rst
index 44d031010e72..850d7239914b 100644
--- a/doc/ref_manual.rst
+++ b/doc/ref_manual.rst
@@ -1,9 +1,9 @@
PTXdist Reference
=
-.. include:: ref_make_variables.inc
-.. include:: ref_make_macros.inc
-.. include:: ref_rule_file_layout.inc
-
-
-.. include:: ref_parameter.inc
+.. toctree::
+
+ ref_make_variables
+ ref_make_macros
+ ref_rule_file_layout
+ ref_parameter
diff --git a/doc/ref_parameter.inc b/doc/ref_parameter.rst
similarity index 100%
rename from doc/ref_parameter.inc
rename to doc/ref_parameter.rst
diff --git a/doc/ref_rule_file_layout.inc b/doc/ref_rule_file_layout.rst
similarity index 100%
rename from doc/ref_rule_file_layout.inc
rename to doc/ref_rule_file_layout.rst
--
2.20.1
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH v3 1/2] libmodbus3: correct license
On Fri, Jun 05, 2020 at 08:52:45PM +0200, Bastian Krause wrote:
> libmodbus reverted its license with v3.0.0, commit 1275387 ("Revert
> libmodbus licence from LGPLv3 to LGPLv2.1") to LGPL-2.1-or-later.
> 820e15f ("SPDX: change LGPL-2.1+ to LGPL-2.1-or-later") updates the SPDX
> identifier in file headers to the recent version.
>
> The tests are licensed under BSD-3-Clause (since v3.1.2), but we do
Looks like here's "not" missing?
> install them, so we do not need to add that license.
>
> Signed-off-by: Bastian Krause
> ---
> Changes since v2:
> - remove BSD-3-Clause, only the tests are licensed like that and we do
> not install them
> - remove README.md and test file from LIBMODBUS3_LICENSE_FILES
> - add src/modbus.c to LIBMODBUS3_LICENSE_FILES to reference SPDX
> identifier
>
> Changes since (implicit) v1:
> - add " AND BSD-3-Clause" to license since the tests are licensed under
> BSD-3-Clause
> - add LIBMODBUS3_LICENSE_FILES
> ---
> rules/libmodbus3.make | 19 +++
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/rules/libmodbus3.make b/rules/libmodbus3.make
> index f206ec4aa..58f2df90b 100644
> --- a/rules/libmodbus3.make
> +++ b/rules/libmodbus3.make
> @@ -14,14 +14,17 @@ PACKAGES-$(PTXCONF_LIBMODBUS3) += libmodbus3
> #
> # Paths and names
> #
> -LIBMODBUS3_VERSION := 3.1.4
> -LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
> -LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
> -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_VERSION := 3.1.4
> +LIBMODBUS3_MD5 := b1a8fd3a40d2db4de51fb0cbcb201806
> +LIBMODBUS3 := libmodbus-$(LIBMODBUS3_VERSION)
> +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-2.1-or-later
> +LIBMODBUS3_LICENSE_FILES := \
> + file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \
> +
> file://src/modbus.c;startline=4;endline=4;md5=09383b02650315a322dba1dcf8aad811
>
> #
>
> # Prepare
> --
> 2.27.0
>
>
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to
> ptxdist-requ...@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany| Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 4/5] doc: dev_code_signing: rework and extend code signing section
** be used
> for
> + production.
> +
> +Creating Custom Code Signing Providers
> +^^
> +
> +When a set of release keys or project-specific development keys should be
> +used (e.g. to achieve backward compatibility) a new code signing provider
> +must be introduced.
> +
> +Use ``ptxdist newpackage code-signing-provider`` to generate such a new code
> +signing provider.
> +The generated files must now be adjusted to the use case, depending on
> whether
> +a specific HSM or SoftHSM should be used.
> +The generated shell script in ``local_src/-code-signing/`` contains
> +examples for both use cases.
> +See :ref:`code_signing_helper_functions` for an explanation of the available
> +code signing helpers.
> +It is the code signing provider's responsibility to select the host
> +tools required by the code signing helper functions it uses.
> +In case of SoftHSM use cases the keys should also be placed inside
> +``local_src/-code-signing/``
> +
> +In case an HSM is used it is required to extend the ``CODE_SIGNING_ENV`` with
> +additional environment variables via a pre rule in
> +``$(PTXDIST_PLATFORMCONFIGDIR)/rules/pre/``.
> +For example, for Nitrokey HSMs which use *OpenSC* the pre rule could look
> like
> +this:
> +
> +.. code-block:: make
> +
> +ifdef PTXCONF_CODE_SIGNING_PROVIDER_
> +CODE_SIGNING_ENV += \
> + PKCS11_MODULE_PATH="${PTXDIST_SYSROOT_HOST}/lib/pkcs11/opensc-pkcs11.so"
> +endif
> +
> +Note that the module is built in the BSP in this case (via
> +``select HOST_OPENSC_PCSC`` in the code signing provider's menu file).
> +This is not strictly required, it is also possible to use an otherwise
> +distributed module, e.g. by the HSM manufacturer.
> +
> +Switching the code signing provider is now possible with
> +``ptxdist platformconfig``, then navigate to *Code signing* → *Code signing
> +provider*.
> +
> +Code Signing Consumers
> +~~
> +
> +A package has to select ``CODE_SIGNING`` if it wants to sign something, or if
> +it needs access to keys and/or certificates.
> +The config symbol is available in ptxconfig as well as in platformconfig.
> +Selecting this symbol makes sure the keys and certificates are ready when the
> +package is being built.
> +
> +By adding ``CODE_SIGNING_ENV`` to the package's make/conf/image environment a
> +tool implementing a PKCS#11 interface can access the HSM or SoftHSM.
> +The PKCS#11 URI can be retrieved via :ref:`cs_get_uri` and passed on, usually
> +also via an environment variable.
> +
> +:ref:`cs_get_ca` can be used to install a keyring to the root file system,
> e.g.:
> +
> +.. code-block:: none
> +
> +$(call install_copy, rauc, 0, 0, 0644, \
> + $(shell cs_get_ca update), \
> + /etc/rauc/ca.cert.pem)
> +
> +.. note:: When code signing helper functions are used in make variables (e.g.
> + for environment definitions) recursively expanded variables must be used
> + (``=``, not ``:=``).
> + Otherwise the variable is expanded before a code signing provider can
> perform
> + its setup.
> --
> 2.27.0
>
>
--
Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany| Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 0/5] Add code-signing-provider template, add code signing docs
On Mon, Jun 08, 2020 at 10:53:00AM +0200, Bastian Krause wrote: > The code signing infrastructure is available since 2019 in PTXdist. Now > it's time to document it, especially since RAUC also uses it. > Unfortunately this did not make it into ptxdist-2020.06.0. > > To make things easier introduce a code-signing-provider template. > > Bastian Krause (5): > package templates: add code-signing-provider template > doc: dev_manual: split up into multiple files > doc: move code signing docs from scripts/ into doc/ > doc: dev_code_signing: rework and extend code signing section > doc: introduce ref_code_signing_helpers For the whole series: Reviewed-by: Roland Hieber > > doc/dev_add_bin_only_files.rst| 105 + > doc/dev_add_new_pkgs.rst | 1339 + > doc/dev_code_signing.rst | 129 ++ > doc/dev_create_new_pkg_templates.rst | 77 + > doc/dev_dir_hierarchy.rst | 108 + > doc/dev_layers_in_ptxdist.rst | 111 ++ > doc/dev_manual.rst| 1765 + > doc/ref_code_signing_helpers.inc | 246 +++ > doc/ref_manual.rst|1 + > .../code-signing-provider/ptxdist-set-keys.sh | 96 + > .../template-code-signing-provider-choice-in |5 + > .../template-code-signing-provider-in | 16 + > .../template-code-signing-provider-make | 41 + > scripts/lib/ptxd_lib_code_signing.sh | 32 +- > scripts/lib/ptxd_lib_template.sh | 16 + > 15 files changed, 2302 insertions(+), 1785 deletions(-) > create mode 100644 doc/dev_add_bin_only_files.rst > create mode 100644 doc/dev_add_new_pkgs.rst > create mode 100644 doc/dev_code_signing.rst > create mode 100644 doc/dev_create_new_pkg_templates.rst > create mode 100644 doc/dev_dir_hierarchy.rst > create mode 100644 doc/dev_layers_in_ptxdist.rst > create mode 100644 doc/ref_code_signing_helpers.inc > create mode 100755 rules/templates/code-signing-provider/ptxdist-set-keys.sh > create mode 100644 rules/templates/template-code-signing-provider-choice-in > create mode 100644 rules/templates/template-code-signing-provider-in > create mode 100644 rules/templates/template-code-signing-provider-make > > -- > 2.27.0 > > -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 3/7] ptxd_make_world_get: make 'ptxdist urlcheck' idempotent
There is no guarantee that URLs will still work the next time we want to check them, so try to fetch the URL every time instead of caching the result. This also makes iterations of editing the URL in the rule file and testing if it works quicker. Unfortunately, GNU make skips implicit rules for .PHONY targets, but it is unlikely that $(STATEDIR)/%.urlcheck is created by something other than PTXdist, so removing the $(call touch) is a good approximation for phony behaviour. Signed-off-by: Roland Hieber --- rules/post/ptxd_make_world_get.make | 1 - 1 file changed, 1 deletion(-) diff --git a/rules/post/ptxd_make_world_get.make b/rules/post/ptxd_make_world_get.make index a2026c994591..a79b4d170873 100644 --- a/rules/post/ptxd_make_world_get.make +++ b/rules/post/ptxd_make_world_get.make @@ -58,7 +58,6 @@ $(STATEDIR)/%.urlcheck: @$(call targetinfo) @$(foreach src,$($(PTX_MAP_TO_PACKAGE_$(*))_SOURCES), \ $(call world/urlcheck, $($(src)));) - @$(call touch) world/urlcheck = \ $(call world/env, $(1)) \ -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 7/7] libpopt: replace dead URL with more mirrors
rpm5.org has been a parking domain for at least 2 years, it is unlikely to come back. Add a few other mirrors. Signed-off-by: Roland Hieber --- rules/libpopt.make | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/libpopt.make b/rules/libpopt.make index 0bfecc7aebcf..7de94b406c82 100644 --- a/rules/libpopt.make +++ b/rules/libpopt.make @@ -19,8 +19,10 @@ LIBPOPT_VERSION := 1.16 LIBPOPT_MD5:= 3743beefa3dd6247a73f8f7a32c14c33 LIBPOPT:= popt-$(LIBPOPT_VERSION) LIBPOPT_SUFFIX := tar.gz -LIBPOPT_URL:= http://rpm5.org/files/popt/$(LIBPOPT).$(LIBPOPT_SUFFIX) \ - http://distfiles.gentoo.org/distfiles/$(LIBPOPT).$(LIBPOPT_SUFFIX) +LIBPOPT_URL:= \ + http://deb.debian.org/debian/pool/main/p/popt/popt_$(LIBPOPT).orig.$(LIBPOPT_SUFFIX) \ + http://distfiles.gentoo.org/distfiles/$(LIBPOPT).$(LIBPOPT_SUFFIX) \ + ftp://anduin.linuxfromscratch.org/BLFS/popt/$(LIBPOPT).$(LIBPOPT_SUFFIX) LIBPOPT_SOURCE := $(SRCDIR)/$(LIBPOPT).$(LIBPOPT_SUFFIX) LIBPOPT_DIR:= $(BUILDDIR)/$(LIBPOPT) LIBPOPT_LICENSE:= MIT -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 2/7] setup: use https by default for PTXCONF_SETUP_PTXMIRROR
The http version redirects to https anyways, and this way we guard the
full URL against interested third parties even on the first request.
Signed-off-by: Roland Hieber
---
config/setup/Kconfig | 2 +-
config/setup/ptxdistrc.default | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/setup/Kconfig b/config/setup/Kconfig
index de288c95a2ce..4b1a769daab5 100644
--- a/config/setup/Kconfig
+++ b/config/setup/Kconfig
@@ -110,7 +110,7 @@ endif
config SETUP_PTXMIRROR
string
- default "http://www.pengutronix.de/software/ptxdist/temporary-src";
+ default "https://www.pengutronix.de/software/ptxdist/temporary-src";
prompt "PTXdist Mirror"
help
Enter the fallback mirror for all packages here.
diff --git a/config/setup/ptxdistrc.default b/config/setup/ptxdistrc.default
index 8f3a451b69f2..29b8bfe37525 100644
--- a/config/setup/ptxdistrc.default
+++ b/config/setup/ptxdistrc.default
@@ -31,7 +31,7 @@ PTXCONF_SETUP_SRCDIR="${PTXDIST_WORKSPACE}/src"
#
# PTXCONF_SETUP_NO_DOWNLOAD is not set
# PTXCONF_SETUP_PTXMIRROR_ONLY is not set
-PTXCONF_SETUP_PTXMIRROR="http://www.pengutronix.de/software/ptxdist/temporary-src";
+PTXCONF_SETUP_PTXMIRROR="https://www.pengutronix.de/software/ptxdist/temporary-src";
PTXCONF_SETUP_DEBMIRROR="http://ftp.uni-kl.de/debian
http://archive.debian.org/debian";
PTXCONF_SETUP_SFMIRROR="http://downloads.sourceforge.net/sourceforge";
PTXCONF_SETUP_GNUMIRROR="https://ftp.gnu.org/gnu http://ftp.uni-kl.de/pub/gnu";
--
2.27.0
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 5/7] ptxd_make_get: continue with next URL when getting HTML file on dry run
Still log this as a warning so it is (hopefully) seen.
Signed-off-by: Roland Hieber
---
scripts/lib/ptxd_make_get.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
index d5003384619b..f9aa3c7a0ec9 100644
--- a/scripts/lib/ptxd_make_get.sh
+++ b/scripts/lib/ptxd_make_get.sh
@@ -97,7 +97,9 @@ ptxd_make_get_http() {
--write-out '\n%{url_effective}\n' \
"${url}" &&
if grep -i "content-type:" "${temp_header}" | tail -n 1 | grep
-q "text/html"; then
- ptxd_bailout "Got HTML file"
+ ptxd_warning "Got HTML file"
+ ptxd_make_serialize_put
+ return 1
fi
ptxd_make_serialize_put
return
--
2.27.0
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 1/7] setup: remove dead code
This lines were already commented out when they were first added… Fixes: 6871dca3f4003d9ee2ac (2008-07-04, Marc Kleine-Budde: " * Kconfig: added some developer options") Signed-off-by: Roland Hieber --- config/setup/Kconfig | 6 -- 1 file changed, 6 deletions(-) diff --git a/config/setup/Kconfig b/config/setup/Kconfig index b6ed724f5519..de288c95a2ce 100644 --- a/config/setup/Kconfig +++ b/config/setup/Kconfig @@ -231,12 +231,6 @@ endmenu menu "Developer Options " -#config SETUP_CHECK_OMIT_CASE -# bool "don't check for case sensitive file system" - -#config SETUP_CHECK_OMIT_SPACES -# bool "don't check for spaces in important directories" - config SETUP_DISABLE_LOCAL_CHECK bool prompt "disable local disk check" -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 4/7] ptxd_make_get: print out final redirected URL on dry run
Some SourceForge URLs seem to fail randomly. Log the redirected URL to
facilitate debugging.
Signed-off-by: Roland Hieber
---
scripts/lib/ptxd_make_get.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
index 3ac0b71c2a83..d5003384619b 100644
--- a/scripts/lib/ptxd_make_get.sh
+++ b/scripts/lib/ptxd_make_get.sh
@@ -94,6 +94,7 @@ ptxd_make_get_http() {
--location \
--head \
--request GET \
+ --write-out '\n%{url_effective}\n' \
"${url}" &&
if grep -i "content-type:" "${temp_header}" | tail -n 1 | grep
-q "text/html"; then
ptxd_bailout "Got HTML file"
--
2.27.0
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 6/7] libjaylink: fix URL
The repository was apparently moved; the old URL shows a login screen. Signed-off-by: Roland Hieber --- rules/libjaylink.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/libjaylink.make b/rules/libjaylink.make index 0ecba6e3ec50..5b125ca0de1e 100644 --- a/rules/libjaylink.make +++ b/rules/libjaylink.make @@ -12,7 +12,7 @@ LIBJAYLINK_VERSION:= 0.1.0-15-g8645845 LIBJAYLINK_MD5 := 6e71d5c39ae4778bb8d0df79d2524c07 LIBJAYLINK := libjaylink-$(LIBJAYLINK_VERSION) LIBJAYLINK_SUFFIX := tar.bz2 -LIBJAYLINK_URL := https://gitlab.zapb.de/zapb/libjaylink/-/archive/$(LIBJAYLINK_VERSION)/$(LIBJAYLINK).$(LIBJAYLINK_SUFFIX) +LIBJAYLINK_URL := https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/$(LIBJAYLINK_VERSION)/$(LIBJAYLINK).$(LIBJAYLINK_SUFFIX) LIBJAYLINK_SOURCE := $(SRCDIR)/$(LIBJAYLINK).$(LIBJAYLINK_SUFFIX) LIBJAYLINK_DIR := $(BUILDDIR)/$(LIBJAYLINK) LIBJAYLINK_LICENSE := GPL-2.0+ -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] Docu for "fixup" rules
On Sat, Jun 13, 2020 at 01:01:39PM +0200, Ariel Garcia wrote: > Hello, > > using the hint from this discussion > https://www.mail-archive.com/ptxdist@pengutronix.de/msg16103.html > > i would like to add a "rules/post/kernel-fixup.make" > kind of rule file to "extend" the rule run when i execute > ptxdist clean kernel > > But i don't find any info regarding pre/post rule files in the official docu/ > reference manual. > > Any hint is really appreciated, thanks, Ariel The makefiles in rules/pre are evaluated before any other in rules/, and contain all macro and variable definitions that should be available for rule files. The files in rules/post are evaluated last, so you can e.g. override makefiles and menu entries from upstream PTXdist in your BSP without needing to forking the whole rule file. All files are evaluated in lexical order, but other than that, the file name is not important for functionality. I don't think there's any more magic to it :) - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH] barebox: add option to specify barebox image patterns
On Tue, Jun 16, 2020 at 12:56:18AM +0200, Marco Felsch wrote: > Allow users to specify other barebox image naming schemes. Now users can > specify a list of: > - unique image names and/or > - matching name patterns using wildcards. > > While on it I fixed the leaking image-results upon a 'ptxdist clean > barebox' command. Now all barebox artefacts are removed from the > $(IMAGEDIR). > > Signed-off-by: Marco Felsch > --- LGTM on first glance, could you do the same for rules/templates/template-barebox-make too please? - Roland > platforms/barebox.in | 9 + > rules/barebox.make | 19 +-- > 2 files changed, 22 insertions(+), 6 deletions(-) > > diff --git a/platforms/barebox.in b/platforms/barebox.in > index 526d7ede4..b92cf485e 100644 > --- a/platforms/barebox.in > +++ b/platforms/barebox.in > @@ -39,6 +39,15 @@ config BAREBOX_CONFIG > This entry specifies the .config file used to compile > barebox. > > +config BAREBOX_IMAGES > + prompt "barebox images to install" > + string > + default "barebox-*.img" > + help > + A comma seperated list of images which should be installed > + into the $(IMAGEDIR). The list can contain full image names > + and/or wildcard pattern image names. > + > config BAREBOX_EXTRA_ENV > prompt "extend the builtin barebox environment" > bool > diff --git a/rules/barebox.make b/rules/barebox.make > index d1b5fc598..65bb8251e 100644 > --- a/rules/barebox.make > +++ b/rules/barebox.make > @@ -148,6 +148,9 @@ $(STATEDIR)/barebox.install: > # Target-Install > # > > > +BAREBOX_IMAGES_DIR := $(BAREBOX_BUILD_DIR)/images > +BAREBOX_IMAGES := $(strip $(subst $(ptx/def/comma),$(ptx/def/space),$(call > remove_quotes, $(PTXCONF_BAREBOX_IMAGES > + > $(STATEDIR)/barebox.targetinstall: > @$(call targetinfo) > > @@ -166,14 +169,15 @@ ifneq ($(strip $(BAREBOX_PROGS_TARGET_y)),) > endif > > @rm -f $(IMAGEDIR)/barebox-image > - @if [ -d $(BAREBOX_BUILD_DIR)/images ]; then \ > - find $(BAREBOX_BUILD_DIR)/images/ -name "barebox-*.img" | sort > | while read image; do \ > - install -D -m644 $$image $(IMAGEDIR)/`basename > $$image`; \ > + @$(foreach _image, $(BAREBOX_IMAGES), \ > + $(foreach image, $(wildcard $(BAREBOX_IMAGES_DIR)/$(_image)), \ > + install -D -m644 $(image) $(IMAGEDIR)/$(notdir > $(image)); \ > if [ ! -e $(IMAGEDIR)/barebox-image ]; then \ > - ln -sf `basename $$image` > $(IMAGEDIR)/barebox-image; \ > + ln -sf $(notdir $(image)) > $(IMAGEDIR)/barebox-image; \ > fi; \ > - done; \ > - fi > + ) \ > + ) > + > @if [ -e $(IMAGEDIR)/barebox-image ]; then \ > :; \ > elif [ -e $(BAREBOX_BUILD_DIR)/barebox-flash-image ]; then \ > @@ -199,6 +203,9 @@ $(STATEDIR)/barebox.clean: > @$(call clean_pkg, BAREBOX) > @$(foreach prog, $(BAREBOX_PROGS_HOST), \ > rm -vf $(PTXDIST_SYSROOT_HOST)/bin/$(notdir $(prog))$(ptx/nl)) > + @$(foreach _image, $(BAREBOX_IMAGES), \ > + $(foreach image, $(wildcard $(IMAGEDIR)/$(_image)), \ > + rm -vf $(image);)) > @rm -vf $(IMAGEDIR)/barebox-image > $(IMAGEDIR)/barebox-default-environment > > # > > -- > 2.20.1 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de > -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH] barebox: add option to specify barebox image patterns
On Tue, Jun 16, 2020 at 10:02:01AM +0200, Roland Hieber wrote: > On Tue, Jun 16, 2020 at 12:56:18AM +0200, Marco Felsch wrote: > > Allow users to specify other barebox image naming schemes. Now users can > > specify a list of: > > - unique image names and/or > > - matching name patterns using wildcards. > > > > While on it I fixed the leaking image-results upon a 'ptxdist clean > > barebox' command. Now all barebox artefacts are removed from the > > $(IMAGEDIR). > > > > Signed-off-by: Marco Felsch > > --- > > LGTM on first glance, could you do the same for > rules/templates/template-barebox-make too please? > > - Roland > > > platforms/barebox.in | 9 + > > rules/barebox.make | 19 +-- > > 2 files changed, 22 insertions(+), 6 deletions(-) > > > > diff --git a/platforms/barebox.in b/platforms/barebox.in > > index 526d7ede4..b92cf485e 100644 > > --- a/platforms/barebox.in > > +++ b/platforms/barebox.in > > @@ -39,6 +39,15 @@ config BAREBOX_CONFIG > > This entry specifies the .config file used to compile > > barebox. > > > > +config BAREBOX_IMAGES > > + prompt "barebox images to install" > > + string > > + default "barebox-*.img" > > + help > > + A comma seperated list of images which should be installed > > + into the $(IMAGEDIR). The list can contain full image names > > + and/or wildcard pattern image names. > > + > > config BAREBOX_EXTRA_ENV > > prompt "extend the builtin barebox environment" > > bool > > diff --git a/rules/barebox.make b/rules/barebox.make > > index d1b5fc598..65bb8251e 100644 > > --- a/rules/barebox.make > > +++ b/rules/barebox.make > > @@ -148,6 +148,9 @@ $(STATEDIR)/barebox.install: > > # Target-Install > > # > > > > > > +BAREBOX_IMAGES_DIR := $(BAREBOX_BUILD_DIR)/images > > +BAREBOX_IMAGES := $(strip $(subst $(ptx/def/comma),$(ptx/def/space),$(call > > remove_quotes, $(PTXCONF_BAREBOX_IMAGES > > + > > $(STATEDIR)/barebox.targetinstall: > > @$(call targetinfo) > > > > @@ -166,14 +169,15 @@ ifneq ($(strip $(BAREBOX_PROGS_TARGET_y)),) > > endif > > > > @rm -f $(IMAGEDIR)/barebox-image > > - @if [ -d $(BAREBOX_BUILD_DIR)/images ]; then \ > > - find $(BAREBOX_BUILD_DIR)/images/ -name "barebox-*.img" | sort > > | while read image; do \ > > - install -D -m644 $$image $(IMAGEDIR)/`basename > > $$image`; \ > > + @$(foreach _image, $(BAREBOX_IMAGES), \ > > + $(foreach image, $(wildcard $(BAREBOX_IMAGES_DIR)/$(_image)), \ > > + install -D -m644 $(image) $(IMAGEDIR)/$(notdir > > $(image)); \ > > if [ ! -e $(IMAGEDIR)/barebox-image ]; then \ > > - ln -sf `basename $$image` > > $(IMAGEDIR)/barebox-image; \ > > + ln -sf $(notdir $(image)) > > $(IMAGEDIR)/barebox-image; \ > > fi; \ Please also use $(ptx/nl) instead of the ; at the end of the $(foreach) loops so that the shell does not complain about too long lines. - Roland > > - done; \ > > - fi > > + ) \ > > + ) > > + > > @if [ -e $(IMAGEDIR)/barebox-image ]; then \ > > :; \ > > elif [ -e $(BAREBOX_BUILD_DIR)/barebox-flash-image ]; then \ > > @@ -199,6 +203,9 @@ $(STATEDIR)/barebox.clean: > > @$(call clean_pkg, BAREBOX) > > @$(foreach prog, $(BAREBOX_PROGS_HOST), \ > > rm -vf $(PTXDIST_SYSROOT_HOST)/bin/$(notdir $(prog))$(ptx/nl)) > > + @$(foreach _image, $(BAREBOX_IMAGES), \ > > + $(foreach image, $(wildcard $(IMAGEDIR)/$(_image)), \ > > + rm -vf $(image);)) > > @rm -vf $(IMAGEDIR)/barebox-image > > $(IMAGEDIR)/barebox-default-environment > > > > # > > > > -- > > 2.20.1 > > > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > > To unsubscribe, send a mail with subject "unsubscribe" to > > ptxdist-requ...@pengutronix.de > > > > -- > Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | > Steuerwalder Str. 21 | https://www.pengutronix.de/ | > 311
Re: [ptxdist] [PATCH] barebox: add option to specify barebox image patterns
On Tue, Jun 16, 2020 at 10:34:32AM +0200, Bastian Krause wrote: > > On 6/16/20 10:02 AM, Roland Hieber wrote: > > On Tue, Jun 16, 2020 at 12:56:18AM +0200, Marco Felsch wrote: > >> Allow users to specify other barebox image naming schemes. Now users can > >> specify a list of: > >> - unique image names and/or > >> - matching name patterns using wildcards. > >> > >> While on it I fixed the leaking image-results upon a 'ptxdist clean > >> barebox' command. Now all barebox artefacts are removed from the > >> $(IMAGEDIR). > >> > >> Signed-off-by: Marco Felsch > >> --- > > > > LGTM on first glance, could you do the same for > > rules/templates/template-barebox-make too please? > > Is this really necessary? The idea of the barebox rule template is to > generate a BSP specific barebox rule, right? We already have.. > > BAREBOX_@PACKAGE@_IMAGES := @image@ > > ..in that template, so we don't really benefit from a config option here. Ah yes, you're right, I actually didn't look at the template, but thought that it was in the same state as the barebox rule… Sorry for the noise. - Roland > > Regards, > Bastian > > > > > - Roland > > > >> platforms/barebox.in | 9 + > >> rules/barebox.make | 19 +-- > >> 2 files changed, 22 insertions(+), 6 deletions(-) > >> > >> diff --git a/platforms/barebox.in b/platforms/barebox.in > >> index 526d7ede4..b92cf485e 100644 > >> --- a/platforms/barebox.in > >> +++ b/platforms/barebox.in > >> @@ -39,6 +39,15 @@ config BAREBOX_CONFIG > >> This entry specifies the .config file used to compile > >> barebox. > >> > >> +config BAREBOX_IMAGES > >> + prompt "barebox images to install" > >> + string > >> + default "barebox-*.img" > >> + help > >> +A comma seperated list of images which should be installed > >> +into the $(IMAGEDIR). The list can contain full image names > >> +and/or wildcard pattern image names. > >> + > >> config BAREBOX_EXTRA_ENV > >>prompt "extend the builtin barebox environment" > >>bool > >> diff --git a/rules/barebox.make b/rules/barebox.make > >> index d1b5fc598..65bb8251e 100644 > >> --- a/rules/barebox.make > >> +++ b/rules/barebox.make > >> @@ -148,6 +148,9 @@ $(STATEDIR)/barebox.install: > >> # Target-Install > >> # > >> > >> > >> +BAREBOX_IMAGES_DIR := $(BAREBOX_BUILD_DIR)/images > >> +BAREBOX_IMAGES := $(strip $(subst > >> $(ptx/def/comma),$(ptx/def/space),$(call remove_quotes, > >> $(PTXCONF_BAREBOX_IMAGES > >> + > >> $(STATEDIR)/barebox.targetinstall: > >>@$(call targetinfo) > >> > >> @@ -166,14 +169,15 @@ ifneq ($(strip $(BAREBOX_PROGS_TARGET_y)),) > >> endif > >> > >>@rm -f $(IMAGEDIR)/barebox-image > >> - @if [ -d $(BAREBOX_BUILD_DIR)/images ]; then \ > >> - find $(BAREBOX_BUILD_DIR)/images/ -name "barebox-*.img" | sort > >> | while read image; do \ > >> - install -D -m644 $$image $(IMAGEDIR)/`basename > >> $$image`; \ > >> + @$(foreach _image, $(BAREBOX_IMAGES), \ > >> + $(foreach image, $(wildcard $(BAREBOX_IMAGES_DIR)/$(_image)), \ > >> + install -D -m644 $(image) $(IMAGEDIR)/$(notdir > >> $(image)); \ > >>if [ ! -e $(IMAGEDIR)/barebox-image ]; then \ > >> - ln -sf `basename $$image` > >> $(IMAGEDIR)/barebox-image; \ > >> + ln -sf $(notdir $(image)) > >> $(IMAGEDIR)/barebox-image; \ > >>fi; \ > >> - done; \ > >> - fi > >> + ) \ > >> + ) > >> + > >>@if [ -e $(IMAGEDIR)/barebox-image ]; then \ > >>:; \ > >>elif [ -e $(BAREBOX_BUILD_DIR)/barebox-flash-image ]; then \ > >> @@ -199,6 +203,9 @@ $(STATEDIR)/barebox.clean: > >>@$(call clean_pkg, BAREBOX) > >>@$(foreach prog, $(BAREBOX_PROGS_HOST), \ > >>rm -vf $(PTXDIST_SYSROOT_HOST)/bin/$(notdir $(prog))$(ptx/nl)) > >> + @$(foreach _image, $(BAREBOX_IMAGES), \ > >> + $(foreach image, $(wildcard $(IMAGEDIR)/$
Re: [ptxdist] [PATCH] barebox: add option to specify barebox image patterns
On Tue, Jun 16, 2020 at 03:30:33PM +0200, Marco Felsch wrote: > Hi Bastian, Roland, > > thanks for the quick response and comments :) > > On 20-06-16 10:34, Bastian Krause wrote: > > > > On 6/16/20 10:02 AM, Roland Hieber wrote: > > > On Tue, Jun 16, 2020 at 12:56:18AM +0200, Marco Felsch wrote: > > >> Allow users to specify other barebox image naming schemes. Now users can > > >> specify a list of: > > >> - unique image names and/or > > >> - matching name patterns using wildcards. > > >> > > >> While on it I fixed the leaking image-results upon a 'ptxdist clean > > >> barebox' command. Now all barebox artefacts are removed from the > > >> $(IMAGEDIR). > > >> > > >> Signed-off-by: Marco Felsch > > >> --- > > > > > > LGTM on first glance, could you do the same for > > > rules/templates/template-barebox-make too please? > > > > Is this really necessary? The idea of the barebox rule template is to > > generate a BSP specific barebox rule, right? We already have.. > > > > BAREBOX_@PACKAGE@_IMAGES := @image@ > > > > ..in that template, so we don't really benefit from a config option here. > > My idea was to _hopefully_ remove the usage of this template and > instead use ptxdist upstream mechanism: > - layer -> different barebox configs > - this patch -> different barebox images I think it would still be good to have this template in the future. For example, in DistroKit, we have one platform which targets ARM-v7A boards, and we can use the same kernel and userland here. But we still need different barebox packages because we cannot target multiple board families with one barebox config - in that case one barebox for Broadcom BCM283x boards, one for ARM Vexpress, one for i.MX6, one for OMAP is needed, even though they are all ARM-v7A platforms. Otherwise we would need to introduce additional platforms, which would unnecessarily duplicate the space needed to build images for all boards. - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH v3 2/6] package templates: add code-signing-provider template
-
> +
> +HOST_@PACKAGE@_CODE_SIGNING_MAKE_ENV := \
> + $(CODE_SIGNING_ENV)
> +
> +$(STATEDIR)/host-@package@-code-signing.compile:
> + @$(call targetinfo)
> + @$(call world/execute, HOST_@PACKAGE@_CODE_SIGNING, \
> + ./ptxdist-set-keys.sh)
> + @$(call touch)
> +
> +$(STATEDIR)/host-@package@-code-signing.install:
> + @$(call targetinfo)
> + @$(call touch)
> +
> +# vim: syntax=make
> diff --git a/rules/templates/template-code-signing-provider-pre-make
> b/rules/templates/template-code-signing-provider-pre-make
> new file mode 100644
> index 0..28cac750c
> --- /dev/null
> +++ b/rules/templates/template-code-signing-provider-pre-make
> @@ -0,0 +1,15 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) @YEAR@ by @AUTHOR@
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +ifndef PTXCONF_CODE_SIGNING_PROVIDER_@PACKAGE@
> +CODE_SIGNING_ENV += \
> + PKCS11_MODULE_PATH=@MODULE_PATH@
> + $(HSM_CODE_SIGNING_ENV)
> +endif
> +
> +# vim: syntax=make
> diff --git a/scripts/lib/ptxd_lib_template.sh
> b/scripts/lib/ptxd_lib_template.sh
> index 6b405763b..805d8d9d3 100644
> --- a/scripts/lib/ptxd_lib_template.sh
> +++ b/scripts/lib/ptxd_lib_template.sh
> @@ -486,3 +486,34 @@ ptxd_template_new_blspec_entry() {
> export -f ptxd_template_new_blspec_entry
> ptxd_template_help_list[${#ptxd_template_help_list[@]}]="blspec-entry"
> ptxd_template_help_list[${#ptxd_template_help_list[@]}]="create package for
> a bootloader spec entry"
> +
> +ptxd_template_new_code_signing_provider() {
> +export class="host-"
> +ptxd_template_read_basic &&
> +ptxd_template_read_author &&
> +ptxd_template_read_options "provider type" TYPE "SoftHSM" "HSM with
> OpenSC support" "other HSM"
> +package_filename="${package_filename}-code-signing"
> +local template_file="$(ptxd_template_file "${template}-choice-in")"
> + local
> filename="${PTXDIST_PLATFORMCONFIGDIR}/platforms/${class}${package_filename}-choice.in"
> +ptxd_template_filter "${template_file}" "${filename}"
> +template_file="$(ptxd_template_file "${template}-pre-make")"
> +
> filename="${PTXDIST_PLATFORMCONFIGDIR}/rules/pre/020-${package_filename}-hsm.make"
> +if [ "$TYPE" = "SoftHSM" ]; then
> + export EXTRA_DEPENDENCIES="select HOST_SOFTHSM"
> +elif [ "$TYPE" = "HSM with OpenSC support" ]; then
> + export EXTRA_DEPENDENCIES="select HOST_OPENSC
> + select HOST_OPENSC_PCSC"
> + export
> MODULE_PATH="\${PTXDIST_SYSROOT_HOST}/lib/pkcs11/opensc-pkcs11.so"
> + ptxd_template_filter "${template_file}" "${filename}"
> +elif [ "$TYPE" = "other HSM" ]; then
> + export EXTRA_DEPENDENCIES="select FIXME"
> + export MODULE_PATH="\${PTXDIST_SYSROOT_HOST}/fix/me"
> + ptxd_template_filter "${template_file}" "${filename}"
Hmm, the indentation is off here (tabs mixed with spaces), but that's
the case for the whole file, so I guess that's okay :D
Tested-by: Roland Hieber
Reviewed-by: Roland Hieber
- Roland
> +fi
> +ptxd_template_write_platform_rules
> +package="${package}-code-signing"
> +ptxd_template_write_src
> +}
> +export -f ptxd_template_new_code_signing_provider
> +ptxd_template_help_list[${#ptxd_template_help_list[@]}]="code-signing-provider"
> +ptxd_template_help_list[${#ptxd_template_help_list[@]}]="create package for
> a code signing provider"
> --
> 2.27.0
>
>
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to
> ptxdist-requ...@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany| Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] ptxd_template_write_src: print generated files with correct prefix
The second tar can only print the file names in the archive, and since
the first tar does not store the original path and since the files come
from the template path, we could not use that path anyway. Do some
additional handling to print the full paths of the generated files after
unpacking them to the destination.
Signed-off-by: Roland Hieber
---
scripts/lib/ptxd_lib_template.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/ptxd_lib_template.sh b/scripts/lib/ptxd_lib_template.sh
index 805d8d9d3dac..6210345c730d 100644
--- a/scripts/lib/ptxd_lib_template.sh
+++ b/scripts/lib/ptxd_lib_template.sh
@@ -229,7 +229,10 @@ ptxd_template_write_src() {
template_src="$(ptxd_template_file "${action}")" &&
mkdir -p "${dst}" &&
tar -C "${template_src}" -cf - --exclude .svn . | \
- tar -C "${dst}" -xvf - &&
+ tar -C "${dst}" -xf - &&
+for file in "${dst}"/*; do
+ echo "generating $(ptxd_template_print_path "$file")"
+done &&
if [ ! -e "${dst}/wizard.sh" ]; then
return
--
2.27.0
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 3/7] ptxd_make_world_get: make 'ptxdist urlcheck' idempotent
On Fri, Jun 19, 2020 at 07:34:01AM +0200, Michael Olbrich wrote: > On Sat, Jun 13, 2020 at 03:32:45AM +0200, Roland Hieber wrote: > > There is no guarantee that URLs will still work the next time we want to > > check them, so try to fetch the URL every time instead of caching the > > result. This also makes iterations of editing the URL in the rule file > > and testing if it works quicker. > > > > Unfortunately, GNU make skips implicit rules for .PHONY targets, but it > > is unlikely that $(STATEDIR)/%.urlcheck is created by something other > > than PTXdist, so removing the $(call touch) is a good approximation for > > phony behaviour. > > No. This is deliberately like this. I want to run 'ptxdist urlcheck', fix > errors and then continue with the rest. Can you not use -k to do this? Caching an error state is at least unusual, and it is not done anywhere else in PTXdist, so this breaks the principle of least surprise. - Roland > How about an extra ptxdist options. When it is given, then all make target > that are explicitly specified on the command-line are added to the PHONY > list, so that they are always executed. Then you could do: > > ptxdist --something urlcheck foobar > > And you can do this multiple times. I don't have a good name for the > option. But I think this could be useful for other things as well. > > Michael > > > > Signed-off-by: Roland Hieber > > --- > > rules/post/ptxd_make_world_get.make | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/rules/post/ptxd_make_world_get.make > > b/rules/post/ptxd_make_world_get.make > > index a2026c994591..a79b4d170873 100644 > > --- a/rules/post/ptxd_make_world_get.make > > +++ b/rules/post/ptxd_make_world_get.make > > @@ -58,7 +58,6 @@ $(STATEDIR)/%.urlcheck: > > @$(call targetinfo) > > @$(foreach src,$($(PTX_MAP_TO_PACKAGE_$(*))_SOURCES), \ > > $(call world/urlcheck, $($(src)));) > > - @$(call touch) > > > > world/urlcheck = \ > > $(call world/env, $(1)) \ > > -- > > 2.27.0 > > > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > > To unsubscribe, send a mail with subject "unsubscribe" to > > ptxdist-requ...@pengutronix.de > > > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | > -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 7/7] libpopt: replace dead URL with more mirrors
On Fri, Jun 19, 2020 at 07:46:52AM +0200, Michael Olbrich wrote: > On Sat, Jun 13, 2020 at 03:32:49AM +0200, Roland Hieber wrote: > > rpm5.org has been a parking domain for at least 2 years, it is unlikely > > to come back. Add a few other mirrors. > > The file can be found on http://ftp.rpm.org so I changed the URL to that > one. > Note: please don't use Debian pool URLs. Those files are gone, when the > corresponding version is removed from any active Debian release. Oh, you're right, I should have used snapshots.debian.org instead! Still interested in a v2 incorporating your URL? - Roland > > Michael > > > Signed-off-by: Roland Hieber > > --- > > rules/libpopt.make | 6 -- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/rules/libpopt.make b/rules/libpopt.make > > index 0bfecc7aebcf..7de94b406c82 100644 > > --- a/rules/libpopt.make > > +++ b/rules/libpopt.make > > @@ -19,8 +19,10 @@ LIBPOPT_VERSION := 1.16 > > LIBPOPT_MD5:= 3743beefa3dd6247a73f8f7a32c14c33 > > LIBPOPT:= popt-$(LIBPOPT_VERSION) > > LIBPOPT_SUFFIX := tar.gz > > -LIBPOPT_URL:= > > http://rpm5.org/files/popt/$(LIBPOPT).$(LIBPOPT_SUFFIX) \ > > - > > http://distfiles.gentoo.org/distfiles/$(LIBPOPT).$(LIBPOPT_SUFFIX) > > +LIBPOPT_URL:= \ > > + > > http://deb.debian.org/debian/pool/main/p/popt/popt_$(LIBPOPT).orig.$(LIBPOPT_SUFFIX) > > \ > > + http://distfiles.gentoo.org/distfiles/$(LIBPOPT).$(LIBPOPT_SUFFIX) \ > > + ftp://anduin.linuxfromscratch.org/BLFS/popt/$(LIBPOPT).$(LIBPOPT_SUFFIX) > > LIBPOPT_SOURCE := $(SRCDIR)/$(LIBPOPT).$(LIBPOPT_SUFFIX) > > LIBPOPT_DIR:= $(BUILDDIR)/$(LIBPOPT) > > LIBPOPT_LICENSE:= MIT > > -- > > 2.27.0 > > > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > > To unsubscribe, send a mail with subject "unsubscribe" to > > ptxdist-requ...@pengutronix.de > > > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | > -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] host-imx-cst: adapt help text
Freescale is no more since it was acquired by NXP. Signed-off-by: Roland Hieber --- rules/host-imx-cst.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/host-imx-cst.in b/rules/host-imx-cst.in index 37e3030a1e54..f5079ef8205b 100644 --- a/rules/host-imx-cst.in +++ b/rules/host-imx-cst.in @@ -5,4 +5,4 @@ config HOST_IMX_CST select HOST_OPENSSL default y if ALLYES help - Freescale Code Signing Tool for High Assurance Boot. + NXP (proprietary) Code Signing Tool for High Assurance Boot. -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] nss: make installed libraries configurable
Most NSS modules are only needed if any software links to them, or loads them at runtime (e.g. as a PKCS#11 module). In extreme cases, we can slim down the installation by more than 1 MiB, and also get rid of the SQLite dependency. Qt5WebEngine and ecryptfs-utils are currently the only users of NSS, pin down their respective sub-dependencies. Signed-off-by: Roland Hieber --- v1 -> v2: - rebase to current master - fix ecryptfs depedency, only libsoftokn is needed - format libsoftokn help text a bit nicer Range-diff: 1: 6fc40ec92172 ! 772: a2711cfe218b nss: make installed libraries configurable @@ Commit message Signed-off-by: Roland Hieber ## rules/ecryptfs-utils.in ## @@ rules/ecryptfs-utils.in: menuconfig ECRYPTFS_UTILS prompt "ecryptfs-utils" select KEYUTILS select NSS -+ select NSS_INSTALL_LIBSSL -+ select NSS_INSTALL_LIBSMIME ++ select NSS_INSTALL_LIBSOFTOKN select HOST_INTLTOOL select BASH if ECRYPTFS_UTILS_TESTS select COREUTILSif ECRYPTFS_UTILS_TESTS @@ rules/nss.in +additional dependency on SQLite. + +FreeBL is a base library providing hash functions, big number -+calculations, and cryptographic algorithms. DBM is a legacy library -+providing database storage. Softoken is an NSS module that exposes -+most FreeBL functionality as a PKCS#11 module, and can make use of DBM -+or SQLite at runtime. ++calculations, and cryptographic algorithms. ++ ++DBM is a legacy library providing database storage. ++ ++Softoken is an NSS module that exposes most FreeBL functionality as a ++PKCS#11 module, and can make use of DBM or SQLite at runtime. + +endif @@ rules/nss.make: NSS_MAKE_ENV := \ NSS_ENABLE_ECC=1 \ NSS_DISABLE_GTESTS=1 \ NSPR_INCLUDE_DIR=$(SYSROOT)/usr/include/nspr \ - USE_64=$(call ptx/ifdef, PTXCONF_ARCH_LP64,1) + USE_64=$(call ptx/ifdef, PTXCONF_ARCH_LP64,1) \ + USE_NEON=$(call ptx/ifdef, PTXCONF_ARCH_ARM_NEON,1) +# unless needed, prevent an additional runtime dependency by using the bundled, +# statically-linked sqlite, but not installing anything that links to it rules/ecryptfs-utils.in | 1 + rules/nss.in| 58 ++--- rules/nss.make | 22 +--- rules/qt5.in| 2 ++ 4 files changed, 71 insertions(+), 12 deletions(-) diff --git a/rules/ecryptfs-utils.in b/rules/ecryptfs-utils.in index 5087f79d3ca2..8a62443bdddb 100644 --- a/rules/ecryptfs-utils.in +++ b/rules/ecryptfs-utils.in @@ -5,6 +5,7 @@ menuconfig ECRYPTFS_UTILS prompt "ecryptfs-utils" select KEYUTILS select NSS + select NSS_INSTALL_LIBSOFTOKN select HOST_INTLTOOL select BASH if ECRYPTFS_UTILS_TESTS select COREUTILSif ECRYPTFS_UTILS_TESTS diff --git a/rules/nss.in b/rules/nss.in index 3e4a07a75404..799bd5a73ae0 100644 --- a/rules/nss.in +++ b/rules/nss.in @@ -1,13 +1,65 @@ ## SECTION=networking -config NSS +menuconfig NSS tristate - prompt "nss" + prompt "nss " select NSPR - select SQLITE + select SQLITE if NSS_INSTALL_LIBSOFTOKN help Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards. + +if NSS + +config NSS_INSTALL_LIBSMIME + bool + prompt "install libsmime" + default y + help + Install libsmime3.so, which adds about ~90 kiB to the footprint. + + libsmime provides functionality related to S/MIME (Cryptographic + Message Syntax, PKCS#7) used by secure email and some instant + messaging implementations. + +config NSS_INSTALL_LIBSSL + bool + prompt "install libssl" + default y + help + Install libssl3.so, which adds about ~200 kiB to the footprint. + + libssl implements the Secure Sockets Layer/Transport Layer Security + network protocols. + +config NSS_INSTALL_LIBNSSCKBI + bool + prompt "install libnssckbi" + default y + help + Install libnssckbi.so, which adds about ~350 kiB to the footprint. + + CKBI is a PKCS#11 module which provides a set of trust anchors (Root + CAs) and their trust assignments. + +config NSS_INSTALL_LIBSOFTOKN + bool + prompt "install libsoftokn" + default y +
Re: [ptxdist] [PATCH v2] nss: make installed libraries configurable
Ah, that was supposed to be -v2, of course. - Roland On Fri, Jun 19, 2020 at 02:31:31PM +0200, Roland Hieber wrote: > Most NSS modules are only needed if any software links to them, or loads > them at runtime (e.g. as a PKCS#11 module). In extreme cases, we can > slim down the installation by more than 1 MiB, and also get rid of the > SQLite dependency. > > Qt5WebEngine and ecryptfs-utils are currently the only users of NSS, pin > down their respective sub-dependencies. > > Signed-off-by: Roland Hieber > --- > v1 -> v2: > - rebase to current master > - fix ecryptfs depedency, only libsoftokn is needed > - format libsoftokn help text a bit nicer > > Range-diff: > 1: 6fc40ec92172 ! 772: a2711cfe218b nss: make installed libraries > configurable > @@ Commit message > > Signed-off-by: Roland Hieber > > ## rules/ecryptfs-utils.in ## > @@ rules/ecryptfs-utils.in: menuconfig ECRYPTFS_UTILS > prompt "ecryptfs-utils" > select KEYUTILS > select NSS > -+select NSS_INSTALL_LIBSSL > -+select NSS_INSTALL_LIBSMIME > ++select NSS_INSTALL_LIBSOFTOKN > select HOST_INTLTOOL > select BASH if ECRYPTFS_UTILS_TESTS > select COREUTILSif ECRYPTFS_UTILS_TESTS > @@ rules/nss.in > + additional dependency on SQLite. > + > + FreeBL is a base library providing hash functions, big number > -+ calculations, and cryptographic algorithms. DBM is a legacy > library > -+ providing database storage. Softoken is an NSS module that > exposes > -+ most FreeBL functionality as a PKCS#11 module, and can make > use of DBM > -+ or SQLite at runtime. > ++ calculations, and cryptographic algorithms. > ++ > ++ DBM is a legacy library providing database storage. > ++ > ++ Softoken is an NSS module that exposes most FreeBL > functionality as a > ++ PKCS#11 module, and can make use of DBM or SQLite at runtime. > + > +endif > > @@ rules/nss.make: NSS_MAKE_ENV := \ > NSS_ENABLE_ECC=1 \ > NSS_DISABLE_GTESTS=1 \ > NSPR_INCLUDE_DIR=$(SYSROOT)/usr/include/nspr \ > - USE_64=$(call ptx/ifdef, PTXCONF_ARCH_LP64,1) > + USE_64=$(call ptx/ifdef, PTXCONF_ARCH_LP64,1) \ > + USE_NEON=$(call ptx/ifdef, PTXCONF_ARCH_ARM_NEON,1) > > +# unless needed, prevent an additional runtime dependency by using the > bundled, > +# statically-linked sqlite, but not installing anything that links to it > > rules/ecryptfs-utils.in | 1 + > rules/nss.in| 58 ++--- > rules/nss.make | 22 +--- > rules/qt5.in| 2 ++ > 4 files changed, 71 insertions(+), 12 deletions(-) > > diff --git a/rules/ecryptfs-utils.in b/rules/ecryptfs-utils.in > index 5087f79d3ca2..8a62443bdddb 100644 > --- a/rules/ecryptfs-utils.in > +++ b/rules/ecryptfs-utils.in > @@ -5,6 +5,7 @@ menuconfig ECRYPTFS_UTILS > prompt "ecryptfs-utils" > select KEYUTILS > select NSS > + select NSS_INSTALL_LIBSOFTOKN > select HOST_INTLTOOL > select BASH if ECRYPTFS_UTILS_TESTS > select COREUTILSif ECRYPTFS_UTILS_TESTS > diff --git a/rules/nss.in b/rules/nss.in > index 3e4a07a75404..799bd5a73ae0 100644 > --- a/rules/nss.in > +++ b/rules/nss.in > @@ -1,13 +1,65 @@ > ## SECTION=networking > > -config NSS > +menuconfig NSS > tristate > - prompt "nss" > + prompt "nss " > select NSPR > - select SQLITE > + select SQLITE if NSS_INSTALL_LIBSOFTOKN > help > Network Security Services (NSS) is a set of libraries designed to > support cross-platform development of security-enabled client and > server applications. Applications built with NSS can support > SSL v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, > X.509 v3 certificates, and other security standards. > + > +if NSS > + > +config NSS_INSTALL_LIBSMIME > + bool > + prompt "install libsmime" > + default y > + help > + Install libsmime3.so, which adds about ~90 kiB to the footprint. > + > + libsmime provides functionality related to S/MIME (Cryptographic > + Message Syntax, PKCS#7) used by secure
[ptxdist] [PATCH v3 2/2] nss: install all libraries into the sysroot
From: Jan Luebbe ecryptfs-utils links to -lssl3 -lsmime3, without using any functions from it. Install all libraries to the sysroot to make it work. The unused libraries are still not installed on the target. Signed-off-by: Jan Luebbe Signed-off-by: Roland Hieber --- I overlook this patch in v2, but discovered it again during build-testing... v2 -> v3: new patch rules/nss.make | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/rules/nss.make b/rules/nss.make index 6a003dd1743f..c8537ceb521b 100644 --- a/rules/nss.make +++ b/rules/nss.make @@ -74,24 +74,13 @@ NSS_INSTALL_OPT := \ $(NSS_MAKE_OPT) \ install -NSS_LIBS := \ - libnss3 \ - libnssutil3 \ - $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSMIME, libsmime3,) \ - $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSSL, libssl3,) \ - $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBNSSCKBI, libnssckbi,) \ - $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libfreebl3,) \ - $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libfreeblpriv3,) \ - $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libnssdbm3,) \ - $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libsoftokn3,) - $(STATEDIR)/nss.install: @$(call targetinfo) @$(call world/install, NSS) - @$(foreach lib,$(NSS_LIBS), \ - install -v -m644 -D $(NSS_DIR)/dist/Linux$(PTXCONF_KERNEL_VERSION)_$(NSS_ARCH)_*/lib/$(lib).so \ - $(NSS_PKGDIR)/usr/lib/$(lib).so$(ptx/nl)) + install -d -m755 $(NSS_PKGDIR)/usr/lib/ + install -m 644 $(NSS_DIR)/dist/Linux$(PTXCONF_KERNEL_VERSION)_$(NSS_ARCH)_*/lib/*.so \ + $(NSS_PKGDIR)/usr/lib/ install -d $(NSS_PKGDIR)/usr/lib/pkgconfig/ VERSION=$(NSS_VERSION) ptxd_replace_magic \ @@ -106,6 +95,17 @@ $(STATEDIR)/nss.install: # Target-Install # +NSS_LIBS := \ + libnss3 \ + libnssutil3 \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSMIME, libsmime3,) \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSSL, libssl3,) \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBNSSCKBI, libnssckbi,) \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libfreebl3,) \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libfreeblpriv3,) \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libnssdbm3,) \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libsoftokn3,) + $(STATEDIR)/nss.targetinstall: @$(call targetinfo) -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v3 1/2] nss: make installed libraries configurable
Most NSS modules are only needed if any software links to them, or loads them at runtime (e.g. as a PKCS#11 module). In extreme cases, we can slim down the installation by more than 1 MiB, and also get rid of the SQLite dependency. Qt5WebEngine and ecryptfs-utils are currently the only users of NSS, pin down their respective sub-dependencies. Signed-off-by: Roland Hieber --- v2 -> v3: no changes v1 -> v2: - rebase onto current master - fix ecryptfs depedency, only libsoftokn is needed - format libsoftokn help text a bit nicer rules/ecryptfs-utils.in | 1 + rules/nss.in| 58 ++--- rules/nss.make | 22 +--- rules/qt5.in| 2 ++ 4 files changed, 71 insertions(+), 12 deletions(-) diff --git a/rules/ecryptfs-utils.in b/rules/ecryptfs-utils.in index 5087f79d3ca2..8a62443bdddb 100644 --- a/rules/ecryptfs-utils.in +++ b/rules/ecryptfs-utils.in @@ -5,6 +5,7 @@ menuconfig ECRYPTFS_UTILS prompt "ecryptfs-utils" select KEYUTILS select NSS + select NSS_INSTALL_LIBSOFTOKN select HOST_INTLTOOL select BASH if ECRYPTFS_UTILS_TESTS select COREUTILSif ECRYPTFS_UTILS_TESTS diff --git a/rules/nss.in b/rules/nss.in index 3e4a07a75404..799bd5a73ae0 100644 --- a/rules/nss.in +++ b/rules/nss.in @@ -1,13 +1,65 @@ ## SECTION=networking -config NSS +menuconfig NSS tristate - prompt "nss" + prompt "nss " select NSPR - select SQLITE + select SQLITE if NSS_INSTALL_LIBSOFTOKN help Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards. + +if NSS + +config NSS_INSTALL_LIBSMIME + bool + prompt "install libsmime" + default y + help + Install libsmime3.so, which adds about ~90 kiB to the footprint. + + libsmime provides functionality related to S/MIME (Cryptographic + Message Syntax, PKCS#7) used by secure email and some instant + messaging implementations. + +config NSS_INSTALL_LIBSSL + bool + prompt "install libssl" + default y + help + Install libssl3.so, which adds about ~200 kiB to the footprint. + + libssl implements the Secure Sockets Layer/Transport Layer Security + network protocols. + +config NSS_INSTALL_LIBNSSCKBI + bool + prompt "install libnssckbi" + default y + help + Install libnssckbi.so, which adds about ~350 kiB to the footprint. + + CKBI is a PKCS#11 module which provides a set of trust anchors (Root + CAs) and their trust assignments. + +config NSS_INSTALL_LIBSOFTOKN + bool + prompt "install libsoftokn" + default y + help + Install libfreebl3.so, libfreeblpriv3.so, libsoftokn3.so, and + libnssdbm3.so, which add about ~530 kB to the footprint, as well as an + additional dependency on SQLite. + + FreeBL is a base library providing hash functions, big number + calculations, and cryptographic algorithms. + + DBM is a legacy library providing database storage. + + Softoken is an NSS module that exposes most FreeBL functionality as a + PKCS#11 module, and can make use of DBM or SQLite at runtime. + +endif diff --git a/rules/nss.make b/rules/nss.make index 44febc416711..6a003dd1743f 100644 --- a/rules/nss.make +++ b/rules/nss.make @@ -48,13 +48,18 @@ NSS_MAKE_ENV := \ BUILD_OPT=1 \ MOZILLA_CLIENT=1 \ NS_USE_GCC=1 \ - NSS_USE_SYSTEM_SQLITE=1 \ NSS_ENABLE_ECC=1 \ NSS_DISABLE_GTESTS=1 \ NSPR_INCLUDE_DIR=$(SYSROOT)/usr/include/nspr \ USE_64=$(call ptx/ifdef, PTXCONF_ARCH_LP64,1) \ USE_NEON=$(call ptx/ifdef, PTXCONF_ARCH_ARM_NEON,1) +# unless needed, prevent an additional runtime dependency by using the bundled, +# statically-linked sqlite, but not installing anything that links to it +ifndef PTXCONF_NSS_INSTALL_LIBSOFTOKN +NSS_MAKE_ENV += NSS_USE_SYSTEM_SQLITE=1 +endif + NSS_MAKE_PAR := NO NSS_MAKE_OPT := \ OS_ARCH=Linux \ @@ -72,14 +77,13 @@ NSS_INSTALL_OPT := \ NSS_LIBS := \ libnss3 \ libnssutil3 \ - libsmime3 \ - libssl3 \ - libfreebl3 \ - libfreeblpriv3 \ - libnssckbi \ - libnssdbm3 \ - libsoftokn3 - + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSMIME, libsmime3,) \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSSL, libssl3,) \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBNSSCKBI, libnssc
[ptxdist] [PATCH] libblkid: remove dependency to libuuid
As a virtual package, libblkid should not infer any dependencies of the concrete implementation. For example, util-linux-ng's libblkid can be built without libuuid, so the current situation will lead to an unused libuuid.so being installed on the target. Signed-off-by: Roland Hieber --- rules/libblkid.in | 1 - 1 file changed, 1 deletion(-) diff --git a/rules/libblkid.in b/rules/libblkid.in index fdff17c7884e..f4dca17de8bd 100644 --- a/rules/libblkid.in +++ b/rules/libblkid.in @@ -3,7 +3,6 @@ config LIBBLKID tristate select VIRTUAL - select LIBUUID select UTIL_LINUX_NG select UTIL_LINUX_NG_LIBBLKID help -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] udev: remove redundant dependency on host-gperf
As a virtual package, udev should not infer any dependencies of the concrete implementation. Also, both systemd and udev-legacy already select host-gperf on their own. Signed-off-by: Roland Hieber --- rules/udev.in | 1 - 1 file changed, 1 deletion(-) diff --git a/rules/udev.in b/rules/udev.in index 6747084dec77..a682dcc4b6d7 100644 --- a/rules/udev.in +++ b/rules/udev.in @@ -3,7 +3,6 @@ config UDEV tristate select VIRTUAL - select HOST_GPERF select SYSTEMD if INITMETHOD_SYSTEMD select UDEV_LEGACY if !INITMETHOD_SYSTEMD -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 2/5] dc3dd: remove after one year in staging
Signed-off-by: Roland Hieber --- rules/dc3dd.in | 16 - rules/dc3dd.make | 60 2 files changed, 76 deletions(-) delete mode 100644 rules/dc3dd.in delete mode 100644 rules/dc3dd.make diff --git a/rules/dc3dd.in b/rules/dc3dd.in deleted file mode 100644 index e2d57688a590.. --- a/rules/dc3dd.in +++ /dev/null @@ -1,16 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=disk_and_file - -config DC3DD - tristate - select LIBC_PTHREAD - select LIBC - prompt "dc3dd" - help - dc3dd is a patched version of GNU dd with added features for computer forensics. - It was developed at the DoD Cyber Crime Center by Jesse Kornblum. - See https://tools.kali.org/forensics/dc3dd for usage. - - STAGING: remove in ptxdist-2020.06.0 - Old version that need to be updated. Fails to build with glibc-2.28. diff --git a/rules/dc3dd.make b/rules/dc3dd.make deleted file mode 100644 index 7c7b03ac.. --- a/rules/dc3dd.make +++ /dev/null @@ -1,60 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2016 by Thorsten Liepert -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -PACKAGES-$(PTXCONF_DC3DD) += dc3dd - -DC3DD_VERSION := 7.2.641 -DC3DD_MD5 := 63987a467310d7b8a5102cb33e1945f4 -DC3DD := dc3dd-$(DC3DD_VERSION) -DC3DD_SUFFIX := tar.xz -DC3DD_URL := $(call ptx/mirror, SF, dc3dd/7.2/dc3dd-$(DC3DD_VERSION).$(DC3DD_SUFFIX)) -DC3DD_SOURCE := $(SRCDIR)/$(DC3DD).$(DC3DD_SUFFIX) -DC3DD_DIR := $(BUILDDIR)/$(DC3DD) -DC3DD_LICENSE := GPL-3.0-or-later -DC3DD_LICENSE_FILES:= file://COPYING;md5=d32239bcb673463ab874e80d47fae504 - -# -# Prepare -# - -DC3DD_CONF_ENV := \ - $(CROSS_ENV) \ - PERL= - -DC3DD_CONF_TOOL:= autoconf -DC3DD_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - $(GLOBAL_LARGE_FILE_OPTION) \ - --enable-dependency-tracking \ - --disable-assert \ - --disable-rpath \ - --disable-hdparm \ - --disable-nls \ - --without-included-regex \ - --with-gnu-ld - -# -# Target-Install -# - -$(STATEDIR)/dc3dd.targetinstall: - @$(call targetinfo) - - @$(call install_init, dc3dd) - @$(call install_fixup, dc3dd,PRIORITY,optional) - @$(call install_fixup, dc3dd,SECTION,base) - @$(call install_fixup, dc3dd,AUTHOR,"Thorsten Liepert ") - @$(call install_fixup, dc3dd,DESCRIPTION,missing) - - @$(call install_copy, dc3dd, 0, 0, 0755, -, /usr/bin/dc3dd) - - @$(call install_finish, dc3dd) - - @$(call touch) - -# vim: syntax=make -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 1/5] ustr: move to staging
The download server has been down for more than one week now. The packages was never updated since commit b4c224b6f93802ff2adf (2013-01-07, Wolfram Sang: "ustr: add package"), and the Debian package changelog [0] also shows no new versions since 2008. The only user, libsemanage, is already in staging. [0]: https://metadata.ftp-master.debian.org/changelogs//main/u/ustr/ustr_1.0.4-3_changelog Signed-off-by: Roland Hieber --- rules/host-ustr.in | 7 ++- rules/ustr.in | 7 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/rules/host-ustr.in b/rules/host-ustr.in index a64b4fd3eca3..65c8c2b895b9 100644 --- a/rules/host-ustr.in +++ b/rules/host-ustr.in @@ -1,5 +1,10 @@ -## SECTION=hosttools_noprompt +## SECTION=staging +## old section: +### SECTION=hosttools_noprompt config HOST_USTR tristate default y if ALLYES + help + STAGING: remove in PTXdist 2021.07.0 + No new versions since 2008, and fails to download. diff --git a/rules/ustr.in b/rules/ustr.in index 5546f564b49d..60cfe89f8dc6 100644 --- a/rules/ustr.in +++ b/rules/ustr.in @@ -1,4 +1,6 @@ -## SECTION=system_libraries +## SECTION=staging +## old section: +### SECTION=system_libraries config USTR tristate @@ -7,3 +9,6 @@ config USTR ustr (Micro string library) is a string API for C. It has tiny overhead over just plain strdup(), is much safer, is easier to use, is faster for many operations, can be used with read-only or automatically allocated data. + + STAGING: remove in PTXdist 2021.07.0 + No new versions since 2008, and fails to download. -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 5/5] udisks: remove after one year in staging
Signed-off-by: Roland Hieber --- patches/udisks-1.0.0/autogen.sh | 1 - patches/udisks-1.0.0/devmapper-optional.diff | 58 --- patches/udisks-1.0.0/libparted-optional.diff | 90 patches/udisks-1.0.0/libsgutils-optional.diff | 68 --- patches/udisks-1.0.0/series | 4 - patches/udisks-1.0.0/smart-optional.diff | 415 -- rules/udisks.in | 54 --- rules/udisks.make | 117 - 8 files changed, 807 deletions(-) delete mode 12 patches/udisks-1.0.0/autogen.sh delete mode 100644 patches/udisks-1.0.0/devmapper-optional.diff delete mode 100644 patches/udisks-1.0.0/libparted-optional.diff delete mode 100644 patches/udisks-1.0.0/libsgutils-optional.diff delete mode 100644 patches/udisks-1.0.0/series delete mode 100644 patches/udisks-1.0.0/smart-optional.diff delete mode 100644 rules/udisks.in delete mode 100644 rules/udisks.make diff --git a/patches/udisks-1.0.0/autogen.sh b/patches/udisks-1.0.0/autogen.sh deleted file mode 12 index 9f8a4cb7ddcb.. --- a/patches/udisks-1.0.0/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh \ No newline at end of file diff --git a/patches/udisks-1.0.0/devmapper-optional.diff b/patches/udisks-1.0.0/devmapper-optional.diff deleted file mode 100644 index 3a7a3368b820.. --- a/patches/udisks-1.0.0/devmapper-optional.diff +++ /dev/null @@ -1,58 +0,0 @@ -From: Michael Olbrich -Subject: make devmapper dependency optional - -This patch adds a configure option for devmapper. -When disabled, the helper program using it will not be built. - -Signed-off-by: Michael Olbrich - - configure.ac| 11 --- - src/probers/Makefile.am |5 - - 2 files changed, 12 insertions(+), 4 deletions(-) - -Index: b/configure.ac -=== a/configure.ac -+++ b/configure.ac -@@ -173,9 +173,14 @@ if test "x$enable_libparted" = xyes; the - fi - AM_CONDITIONAL(LIBPARTED_ENABLED, test "x$enable_libparted" = xyes) - --PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02]) --AC_SUBST(DEVMAPPER_CFLAGS) --AC_SUBST(DEVMAPPER_LIBS) -+AC_ARG_ENABLE(devmapper,[ --disable-devmapper],enable_devmapper=$enableval,enable_devmapper=yes) -+ -+if test "x$enable_devmapper" = xyes; then -+ PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02]) -+ AC_SUBST(DEVMAPPER_CFLAGS) -+ AC_SUBST(DEVMAPPER_LIBS) -+fi -+AM_CONDITIONAL(DEVMAPPER_ENABLED, test "x$enable_devmapper" = xyes) - - have_lvm2=no - AC_ARG_ENABLE(lvm2, AS_HELP_STRING([--disable-lvm2], [disable LVM2 support])) -Index: b/src/probers/Makefile.am -=== a/src/probers/Makefile.am -+++ b/src/probers/Makefile.am -@@ -22,7 +22,6 @@ INCLUDES = \ - - udevhelperdir = $(slashlibdir)/udev - udevhelper_PROGRAMS = \ -- udisks-dm-export\ - udisks-probe-ata-smart \ - udisks-probe-sas-expander \ - $(NULL) -@@ -31,6 +30,10 @@ if LIBPARTED_ENABLED - udevhelper_PROGRAMS += udisks-part-id - endif - -+if DEVMAPPER_ENABLED -+udevhelper_PROGRAMS += udisks-dm-export -+endif -+ - if HAVE_LVM2 - udevhelper_PROGRAMS += udisks-lvm-pv-export - endif diff --git a/patches/udisks-1.0.0/libparted-optional.diff b/patches/udisks-1.0.0/libparted-optional.diff deleted file mode 100644 index e5027ccf17d3.. --- a/patches/udisks-1.0.0/libparted-optional.diff +++ /dev/null @@ -1,90 +0,0 @@ -From: Michael Olbrich -Subject: make libparted dependency optional - -This patch adds a configure option for libparted. -When disabled, the helper programs using it will not be built. - -Signed-off-by: Michael Olbrich - - configure.ac| 11 --- - src/helpers/Makefile.am | 13 + - src/probers/Makefile.am |6 +- - 3 files changed, 22 insertions(+), 8 deletions(-) - -Index: b/configure.ac -=== a/configure.ac -+++ b/configure.ac -@@ -164,9 +164,14 @@ PKG_CHECK_MODULES(POLKIT_BACKEND_1, [pol - AC_SUBST(POLKIT_BACKEND_1_CFLAGS) - AC_SUBST(POLKIT_BACKEND_1_LIBS) - --PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8]) --AC_SUBST(LIBPARTED_CFLAGS) --AC_SUBST(LIBPARTED_LIBS) -+AC_ARG_ENABLE(libparted,[ --disable-libparted],enable_libparted=$enableval,enable_libparted=yes) -+ -+if test "x$enable_libparted" = xyes; then -+ PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8]) -+ AC_SUBST(LIBPARTED_CFLAGS) -+ AC_SUBST(LIBPARTED_LIBS) -+fi -+AM_CONDITIONAL(LIBPARTED_ENABLED, test "x$enable_libparted" = xyes) - - PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02]) - AC_SUBST(DEVMAPPER_CFLAGS) -Index: b/src/helpers/Makefile.am -==
[ptxdist] [PATCH 4/5] sepolgen: remove after one year in staging
Signed-off-by: Roland Hieber --- rules/policycoreutils.in | 34 - rules/sepolgen.in| 29 - rules/sepolgen.make | 54 3 files changed, 117 deletions(-) delete mode 100644 rules/sepolgen.in delete mode 100644 rules/sepolgen.make diff --git a/rules/policycoreutils.in b/rules/policycoreutils.in index 856b50046d5b..27347b9f0188 100644 --- a/rules/policycoreutils.in +++ b/rules/policycoreutils.in @@ -11,7 +11,6 @@ menuconfig POLICYCOREUTILS select LIBSEMANAGE select LIBSEPOL select DBUS_GLIBif POLICYCOREUTILS_RESTORECOND - select SEPOLGEN if POLICYCOREUTILS_PYTHON select BUSYBOX_FEATURE_FIND_DEPTH if BUSYBOX_FIND select BUSYBOX_FEATURE_FIND_DELETE if BUSYBOX_FIND select BUSYBOX_SELINUX if BUSYBOX_FIND @@ -28,39 +27,6 @@ menuconfig POLICYCOREUTILS if POLICYCOREUTILS -menuconfig POLICYCOREUTILS_PYTHON - depends on STAGING - bool "python based tools" - -if POLICYCOREUTILS_PYTHON - -config POLICYCOREUTILS_AUDIT2ALLOW - bool "audit2allow" - -config POLICYCOREUTILS_SEPOLGEN_IFGEN - select POLICYCOREUTILS_AUDIT2ALLOW - bool "sepolgen-ifgen" - -config POLICYCOREUTILS_AUDIT2WHY - select POLICYCOREUTILS_AUDIT2ALLOW - bool "audit2why" - -config POLICYCOREUTILS_SANDBOX - bool "sandbox" - depends on BROKEN - -config POLICYCOREUTILS_CHCAT - select LIBSEMANAGE_PYTHON - depends on BROKEN - bool "chcat" - -config POLICYCOREUTILS_SEMANAGE - select LIBSEMANAGE_PYTHON - depends on BROKEN - bool "semanage" - -endif - config POLICYCOREUTILS_LOAD_POLICY bool "load_policy" diff --git a/rules/sepolgen.in b/rules/sepolgen.in deleted file mode 100644 index 94f2ce071ab8.. --- a/rules/sepolgen.in +++ /dev/null @@ -1,29 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=selinux - -config SEPOLGEN - tristate - prompt "sepolgen" - select PYTHON - select LIBSELINUX - select LIBSELINUX_PYTHON - help - A Python module used in SELinux policy generation - - This package contains a Python module that forms the core of - the modern audit2allow (which is a part of the package - policycoreutils). The sepolgen library is structured to give - flexibility to the application using it. The library - contains: Reference Policy Representation, which are Objects - for representing policies and the reference policy - interfaces. Secondly, it has objects and algorithms for - representing access and sets of access in an abstract way - and searching that access. It also has a parser for - reference policy "headers". It contains infrastructure for - parsing SELinux related messages as produced by the audit - system. It has facilities for generating policy based on - required access. - - STAGING: remove in ptxdist-2020.06.0 - Old version that needs to be updated. diff --git a/rules/sepolgen.make b/rules/sepolgen.make deleted file mode 100644 index 7084e1d1d348.. --- a/rules/sepolgen.make +++ /dev/null @@ -1,54 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2013 by Marc Kleine-Budde -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_SEPOLGEN) += sepolgen - -# -# Paths and names -# -SEPOLGEN_VERSION := 1.1.8 -SEPOLGEN_MD5 := d734ff236639cc1bd3a33901774fa98d -SEPOLGEN := sepolgen-$(SEPOLGEN_VERSION) -SEPOLGEN_SUFFIX:= tar.gz -SEPOLGEN_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(SEPOLGEN).$(SEPOLGEN_SUFFIX) -SEPOLGEN_SOURCE:= $(SRCDIR)/$(SEPOLGEN).$(SEPOLGEN_SUFFIX) -SEPOLGEN_DIR := $(BUILDDIR)/$(SEPOLGEN) -SEPOLGEN_LICENSE := GPL-2.0-only - -# -# Prepare -# - -SEPOLGEN_CONF_TOOL := NO -# no ':=' because of $(PYTHON_SITEPACKAGES) -SEPOLGEN_MAKE_ENV = PYTHONLIBDIR=$(PYTHON_SITEPACKAGES) - -# -# Target-Install -# - -$(STATEDIR)/sepolgen.targetinstall: - @$(call targetinfo) - - @$(call install_init, sepolgen) - @$(call install_fixup, sepolgen,PRIORITY,optional) - @$(call install_fixup, sepolgen,SECTION,base) - @$(call install_fixup, sepolgen,AUTHOR,"Marc Kleine-Budde ") - @$(ca
[ptxdist] [PATCH 3/5] mono: remove after one year in staging
Signed-off-by: Roland Hieber --- ...om-Kyle-Edwards-kyleedwardsny-gmail..patch | 22 --- patches/mono-3.2.8/autogen.sh | 1 - patches/mono-3.2.8/series | 4 - rules/mono.in | 14 -- rules/mono.make | 153 -- 5 files changed, 194 deletions(-) delete mode 100644 patches/mono-3.2.8/0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch delete mode 12 patches/mono-3.2.8/autogen.sh delete mode 100644 patches/mono-3.2.8/series delete mode 100644 rules/mono.in delete mode 100644 rules/mono.make diff --git a/patches/mono-3.2.8/0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch b/patches/mono-3.2.8/0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch deleted file mode 100644 index c6652bcde744.. --- a/patches/mono-3.2.8/0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Zoltan Varga -Date: Tue, 3 Jun 2014 16:07:40 +0200 -Subject: [PATCH] Applied patch from Kyle Edwards . - Fix isinf () check with clang. Fixes #20244. - - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 493f671c2a7d..0a390788d125 100644 a/configure.in -+++ b/configure.in -@@ -475,7 +475,7 @@ AC_CHECK_HEADERS(wchar.h) - AC_CHECK_HEADERS(ieeefp.h) - AC_MSG_CHECKING(for isinf) - AC_TRY_LINK([#include ], [ -- int f = isinf (1); -+ int f = isinf (1.0); - ], [ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_ISINF, 1, [isinf available]) diff --git a/patches/mono-3.2.8/autogen.sh b/patches/mono-3.2.8/autogen.sh deleted file mode 12 index 9f8a4cb7ddcb.. --- a/patches/mono-3.2.8/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh \ No newline at end of file diff --git a/patches/mono-3.2.8/series b/patches/mono-3.2.8/series deleted file mode 100644 index 4c270b930294.. --- a/patches/mono-3.2.8/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch -# d06d73e43cdc6dae035f536c6595128b - git-ptx-patches magic diff --git a/rules/mono.in b/rules/mono.in deleted file mode 100644 index 386616b648e0.. --- a/rules/mono.in +++ /dev/null @@ -1,14 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=bytecode_engines - -config MONO - tristate - select GLIB - prompt "mono" - help - mono is a runtime implementation of the ECMA Common Language - Infrastructure. It can be used to run ECMA and .NET applications. - - STAGING: remove in ptxdist-2020.06.0 - Old version that need to be updated. Fails to build with glibc-2.28. diff --git a/rules/mono.make b/rules/mono.make deleted file mode 100644 index 4c014ff05ae5.. --- a/rules/mono.make +++ /dev/null @@ -1,153 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2010 by Robert Schwebel -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -ifndef PTXCONF_ARCH_ARM64 -PACKAGES-$(PTXCONF_MONO) += mono -endif - -# -# Paths and names -# -MONO_VERSION := 3.2.8 -MONO_MD5 := 1075f99bd8a69890af9e30309728e684 -MONO := mono-$(MONO_VERSION) -MONO_SUFFIX:= tar.bz2 -MONO_URL := http://download.mono-project.com/sources/mono/$(MONO).$(MONO_SUFFIX) -MONO_SOURCE:= $(SRCDIR)/$(MONO).$(MONO_SUFFIX) -MONO_DIR := $(BUILDDIR)/$(MONO) -MONO_LICENSE := unknown -MONO_DEVPKG:= NO - -# -# Extract -# - -$(STATEDIR)/mono.extract: - @$(call targetinfo) - @$(call clean, $(MONO_DIR)) - @$(call extract, MONO) -# # The mono archive has some stray .git files in it's externals-subdirs - @find $(MONO_DIR) -name .git -print0 | xargs -0 rm -v - @$(call patchin, MONO) - @$(call touch) - -# -# Prepare -# - -MONO_CONF_ENV := \ - $(CROSS_ENV) \ - CPPFLAGS="$(CROSS_CPPFLAGS) $(call ptx/ifdef, PTXCONF_HAS_HARDFLOAT,,-DARM_FPU_NONE)" \ - mono_cv_uscore=yes -# -# autoconf -# -MONO_CONF_TOOL := autoconf -MONO_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - --disable-solaris-tar-check \ - --disable-nls \ - --disable-mcs-build \ - --enable-silent-rules \ - --disable-parallel-mark \ - --disable-dev-random \ - --enable-shared-handles \ - --disable-nunit-tests \ - --disable-big-arrays \ - --disable-dtrace \ - --disable-llvm \ - --disable-loadedllvm \ - --d
Re: [ptxdist] [PATCH v3 1/2] nss: make installed libraries configurable
On Fri, Jun 19, 2020 at 05:04:47PM +0200, Michael Olbrich wrote: > On Fri, Jun 19, 2020 at 03:44:24PM +0200, Roland Hieber wrote: > > Most NSS modules are only needed if any software links to them, or loads > > them at runtime (e.g. as a PKCS#11 module). In extreme cases, we can > > slim down the installation by more than 1 MiB, and also get rid of the > > SQLite dependency. > > > > Qt5WebEngine and ecryptfs-utils are currently the only users of NSS, pin > > down their respective sub-dependencies. > > > > Signed-off-by: Roland Hieber > > --- > > v2 -> v3: no changes > > > > v1 -> v2: > > - rebase onto current master > > - fix ecryptfs depedency, only libsoftokn is needed > > - format libsoftokn help text a bit nicer > > > > rules/ecryptfs-utils.in | 1 + > > rules/nss.in| 58 ++--- > > rules/nss.make | 22 +--- > > rules/qt5.in| 2 ++ > > 4 files changed, 71 insertions(+), 12 deletions(-) > > > > diff --git a/rules/ecryptfs-utils.in b/rules/ecryptfs-utils.in > > index 5087f79d3ca2..8a62443bdddb 100644 > > --- a/rules/ecryptfs-utils.in > > +++ b/rules/ecryptfs-utils.in > > @@ -5,6 +5,7 @@ menuconfig ECRYPTFS_UTILS > > prompt "ecryptfs-utils" > > select KEYUTILS > > select NSS > > + select NSS_INSTALL_LIBSOFTOKN > > This is loaded dynamically, right? There should be a comment here, > otherwise someone will try to remove it because it seems unused. > > > select HOST_INTLTOOL > > select BASH if ECRYPTFS_UTILS_TESTS > > select COREUTILSif ECRYPTFS_UTILS_TESTS > > diff --git a/rules/nss.in b/rules/nss.in > > index 3e4a07a75404..799bd5a73ae0 100644 > > --- a/rules/nss.in > > +++ b/rules/nss.in > > @@ -1,13 +1,65 @@ > > ## SECTION=networking > > > > -config NSS > > +menuconfig NSS > > tristate > > - prompt "nss" > > + prompt "nss " > > select NSPR > > - select SQLITE > > + select SQLITE if NSS_INSTALL_LIBSOFTOKN > > help > > Network Security Services (NSS) is a set of libraries designed to > > support cross-platform development of security-enabled client and > > server applications. Applications built with NSS can support > > SSL v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, > > X.509 v3 certificates, and other security standards. > > + > > +if NSS > > + > > +config NSS_INSTALL_LIBSMIME > > + bool > > + prompt "install libsmime" > > + default y > > Remove the default. This is something libs/programs link to, so building > will fail if its needed and missing. > > > + help > > + Install libsmime3.so, which adds about ~90 kiB to the footprint. > > + > > + libsmime provides functionality related to S/MIME (Cryptographic > > + Message Syntax, PKCS#7) used by secure email and some instant > > + messaging implementations. > > + > > +config NSS_INSTALL_LIBSSL > > + bool > > + prompt "install libssl" > > + default y > > Same here. > > > + help > > + Install libssl3.so, which adds about ~200 kiB to the footprint. > > + > > + libssl implements the Secure Sockets Layer/Transport Layer Security > > + network protocols. > > + > > +config NSS_INSTALL_LIBNSSCKBI > > + bool > > + prompt "install libnssckbi" > > + default y > > + help > > + Install libnssckbi.so, which adds about ~350 kiB to the footprint. > > + > > + CKBI is a PKCS#11 module which provides a set of trust anchors (Root > > + CAs) and their trust assignments. > > This is loaded dynamically. So how should a package creator know, when this > is needed? > > > +config NSS_INSTALL_LIBSOFTOKN > > + bool > > + prompt "install libsoftokn" > > + default y > > + help > > + Install libfreebl3.so, libfreeblpriv3.so, libsoftokn3.so, and > > + libnssdbm3.so, which add about ~530 kB to the footprint, as well as an > > + additional dependency on SQLite. > > + > > + FreeBL is a base library providing hash functions, big number > > + calculations, and cryptographic algorithms. > > + > > + DBM is a legacy library providing database storage. > > Is this loaded dynamically? I&#x
Re: [ptxdist] [PATCH 3/7] ptxd_make_world_get: make 'ptxdist urlcheck' idempotent
On Fri, Jun 19, 2020 at 01:07:22PM +0200, Michael Olbrich wrote: > On Fri, Jun 19, 2020 at 10:22:55AM +0200, Roland Hieber wrote: > > On Fri, Jun 19, 2020 at 07:34:01AM +0200, Michael Olbrich wrote: > > > On Sat, Jun 13, 2020 at 03:32:45AM +0200, Roland Hieber wrote: > > > > There is no guarantee that URLs will still work the next time we want to > > > > check them, so try to fetch the URL every time instead of caching the > > > > result. This also makes iterations of editing the URL in the rule file > > > > and testing if it works quicker. > > > > > > > > Unfortunately, GNU make skips implicit rules for .PHONY targets, but it > > > > is unlikely that $(STATEDIR)/%.urlcheck is created by something other > > > > than PTXdist, so removing the $(call touch) is a good approximation for > > > > phony behaviour. > > > > > > No. This is deliberately like this. I want to run 'ptxdist urlcheck', fix > > > errors and then continue with the rest. > > > > Can you not use -k to do this? > > I do that. But without the successful cache, I need to track all failures > manually because I cannot call 'urlcheck' again. To check the rest. Ah, I now understand what you mean. Of course, successfully checked URLs should be cached, but my change breaks that. My intention with this patch was that the failed urlchecks are not cached if they are unsuccessful. But somehow I can no longer reproduce that problem, an unsuccessful urlcheck now fails without creating the state file... so I guess everything should be fine without this patch. > > Caching an error state is at least unusual, and it is not done anywhere > > else in PTXdist, so this breaks the principle of least surprise. > > On the contrary. In general, if something was successful, then we don't do > it again unless there is a clear indication that the input has changed. > In all other cases an explicit 'drop' or 'clean' is needed. > > For example, we don't skip the 'touch' for local_src/ links either. Even > though the code can change any time. I meant, if a package fails to compile or install, we don't cache that state, so the next ptxdist go will try to build it again. Of course, not all error states result in a compilation failure, but we can do the best and fail for those that do. - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] template: kernel: fix make syntax
The closing brace for the foreach macro was removed when the line was
converted from ';' to '$(ptx/nl)'.
Fixes: 5b006ca1670901a4b74a ("template-kernel: use ptx/nl")
Signed-off-by: Roland Hieber
---
rules/templates/template-kernel-make | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/rules/templates/template-kernel-make
b/rules/templates/template-kernel-make
index e5b09daa047b..4891b17af758 100644
--- a/rules/templates/template-kernel-make
+++ b/rules/templates/template-kernel-make
@@ -80,7 +80,8 @@ $(STATEDIR)/kernel-@package@.install:
@$(call targetinfo)
@$(call world/install, KERNEL_@PACKAGE@)
@$(foreach image, $(KERNEL_@PACKAGE@_IMAGES), \
- install -m 644 $(image) $(IMAGEDIR)/$(notdir
$(image))-@package@$(ptx/nl)
+ install -m 644 $(image) $(IMAGEDIR)/$(notdir
$(image))-@package@$(ptx/nl) \
+ )
@$(call touch)
#
--
2.27.0
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v2] sepolgen: remove after one year in staging
Signed-off-by: Roland Hieber --- v2: - policycoreutils.in: replace STAGING with BROKEN for POLICYCOREUTILS_PYTHON (Feedback from Michael Olbrich) rules/policycoreutils.in | 2 +- rules/sepolgen.in| 29 - rules/sepolgen.make | 54 3 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 rules/sepolgen.in delete mode 100644 rules/sepolgen.make diff --git a/rules/policycoreutils.in b/rules/policycoreutils.in index 856b50046d5b..2c02affdbd4f 100644 --- a/rules/policycoreutils.in +++ b/rules/policycoreutils.in @@ -29,7 +29,7 @@ menuconfig POLICYCOREUTILS if POLICYCOREUTILS menuconfig POLICYCOREUTILS_PYTHON - depends on STAGING + depends on BROKEN bool "python based tools" if POLICYCOREUTILS_PYTHON diff --git a/rules/sepolgen.in b/rules/sepolgen.in deleted file mode 100644 index 94f2ce071ab8.. --- a/rules/sepolgen.in +++ /dev/null @@ -1,29 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=selinux - -config SEPOLGEN - tristate - prompt "sepolgen" - select PYTHON - select LIBSELINUX - select LIBSELINUX_PYTHON - help - A Python module used in SELinux policy generation - - This package contains a Python module that forms the core of - the modern audit2allow (which is a part of the package - policycoreutils). The sepolgen library is structured to give - flexibility to the application using it. The library - contains: Reference Policy Representation, which are Objects - for representing policies and the reference policy - interfaces. Secondly, it has objects and algorithms for - representing access and sets of access in an abstract way - and searching that access. It also has a parser for - reference policy "headers". It contains infrastructure for - parsing SELinux related messages as produced by the audit - system. It has facilities for generating policy based on - required access. - - STAGING: remove in ptxdist-2020.06.0 - Old version that needs to be updated. diff --git a/rules/sepolgen.make b/rules/sepolgen.make deleted file mode 100644 index 7084e1d1d348.. --- a/rules/sepolgen.make +++ /dev/null @@ -1,54 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2013 by Marc Kleine-Budde -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_SEPOLGEN) += sepolgen - -# -# Paths and names -# -SEPOLGEN_VERSION := 1.1.8 -SEPOLGEN_MD5 := d734ff236639cc1bd3a33901774fa98d -SEPOLGEN := sepolgen-$(SEPOLGEN_VERSION) -SEPOLGEN_SUFFIX:= tar.gz -SEPOLGEN_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(SEPOLGEN).$(SEPOLGEN_SUFFIX) -SEPOLGEN_SOURCE:= $(SRCDIR)/$(SEPOLGEN).$(SEPOLGEN_SUFFIX) -SEPOLGEN_DIR := $(BUILDDIR)/$(SEPOLGEN) -SEPOLGEN_LICENSE := GPL-2.0-only - -# -# Prepare -# - -SEPOLGEN_CONF_TOOL := NO -# no ':=' because of $(PYTHON_SITEPACKAGES) -SEPOLGEN_MAKE_ENV = PYTHONLIBDIR=$(PYTHON_SITEPACKAGES) - -# -# Target-Install -# - -$(STATEDIR)/sepolgen.targetinstall: - @$(call targetinfo) - - @$(call install_init, sepolgen) - @$(call install_fixup, sepolgen,PRIORITY,optional) - @$(call install_fixup, sepolgen,SECTION,base) - @$(call install_fixup, sepolgen,AUTHOR,"Marc Kleine-Budde ") - @$(call install_fixup, sepolgen,DESCRIPTION,missing) - - @$(call install_tree, sepolgen, 0, 0, -, $(PYTHON_SITEPACKAGES)) - @$(call install_alternative, sepolgen, 0, 0, 0644, /var/lib/sepolgen/perm_map) - - @$(call install_finish, sepolgen) - - @$(call touch) - -# vim: syntax=make -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v3] sepolgen: remove after one year in staging
Signed-off-by: Roland Hieber --- v3: - also add an explaining comment why POLICYCOREUTILS_PYTHON is broken (Feedback from Michael Olbrich) v2: - policycoreutils.in: replace STAGING with BROKEN for POLICYCOREUTILS_PYTHON (Feedback from Michael Olbrich) # needs sepolgen rules/policycoreutils.in | 3 ++- rules/sepolgen.in| 29 - rules/sepolgen.make | 54 3 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 rules/sepolgen.in delete mode 100644 rules/sepolgen.make diff --git a/rules/policycoreutils.in b/rules/policycoreutils.in index 856b50046d5b..e5f0f5778556 100644 --- a/rules/policycoreutils.in +++ b/rules/policycoreutils.in @@ -29,7 +29,8 @@ menuconfig POLICYCOREUTILS if POLICYCOREUTILS menuconfig POLICYCOREUTILS_PYTHON - depends on STAGING + # needs sepolgen + depends on BROKEN bool "python based tools" if POLICYCOREUTILS_PYTHON diff --git a/rules/sepolgen.in b/rules/sepolgen.in deleted file mode 100644 index 94f2ce071ab8.. --- a/rules/sepolgen.in +++ /dev/null @@ -1,29 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=selinux - -config SEPOLGEN - tristate - prompt "sepolgen" - select PYTHON - select LIBSELINUX - select LIBSELINUX_PYTHON - help - A Python module used in SELinux policy generation - - This package contains a Python module that forms the core of - the modern audit2allow (which is a part of the package - policycoreutils). The sepolgen library is structured to give - flexibility to the application using it. The library - contains: Reference Policy Representation, which are Objects - for representing policies and the reference policy - interfaces. Secondly, it has objects and algorithms for - representing access and sets of access in an abstract way - and searching that access. It also has a parser for - reference policy "headers". It contains infrastructure for - parsing SELinux related messages as produced by the audit - system. It has facilities for generating policy based on - required access. - - STAGING: remove in ptxdist-2020.06.0 - Old version that needs to be updated. diff --git a/rules/sepolgen.make b/rules/sepolgen.make deleted file mode 100644 index 7084e1d1d348.. --- a/rules/sepolgen.make +++ /dev/null @@ -1,54 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2013 by Marc Kleine-Budde -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_SEPOLGEN) += sepolgen - -# -# Paths and names -# -SEPOLGEN_VERSION := 1.1.8 -SEPOLGEN_MD5 := d734ff236639cc1bd3a33901774fa98d -SEPOLGEN := sepolgen-$(SEPOLGEN_VERSION) -SEPOLGEN_SUFFIX:= tar.gz -SEPOLGEN_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(SEPOLGEN).$(SEPOLGEN_SUFFIX) -SEPOLGEN_SOURCE:= $(SRCDIR)/$(SEPOLGEN).$(SEPOLGEN_SUFFIX) -SEPOLGEN_DIR := $(BUILDDIR)/$(SEPOLGEN) -SEPOLGEN_LICENSE := GPL-2.0-only - -# -# Prepare -# - -SEPOLGEN_CONF_TOOL := NO -# no ':=' because of $(PYTHON_SITEPACKAGES) -SEPOLGEN_MAKE_ENV = PYTHONLIBDIR=$(PYTHON_SITEPACKAGES) - -# -# Target-Install -# - -$(STATEDIR)/sepolgen.targetinstall: - @$(call targetinfo) - - @$(call install_init, sepolgen) - @$(call install_fixup, sepolgen,PRIORITY,optional) - @$(call install_fixup, sepolgen,SECTION,base) - @$(call install_fixup, sepolgen,AUTHOR,"Marc Kleine-Budde ") - @$(call install_fixup, sepolgen,DESCRIPTION,missing) - - @$(call install_tree, sepolgen, 0, 0, -, $(PYTHON_SITEPACKAGES)) - @$(call install_alternative, sepolgen, 0, 0, 0644, /var/lib/sepolgen/perm_map) - - @$(call install_finish, sepolgen) - - @$(call touch) - -# vim: syntax=make -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 7/7] libpopt: replace dead URL with more mirrors
On Fri, Jun 19, 2020 at 07:46:52AM +0200, Michael Olbrich wrote: > On Sat, Jun 13, 2020 at 03:32:49AM +0200, Roland Hieber wrote: > > rpm5.org has been a parking domain for at least 2 years, it is unlikely > > to come back. Add a few other mirrors. > > The file can be found on http://ftp.rpm.org so I changed the URL to that > one. > Note: please don't use Debian pool URLs. Those files are gone, when the > corresponding version is removed from any active Debian release. This would also apply to every URL using the DEB mirror, wouldn't it? We have several rules in PTXdist that use this: ETHERWAKE_TARBALL := etherwake_$(ETHERWAKE_VERSION).orig.$(ETHERWAKE_SUFFIX) ETHERWAKE_URL := $(call ptx/mirror, DEB, pool/main/e/etherwake/$(ETHERWAKE_TARBALL)) - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v2] sepolgen: remove after one year in staging
Signed-off-by: Roland Hieber --- On Mon, Jul 06, 2020 at 08:38:40AM +0200, Michael Olbrich wrote: > .../ptxdist/rules/policycoreutils.in:14:warning: 'select' used by config > symbol 'POLICYCOREUTILS' refers to undefined symbol 'SEPOLGEN' Hmm. Not sure what to do here, so I've removed the select line now. Is this better? - Roland rules/policycoreutils.in | 4 +-- rules/sepolgen.in| 29 - rules/sepolgen.make | 54 3 files changed, 2 insertions(+), 85 deletions(-) delete mode 100644 rules/sepolgen.in delete mode 100644 rules/sepolgen.make diff --git a/rules/policycoreutils.in b/rules/policycoreutils.in index 856b50046d5b..fce42b002821 100644 --- a/rules/policycoreutils.in +++ b/rules/policycoreutils.in @@ -11,7 +11,6 @@ menuconfig POLICYCOREUTILS select LIBSEMANAGE select LIBSEPOL select DBUS_GLIBif POLICYCOREUTILS_RESTORECOND - select SEPOLGEN if POLICYCOREUTILS_PYTHON select BUSYBOX_FEATURE_FIND_DEPTH if BUSYBOX_FIND select BUSYBOX_FEATURE_FIND_DELETE if BUSYBOX_FIND select BUSYBOX_SELINUX if BUSYBOX_FIND @@ -29,7 +28,8 @@ menuconfig POLICYCOREUTILS if POLICYCOREUTILS menuconfig POLICYCOREUTILS_PYTHON - depends on STAGING + # needs sepolgen + depends on BROKEN bool "python based tools" if POLICYCOREUTILS_PYTHON diff --git a/rules/sepolgen.in b/rules/sepolgen.in deleted file mode 100644 index 94f2ce071ab8.. --- a/rules/sepolgen.in +++ /dev/null @@ -1,29 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=selinux - -config SEPOLGEN - tristate - prompt "sepolgen" - select PYTHON - select LIBSELINUX - select LIBSELINUX_PYTHON - help - A Python module used in SELinux policy generation - - This package contains a Python module that forms the core of - the modern audit2allow (which is a part of the package - policycoreutils). The sepolgen library is structured to give - flexibility to the application using it. The library - contains: Reference Policy Representation, which are Objects - for representing policies and the reference policy - interfaces. Secondly, it has objects and algorithms for - representing access and sets of access in an abstract way - and searching that access. It also has a parser for - reference policy "headers". It contains infrastructure for - parsing SELinux related messages as produced by the audit - system. It has facilities for generating policy based on - required access. - - STAGING: remove in ptxdist-2020.06.0 - Old version that needs to be updated. diff --git a/rules/sepolgen.make b/rules/sepolgen.make deleted file mode 100644 index 7084e1d1d348.. --- a/rules/sepolgen.make +++ /dev/null @@ -1,54 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2013 by Marc Kleine-Budde -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_SEPOLGEN) += sepolgen - -# -# Paths and names -# -SEPOLGEN_VERSION := 1.1.8 -SEPOLGEN_MD5 := d734ff236639cc1bd3a33901774fa98d -SEPOLGEN := sepolgen-$(SEPOLGEN_VERSION) -SEPOLGEN_SUFFIX:= tar.gz -SEPOLGEN_URL := https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20120924/$(SEPOLGEN).$(SEPOLGEN_SUFFIX) -SEPOLGEN_SOURCE:= $(SRCDIR)/$(SEPOLGEN).$(SEPOLGEN_SUFFIX) -SEPOLGEN_DIR := $(BUILDDIR)/$(SEPOLGEN) -SEPOLGEN_LICENSE := GPL-2.0-only - -# -# Prepare -# - -SEPOLGEN_CONF_TOOL := NO -# no ':=' because of $(PYTHON_SITEPACKAGES) -SEPOLGEN_MAKE_ENV = PYTHONLIBDIR=$(PYTHON_SITEPACKAGES) - -# -# Target-Install -# - -$(STATEDIR)/sepolgen.targetinstall: - @$(call targetinfo) - - @$(call install_init, sepolgen) - @$(call install_fixup, sepolgen,PRIORITY,optional) - @$(call install_fixup, sepolgen,SECTION,base) - @$(call install_fixup, sepolgen,AUTHOR,"Marc Kleine-Budde ") - @$(call install_fixup, sepolgen,DESCRIPTION,missing) - - @$(call install_tree, sepolgen, 0, 0, -, $(PYTHON_SITEPACKAGES)) - @$(call install_alternative, sepolgen, 0, 0, 0644, /var/lib/sepolgen/perm_map) - - @$(call install_finish, sepolgen) - - @$(call touch) - -# vim: syntax=make -- 2.27.0 _
[ptxdist] [PATCH] bc: prevent file name clash with busybox' bc
Signed-off-by: Roland Hieber --- On Mon, Jul 06, 2020 at 03:19:06PM +0200, Alexander Dahl wrote: > Would one of you care to send a patch? I was just typing one up... :-) - Roland rules/bc.in | 4 1 file changed, 4 insertions(+) diff --git a/rules/bc.in b/rules/bc.in index dabb244b5725..7095adc340b5 100644 --- a/rules/bc.in +++ b/rules/bc.in @@ -2,8 +2,12 @@ config BC tristate prompt "bc" + depends on !BUSYBOX_BC || ALLYES help bc is an arbitrary precision numeric processing language. Syntax is similar to C, but differs in many substantial areas. It supports interactive execution of statements. bc is a utility included in the POSIX P1003.2/D11 draft standard. + +comment "busybox' bc is selected!" + depends on BUSYBOX_BS -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v2] bc: prevent file name clash with busybox' bc
Signed-off-by: Roland Hieber --- v2: fix typo in comment dependency rules/bc.in | 4 1 file changed, 4 insertions(+) diff --git a/rules/bc.in b/rules/bc.in index dabb244b5725..e5776610cd34 100644 --- a/rules/bc.in +++ b/rules/bc.in @@ -2,8 +2,12 @@ config BC tristate prompt "bc" + depends on !BUSYBOX_BC || ALLYES help bc is an arbitrary precision numeric processing language. Syntax is similar to C, but differs in many substantial areas. It supports interactive execution of statements. bc is a utility included in the POSIX P1003.2/D11 draft standard. + +comment "BusyBox' bc is selected!" + depends on BUSYBOX_BC -- 2.27.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
