* [ptxdist] [PATCH 1/7] googletest: new package
@ 2021-06-07 13:09 Roland Hieber
2021-06-07 13:09 ` [ptxdist] [PATCH 2/7] python3-pyro: " Roland Hieber
` (6 more replies)
0 siblings, 7 replies; 21+ messages in thread
From: Roland Hieber @ 2021-06-07 13:09 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/googletest.in | 41 +++++++++++++++++++++++++++
rules/googletest.make | 66 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 107 insertions(+)
create mode 100644 rules/googletest.in
create mode 100644 rules/googletest.make
diff --git a/rules/googletest.in b/rules/googletest.in
new file mode 100644
index 000000000000..ab876ffd8a66
--- /dev/null
+++ b/rules/googletest.in
@@ -0,0 +1,41 @@
+## SECTION=test_suites
+
+config GOOGLETEST
+ select HOST_CMAKE
+ tristate
+ prompt "googletest"
+ help
+ Google's C++ test framework sources
+
+ Google Test is a framework for writing C++ tests on a
+ variety of platforms. Based on the xUnit
+ architecture. Supports automatic test discovery, a rich set
+ of assertions, user-defined assertions, death tests, fatal
+ and non-fatal failures, value- and type-parameterized tests,
+ various options for running the tests, and XML test report
+ generation.
+
+ Google Mock is an extension of Google Test for C++ mocking.
+ Inspired by jMock, EasyMock, and Hamcrest, and designed with
+ C++'s specifics in mind, it can help you derive better
+ designs of your system and write better tests.
+
+ Google Mock:
+
+ * provides a declarative syntax for defining mocks,
+ * can easily define partial (hybrid) mocks, which are a
+ cross of real and mock objects,
+ * handles functions of arbitrary types and overloaded
+ functions,
+ * comes with a rich set of matchers for validating function
+ arguments,
+ * uses an intuitive syntax for controlling the behavior of a
+ mock,
+ * does automatic verification of expectations (no
+ record-and-replay needed),
+ * allows arbitrary (partial) ordering constraints on
+ function calls to be expressed,
+ * lets a user extend it by defining new matchers and
+ actions.
+ * does not use exceptions, and
+ * is easy to learn and use.
diff --git a/rules/googletest.make b/rules/googletest.make
new file mode 100644
index 000000000000..7f0c54f341f6
--- /dev/null
+++ b/rules/googletest.make
@@ -0,0 +1,66 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2018 by Niklas Reisser <Niklas.Reisser@de.bosch.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_GOOGLETEST) += googletest
+
+#
+# Paths and names
+#
+GOOGLETEST_VERSION := 1.8.1
+GOOGLETEST_MD5 := 2e6fbeb6a91310a16efe181886c59596
+GOOGLETEST := googletest-release-$(GOOGLETEST_VERSION)
+GOOGLETEST_SUFFIX := tar.gz
+GOOGLETEST_URL := https://github.com/google/googletest/archive/release-$(GOOGLETEST_VERSION).$(GOOGLETEST_SUFFIX)
+GOOGLETEST_SOURCE := $(SRCDIR)/$(GOOGLETEST).$(GOOGLETEST_SUFFIX)
+GOOGLETEST_DIR := $(BUILDDIR)/$(GOOGLETEST)
+GOOGLETEST_LICENSE := BSD-3-Clause
+GOOGLETEST_LICENSE_FILES := file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+GOOGLETEST_CONF_TOOL := cmake
+GOOGLETEST_CONF_OPT := \
+ $(CROSS_CMAKE_USR) \
+ -DBUILD_GMOCK=ON \
+ -DBUILD_SHARED_LIBS=ON \
+ -DINSTALL_GTEST=ON \
+ -Dgmock_build_tests=OFF \
+ -Dgtest_build_samples=OFF \
+ -Dgtest_build_tests=OFF \
+ -Dgtest_disable_pthreads=OFF \
+ -Dgtest_force_shared_crt=OFF \
+ -Dgtest_hide_internal_symbols=OFF
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/googletest.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, googletest)
+ @$(call install_fixup, googletest,PRIORITY,optional)
+ @$(call install_fixup, googletest,SECTION,base)
+ @$(call install_fixup, googletest,AUTHOR,"Niklas Reisser <Niklas.Reisser@de.bosch.com>")
+ @$(call install_fixup, googletest,DESCRIPTION,missing)
+
+ @$(call install_lib, googletest, 0,0, 0644, libgmock)
+ @$(call install_lib, googletest, 0,0, 0644, libgtest)
+ @$(call install_lib, googletest, 0,0, 0644, libgtest_main)
+ @$(call install_lib, googletest, 0,0, 0644, libgmock_main)
+
+ @$(call install_finish, googletest)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.29.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* [ptxdist] [PATCH 2/7] python3-pyro: new package
2021-06-07 13:09 [ptxdist] [PATCH 1/7] googletest: new package Roland Hieber
@ 2021-06-07 13:09 ` Roland Hieber
2021-06-16 10:35 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-06-07 13:09 ` [ptxdist] [PATCH 3/7] host-extract-cert: version bump 0.1 -> 0.2 Roland Hieber
` (5 subsequent siblings)
6 siblings, 1 reply; 21+ messages in thread
From: Roland Hieber @ 2021-06-07 13:09 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/python3-pyro.in | 20 +++++++++++++++
rules/python3-pyro.make | 55 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 75 insertions(+)
create mode 100644 rules/python3-pyro.in
create mode 100644 rules/python3-pyro.make
diff --git a/rules/python3-pyro.in b/rules/python3-pyro.in
new file mode 100644
index 000000000000..fcf350dccec9
--- /dev/null
+++ b/rules/python3-pyro.in
@@ -0,0 +1,20 @@
+## SECTION=python3
+
+config PYTHON3_PYRO
+ tristate
+ prompt "python3-pyro"
+ select PYTHON3
+ select HOST_PYTHON3_SETUPTOOLS
+
+ help
+ Pyro is a library that enables you to build applications
+ in which objects can talk to each other over the network,
+ with minimal programming effort. You can just use normal
+ Python method calls, with almost every possible parameter
+ and return value type, and Pyro takes care of locating the
+ right object on the right computer to execute the method.
+ It is designed to be very easy to use, and to generally stay
+ out of your way. But it also provides a set of powerful features
+ that enables you to build distributed applications rapidly and
+ effortlessly. Pyro is written in 100% pure Python and therefore
+ runs on many platforms and Python versions, including Python 3.x
diff --git a/rules/python3-pyro.make b/rules/python3-pyro.make
new file mode 100644
index 000000000000..4751931d2ea9
--- /dev/null
+++ b/rules/python3-pyro.make
@@ -0,0 +1,55 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Niklas Reisser <niklas.reisser@de.bosch.com>
+# 2021 by Roland Hieber, Pengutronix <rhi@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PYTHON3_PYRO) += python3-pyro
+
+#
+# Paths and names
+#
+
+PYTHON3_PYRO_VERSION := 4.76
+PYTHON3_PYRO := Pyro4-$(PYTHON3_PYRO_VERSION)
+PYTHON3_PYRO_MD5 := 03a09990328c9f2388ac806fa734689c
+PYTHON3_PYRO_SUFFIX := tar.gz
+PYTHON3_PYRO_URL := $(call ptx/mirror-pypi, pyro4, $(PYTHON3_PYRO_VERSION).$(PYTHON3_PYRO_SUFFIX))
+PYTHON3_PYRO_SOURCE := $(SRCDIR)/$(PYTHON3_PYRO).$(PYTHON3_PYRO_SUFFIX)
+PYTHON3_PYRO_DIR := $(BUILDDIR)/$(PYTHON3_PYRO)
+PYTHON3_PYRO_LICENSE := MIT
+PYTHON3_PYRO_LICENSE_FILES := file://LICENSE;md5=cd13dafd4eeb0802bb6efea6b4a4bdbc
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+PYTHON3_PYRO_CONF_TOOL := python3
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/python3-pyro.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, python3-pyro)
+ @$(call install_fixup, python3-pyro,PRIORITY,optional)
+ @$(call install_fixup, python3-pyro,SECTION,base)
+ @$(call install_fixup, python3-pyro,AUTHOR,"Niklas Reisser <niklas.reisser@de.bosch.com>")
+ @$(call install_fixup, python3-pyro,DESCRIPTION,missing)
+
+ @$(call install_glob, python3-pyro, 0, 0, -, \
+ $(PYTHON3_SITEPACKAGES)/Pyro4,, *.py)
+
+ @$(call install_finish, python3-pyro)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.29.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* [ptxdist] [PATCH 3/7] host-extract-cert: version bump 0.1 -> 0.2
2021-06-07 13:09 [ptxdist] [PATCH 1/7] googletest: new package Roland Hieber
2021-06-07 13:09 ` [ptxdist] [PATCH 2/7] python3-pyro: " Roland Hieber
@ 2021-06-07 13:09 ` Roland Hieber
2021-06-16 10:35 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-06-07 13:09 ` [ptxdist] [PATCH 4/7] ima-evm-utils: fix license statement Roland Hieber
` (4 subsequent siblings)
6 siblings, 1 reply; 21+ messages in thread
From: Roland Hieber @ 2021-06-07 13:09 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--git a/rules/host-extract-cert.make b/rules/host-extract-cert.make
index e2423c584380..df7599011a71 100644
--- a/rules/host-extract-cert.make
+++ b/rules/host-extract-cert.make
@@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_EXTRACT_CERT) += host-extract-cert
#
# Paths and names
#
-HOST_EXTRACT_CERT_VERSION := 0.1
-HOST_EXTRACT_CERT_MD5 := e6c947fd8334b805b4e6aa05d3dcd62e
+HOST_EXTRACT_CERT_VERSION := 0.2
+HOST_EXTRACT_CERT_MD5 := b2ec817a3d8bf9ec126b381642149d60
HOST_EXTRACT_CERT := extract-cert-$(HOST_EXTRACT_CERT_VERSION)
HOST_EXTRACT_CERT_SUFFIX := tar.gz
HOST_EXTRACT_CERT_URL := https://git.pengutronix.de/cgit/extract-cert/snapshot/$(HOST_EXTRACT_CERT).$(HOST_EXTRACT_CERT_SUFFIX)
--
2.29.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* [ptxdist] [PATCH 4/7] ima-evm-utils: fix license statement
2021-06-07 13:09 [ptxdist] [PATCH 1/7] googletest: new package Roland Hieber
2021-06-07 13:09 ` [ptxdist] [PATCH 2/7] python3-pyro: " Roland Hieber
2021-06-07 13:09 ` [ptxdist] [PATCH 3/7] host-extract-cert: version bump 0.1 -> 0.2 Roland Hieber
@ 2021-06-07 13:09 ` Roland Hieber
2021-06-11 12:24 ` Michael Olbrich
2021-06-07 13:09 ` [ptxdist] [PATCH 5/7] ima-evm-utils: version bump 1.1 -> 1.2.1 Roland Hieber
` (3 subsequent siblings)
6 siblings, 1 reply; 21+ messages in thread
From: Roland Hieber @ 2021-06-07 13:09 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/ima-evm-utils.make | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/rules/ima-evm-utils.make b/rules/ima-evm-utils.make
index 1c5e15b1415f..eda5ad8a2883 100644
--- a/rules/ima-evm-utils.make
+++ b/rules/ima-evm-utils.make
@@ -2,6 +2,7 @@
#
# Copyright (C) 2013 by Michael Grzeschik <mgr@pengutronix.de>
# 2015 by Marc Kleine-Budde <mkl@pengutronix.de>
+# 2021 Roland Hieber, Pengutronix <rhi@pengutronix.de>
#
# For further information about the PTXdist project and license conditions
# see the README file.
@@ -22,7 +23,10 @@ IMA_EVM_UTILS_SUFFIX := tar.gz
IMA_EVM_UTILS_URL := $(call ptx/mirror, SF, linux-ima/ima-evm-utils/$(IMA_EVM_UTILS).$(IMA_EVM_UTILS_SUFFIX))
IMA_EVM_UTILS_SOURCE := $(SRCDIR)/$(IMA_EVM_UTILS).$(IMA_EVM_UTILS_SUFFIX)
IMA_EVM_UTILS_DIR := $(BUILDDIR)/$(IMA_EVM_UTILS)
-IMA_EVM_UTILS_LICENSE := LGPL-2.0-or-later
+IMA_EVM_UTILS_LICENSE := GPL-2.0-only WITH unknown-exception
+IMA_EVM_UTILS_LICENSE_FILES := \
+ file://src/evmctl.c;startline=13;endline=35;md5=1e6e51503ab04045269a92c0bc5d5b55 \
+ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
# ----------------------------------------------------------------------------
# Prepare
--
2.29.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* [ptxdist] [PATCH 5/7] ima-evm-utils: version bump 1.1 -> 1.2.1
2021-06-07 13:09 [ptxdist] [PATCH 1/7] googletest: new package Roland Hieber
` (2 preceding siblings ...)
2021-06-07 13:09 ` [ptxdist] [PATCH 4/7] ima-evm-utils: fix license statement Roland Hieber
@ 2021-06-07 13:09 ` Roland Hieber
2021-06-11 12:18 ` Michael Olbrich
2021-06-07 13:09 ` [ptxdist] [PATCH 6/7] rng-tools: allow installing rngtest without rngd Roland Hieber
` (2 subsequent siblings)
6 siblings, 1 reply; 21+ messages in thread
From: Roland Hieber @ 2021-06-07 13:09 UTC (permalink / raw)
To: ptxdist; +Cc: Marc Kleine-Budde, Roland Hieber
The tarball does not include a configure script, generate it in the
extract.post stage.
Based on a patch by Marc Kleine-Budde.
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
patches/ima-evm-utils-1.2.1/autogen.sh | 1 +
rules/ima-evm-utils.make | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
create mode 120000 patches/ima-evm-utils-1.2.1/autogen.sh
diff --git a/patches/ima-evm-utils-1.2.1/autogen.sh b/patches/ima-evm-utils-1.2.1/autogen.sh
new file mode 120000
index 000000000000..9f8a4cb7ddcb
--- /dev/null
+++ b/patches/ima-evm-utils-1.2.1/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/rules/ima-evm-utils.make b/rules/ima-evm-utils.make
index eda5ad8a2883..82c5641e3776 100644
--- a/rules/ima-evm-utils.make
+++ b/rules/ima-evm-utils.make
@@ -1,7 +1,7 @@
# -*-makefile-*-
#
# Copyright (C) 2013 by Michael Grzeschik <mgr@pengutronix.de>
-# 2015 by Marc Kleine-Budde <mkl@pengutronix.de>
+# 2015, 2020 by Marc Kleine-Budde <mkl@pengutronix.de>
# 2021 Roland Hieber, Pengutronix <rhi@pengutronix.de>
#
# For further information about the PTXdist project and license conditions
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_IMA_EVM_UTILS) += ima-evm-utils
#
# Paths and names
#
-IMA_EVM_UTILS_VERSION := 1.1
-IMA_EVM_UTILS_MD5 := 77455aeee54fdc7a70c733bcb65d33cc
+IMA_EVM_UTILS_VERSION := 1.2.1
+IMA_EVM_UTILS_MD5 := 78dc33816ec7a73a4d73153375ac53e5
IMA_EVM_UTILS := ima-evm-utils-$(IMA_EVM_UTILS_VERSION)
IMA_EVM_UTILS_SUFFIX := tar.gz
IMA_EVM_UTILS_URL := $(call ptx/mirror, SF, linux-ima/ima-evm-utils/$(IMA_EVM_UTILS).$(IMA_EVM_UTILS_SUFFIX))
@@ -35,6 +35,7 @@ IMA_EVM_UTILS_LICENSE_FILES := \
IMA_EVM_UTILS_CONF_TOOL := autoconf
IMA_EVM_UTILS_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
+ --enable-openssl-conf \
--disable-debug
# ----------------------------------------------------------------------------
--
2.29.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* [ptxdist] [PATCH 6/7] rng-tools: allow installing rngtest without rngd
2021-06-07 13:09 [ptxdist] [PATCH 1/7] googletest: new package Roland Hieber
` (3 preceding siblings ...)
2021-06-07 13:09 ` [ptxdist] [PATCH 5/7] ima-evm-utils: version bump 1.1 -> 1.2.1 Roland Hieber
@ 2021-06-07 13:09 ` Roland Hieber
2021-06-16 10:35 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-06-07 13:09 ` [ptxdist] [PATCH 7/7] systemd: make hostnamed and quotacheck optional Roland Hieber
2021-06-16 10:35 ` [ptxdist] [APPLIED] googletest: new package Michael Olbrich
6 siblings, 1 reply; 21+ messages in thread
From: Roland Hieber @ 2021-06-07 13:09 UTC (permalink / raw)
To: ptxdist; +Cc: Steffen Trumtrar, Roland Hieber
Based on a patch by Steffen Trumtrar.
Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/rng-tools.in | 5 +++++
rules/rng-tools.make | 2 ++
2 files changed, 7 insertions(+)
diff --git a/rules/rng-tools.in b/rules/rng-tools.in
index 9345ab9fbafb..24bcd048f268 100644
--- a/rules/rng-tools.in
+++ b/rules/rng-tools.in
@@ -17,6 +17,11 @@ menuconfig RNG_TOOLS
if RNG_TOOLS
+config RNG_TOOLS_RNGD
+ bool
+ default y
+ prompt "install rngd"
+
config RNG_TOOLS_STARTSCRIPT
bool
default y
diff --git a/rules/rng-tools.make b/rules/rng-tools.make
index 6c81543ea09f..5d8a09cee153 100644
--- a/rules/rng-tools.make
+++ b/rules/rng-tools.make
@@ -41,7 +41,9 @@ $(STATEDIR)/rng-tools.targetinstall:
@$(call install_fixup, rng-tools,AUTHOR,"Andreas Pretzsch <apr@cn-eng.de>")
@$(call install_fixup, rng-tools,DESCRIPTION,"random number generator daemon - seed kernel random from hwrng")
+ifdef PTXCONF_RNG_TOOLS_RNGD
@$(call install_copy, rng-tools, 0, 0, 0755, -, /usr/sbin/rngd)
+endif
ifdef PTXCONF_RNG_TOOLS_STARTSCRIPT
@$(call install_alternative, rng-tools, 0, 0, 0755, /etc/init.d/rngd)
ifneq ($(call remove_quotes,$(PTXCONF_RNG_TOOLS_BBINIT_LINK)),)
--
2.29.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* [ptxdist] [PATCH 7/7] systemd: make hostnamed and quotacheck optional
2021-06-07 13:09 [ptxdist] [PATCH 1/7] googletest: new package Roland Hieber
` (4 preceding siblings ...)
2021-06-07 13:09 ` [ptxdist] [PATCH 6/7] rng-tools: allow installing rngtest without rngd Roland Hieber
@ 2021-06-07 13:09 ` Roland Hieber
2021-06-11 8:04 ` Michael Olbrich
2021-06-16 10:35 ` [ptxdist] [APPLIED] googletest: new package Michael Olbrich
6 siblings, 1 reply; 21+ messages in thread
From: Roland Hieber @ 2021-06-07 13:09 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
This reduces the dependency graph and can therefore decrease boot time
on systems that are configured with a static hostname, and which do not
use quota. With this, /usr/share/dbus-1/system-services/ may no longer
contain any service definitions, so add an empty kconfig option for it.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/systemd.in | 21 +++++++++++++++++++++
rules/systemd.make | 12 ++++++++----
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/rules/systemd.in b/rules/systemd.in
index 854c344d5441..0f7ba889686e 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -56,11 +56,23 @@ comment "D-Bus is needed for the enabled features"
config SYSTEMD_DBUS
bool
+config SYSTEMD_DBUS_SERVICES
+ bool
+
+config SYSTEMD_HOSTNAMED
+ bool
+ select SYSTEMD_DBUS_SERVICES
+ prompt "hostname daemon support"
+ help
+ A tiny daemon that can be used to control the host name and related
+ machine meta data from user programs.
+
config SYSTEMD_MICROHTTPD
bool
config SYSTEMD_LOCALES
bool
+ select SYSTEMD_DBUS_SERVICES
default LOCALES
config SYSTEMD_VCONSOLE
@@ -80,6 +92,7 @@ config SYSTEMD_DISABLE_RANDOM_SEED
config SYSTEMD_LOGIND
bool
select SYSTEMD_DBUS
+ select SYSTEMD_DBUS_SERVICES
prompt "login daemon"
config SYSTEMD_UNITS_USER
@@ -89,6 +102,7 @@ config SYSTEMD_UNITS_USER
config SYSTEMD_NETWORK
bool
+ select SYSTEMD_DBUS_SERVICES
prompt "network configuration with systemd"
config SYSTEMD_IPMASQUERADE
@@ -102,6 +116,7 @@ config SYSTEMD_TIMEDATE
bool
default y
select SYSTEMD_DBUS
+ select SYSTEMD_DBUS_SERVICES
prompt "date/time handling"
help
NTP client for time synchronization and local timezone handling.
@@ -122,6 +137,12 @@ config SYSTEMD_POLKIT
bool
default POLKIT
+config SYSTEMD_QUOTACHECK
+ bool
+ prompt "disk quota support"
+ help
+ File system quota checker logic.
+
menu "journald "
config SYSTEMD_XZ
diff --git a/rules/systemd.make b/rules/systemd.make
index 8e80b8bcb244..e275322fd426 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -95,7 +95,7 @@ SYSTEMD_CONF_OPT := \
-Dgshadow=false \
-Dhibernate=false \
-Dhomed=false \
- -Dhostnamed=true \
+ -Dhostnamed=$(call ptx/truefalse,PTXCONF_SYSTEMD_HOSTNAMED) \
-Dhtml=false \
-Dhwdb=$(call ptx/truefalse,PTXCONF_SYSTEMD_UDEV_HWDB) \
-Didn=false \
@@ -151,7 +151,7 @@ SYSTEMD_CONF_OPT := \
-Dpstore=false \
-Dpwquality=false \
-Dqrencode=false \
- -Dquotacheck=true \
+ -Dquotacheck=$(call ptx/truefalse,PTXCONF_SYSTEMD_QUOTACHECK) \
-Dquotacheck-path=/usr/sbin/quotacheck \
-Dquotaon-path=/usr/sbin/quotaon \
-Drandomseed=$(call ptx/falsetrue,PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED) \
@@ -245,7 +245,7 @@ SYSTEMD_HELPER := \
$(call ptx/ifdef, PTXCONF_SYSTEMD_COREDUMP,systemd-coredump) \
systemd-fsck \
systemd-growfs \
- systemd-hostnamed \
+ $(call ptx/ifdef, PTXCONF_SYSTEMD_HOSTNAMED,systemd-hostnamed) \
systemd-journald \
$(call ptx/ifdef, PTXCONF_SYSTEMD_JOURNAL_REMOTE,systemd-journal-remote) \
$(call ptx/ifdef, PTXCONF_SYSTEMD_LOCALES,systemd-localed) \
@@ -254,7 +254,7 @@ SYSTEMD_HELPER := \
systemd-modules-load \
$(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-networkd) \
$(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-networkd-wait-online) \
- systemd-quotacheck \
+ $(call ptx/ifdef, PTXCONF_SYSTEMD_QUOTACHECK,systemd-quotacheck) \
$(call ptx/ifdef, PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED,,systemd-random-seed) \
systemd-remount-fs \
systemd-reply-password \
@@ -342,7 +342,9 @@ $(STATEDIR)/systemd.targetinstall:
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-notify)
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-tmpfiles)
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/busctl)
+ifdef PTXCONF_SYSTEMD_HOSTNAMED
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/hostnamectl)
+endif
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-analyze)
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cat)
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cgls)
@@ -372,9 +374,11 @@ $(STATEDIR)/systemd.targetinstall:
@$(call install_tree, systemd, 0, 0, -, /usr/lib/tmpfiles.d/)
@$(call install_copy, systemd, 0, 0, 0644, -, /usr/lib/sysctl.d/50-default.conf)
+ifdef PTXCONF_SYSTEMD_DBUS_SERVICES
@$(call install_copy, systemd, 0, 0, 0644, -, \
/usr/share/dbus-1/services/org.freedesktop.systemd1.service)
@$(call install_tree, systemd, 0, 0, -, /usr/share/dbus-1/system-services/)
+endif
# # systemd expects this directory to exist.
@$(call install_copy, systemd, 0, 0, 0755, /var/lib/systemd)
--
2.29.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [ptxdist] [PATCH 7/7] systemd: make hostnamed and quotacheck optional
2021-06-07 13:09 ` [ptxdist] [PATCH 7/7] systemd: make hostnamed and quotacheck optional Roland Hieber
@ 2021-06-11 8:04 ` Michael Olbrich
2021-06-16 16:14 ` Roland Hieber
0 siblings, 1 reply; 21+ messages in thread
From: Michael Olbrich @ 2021-06-11 8:04 UTC (permalink / raw)
To: ptxdist
On Mon, Jun 07, 2021 at 03:09:09PM +0200, Roland Hieber wrote:
> This reduces the dependency graph and can therefore decrease boot time
> on systems that are configured with a static hostname, and which do not
> use quota. With this, /usr/share/dbus-1/system-services/ may no longer
> contain any service definitions, so add an empty kconfig option for it.
>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> rules/systemd.in | 21 +++++++++++++++++++++
> rules/systemd.make | 12 ++++++++----
> 2 files changed, 29 insertions(+), 4 deletions(-)
>
> diff --git a/rules/systemd.in b/rules/systemd.in
> index 854c344d5441..0f7ba889686e 100644
> --- a/rules/systemd.in
> +++ b/rules/systemd.in
> @@ -56,11 +56,23 @@ comment "D-Bus is needed for the enabled features"
> config SYSTEMD_DBUS
> bool
>
> +config SYSTEMD_DBUS_SERVICES
> + bool
> +
> +config SYSTEMD_HOSTNAMED
> + bool
> + select SYSTEMD_DBUS_SERVICES
> + prompt "hostname daemon support"
> + help
> + A tiny daemon that can be used to control the host name and related
> + machine meta data from user programs.
This should be 'default y' so we don't break things during updates. And it
most cases it really doesn't hurt.
Also, don't put it in the middle of the no-prompt options.
Michael
> +
> config SYSTEMD_MICROHTTPD
> bool
>
> config SYSTEMD_LOCALES
> bool
> + select SYSTEMD_DBUS_SERVICES
> default LOCALES
>
> config SYSTEMD_VCONSOLE
> @@ -80,6 +92,7 @@ config SYSTEMD_DISABLE_RANDOM_SEED
> config SYSTEMD_LOGIND
> bool
> select SYSTEMD_DBUS
> + select SYSTEMD_DBUS_SERVICES
> prompt "login daemon"
>
> config SYSTEMD_UNITS_USER
> @@ -89,6 +102,7 @@ config SYSTEMD_UNITS_USER
>
> config SYSTEMD_NETWORK
> bool
> + select SYSTEMD_DBUS_SERVICES
> prompt "network configuration with systemd"
>
> config SYSTEMD_IPMASQUERADE
> @@ -102,6 +116,7 @@ config SYSTEMD_TIMEDATE
> bool
> default y
> select SYSTEMD_DBUS
> + select SYSTEMD_DBUS_SERVICES
> prompt "date/time handling"
> help
> NTP client for time synchronization and local timezone handling.
> @@ -122,6 +137,12 @@ config SYSTEMD_POLKIT
> bool
> default POLKIT
>
> +config SYSTEMD_QUOTACHECK
> + bool
> + prompt "disk quota support"
> + help
> + File system quota checker logic.
> +
> menu "journald "
>
> config SYSTEMD_XZ
> diff --git a/rules/systemd.make b/rules/systemd.make
> index 8e80b8bcb244..e275322fd426 100644
> --- a/rules/systemd.make
> +++ b/rules/systemd.make
> @@ -95,7 +95,7 @@ SYSTEMD_CONF_OPT := \
> -Dgshadow=false \
> -Dhibernate=false \
> -Dhomed=false \
> - -Dhostnamed=true \
> + -Dhostnamed=$(call ptx/truefalse,PTXCONF_SYSTEMD_HOSTNAMED) \
> -Dhtml=false \
> -Dhwdb=$(call ptx/truefalse,PTXCONF_SYSTEMD_UDEV_HWDB) \
> -Didn=false \
> @@ -151,7 +151,7 @@ SYSTEMD_CONF_OPT := \
> -Dpstore=false \
> -Dpwquality=false \
> -Dqrencode=false \
> - -Dquotacheck=true \
> + -Dquotacheck=$(call ptx/truefalse,PTXCONF_SYSTEMD_QUOTACHECK) \
> -Dquotacheck-path=/usr/sbin/quotacheck \
> -Dquotaon-path=/usr/sbin/quotaon \
> -Drandomseed=$(call ptx/falsetrue,PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED) \
> @@ -245,7 +245,7 @@ SYSTEMD_HELPER := \
> $(call ptx/ifdef, PTXCONF_SYSTEMD_COREDUMP,systemd-coredump) \
> systemd-fsck \
> systemd-growfs \
> - systemd-hostnamed \
> + $(call ptx/ifdef, PTXCONF_SYSTEMD_HOSTNAMED,systemd-hostnamed) \
> systemd-journald \
> $(call ptx/ifdef, PTXCONF_SYSTEMD_JOURNAL_REMOTE,systemd-journal-remote) \
> $(call ptx/ifdef, PTXCONF_SYSTEMD_LOCALES,systemd-localed) \
> @@ -254,7 +254,7 @@ SYSTEMD_HELPER := \
> systemd-modules-load \
> $(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-networkd) \
> $(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-networkd-wait-online) \
> - systemd-quotacheck \
> + $(call ptx/ifdef, PTXCONF_SYSTEMD_QUOTACHECK,systemd-quotacheck) \
> $(call ptx/ifdef, PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED,,systemd-random-seed) \
> systemd-remount-fs \
> systemd-reply-password \
> @@ -342,7 +342,9 @@ $(STATEDIR)/systemd.targetinstall:
> @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-notify)
> @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-tmpfiles)
> @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/busctl)
> +ifdef PTXCONF_SYSTEMD_HOSTNAMED
> @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/hostnamectl)
> +endif
> @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-analyze)
> @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cat)
> @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cgls)
> @@ -372,9 +374,11 @@ $(STATEDIR)/systemd.targetinstall:
> @$(call install_tree, systemd, 0, 0, -, /usr/lib/tmpfiles.d/)
> @$(call install_copy, systemd, 0, 0, 0644, -, /usr/lib/sysctl.d/50-default.conf)
>
> +ifdef PTXCONF_SYSTEMD_DBUS_SERVICES
> @$(call install_copy, systemd, 0, 0, 0644, -, \
> /usr/share/dbus-1/services/org.freedesktop.systemd1.service)
> @$(call install_tree, systemd, 0, 0, -, /usr/share/dbus-1/system-services/)
> +endif
>
> # # systemd expects this directory to exist.
> @$(call install_copy, systemd, 0, 0, 0755, /var/lib/systemd)
> --
> 2.29.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@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-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [ptxdist] [PATCH 5/7] ima-evm-utils: version bump 1.1 -> 1.2.1
2021-06-07 13:09 ` [ptxdist] [PATCH 5/7] ima-evm-utils: version bump 1.1 -> 1.2.1 Roland Hieber
@ 2021-06-11 12:18 ` Michael Olbrich
2021-06-16 16:01 ` Roland Hieber
0 siblings, 1 reply; 21+ messages in thread
From: Michael Olbrich @ 2021-06-11 12:18 UTC (permalink / raw)
To: ptxdist
On Mon, Jun 07, 2021 at 03:09:07PM +0200, Roland Hieber wrote:
> The tarball does not include a configure script, generate it in the
> extract.post stage.
>
> Based on a patch by Marc Kleine-Budde.
>
> Cc: Marc Kleine-Budde <mkl@pengutronix.de>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> patches/ima-evm-utils-1.2.1/autogen.sh | 1 +
> rules/ima-evm-utils.make | 7 ++++---
> 2 files changed, 5 insertions(+), 3 deletions(-)
> create mode 120000 patches/ima-evm-utils-1.2.1/autogen.sh
>
> diff --git a/patches/ima-evm-utils-1.2.1/autogen.sh b/patches/ima-evm-utils-1.2.1/autogen.sh
> new file mode 120000
> index 000000000000..9f8a4cb7ddcb
> --- /dev/null
> +++ b/patches/ima-evm-utils-1.2.1/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/rules/ima-evm-utils.make b/rules/ima-evm-utils.make
> index eda5ad8a2883..82c5641e3776 100644
> --- a/rules/ima-evm-utils.make
> +++ b/rules/ima-evm-utils.make
> @@ -1,7 +1,7 @@
> # -*-makefile-*-
> #
> # Copyright (C) 2013 by Michael Grzeschik <mgr@pengutronix.de>
> -# 2015 by Marc Kleine-Budde <mkl@pengutronix.de>
> +# 2015, 2020 by Marc Kleine-Budde <mkl@pengutronix.de>
> # 2021 Roland Hieber, Pengutronix <rhi@pengutronix.de>
> #
> # For further information about the PTXdist project and license conditions
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_IMA_EVM_UTILS) += ima-evm-utils
> #
> # Paths and names
> #
> -IMA_EVM_UTILS_VERSION := 1.1
> -IMA_EVM_UTILS_MD5 := 77455aeee54fdc7a70c733bcb65d33cc
> +IMA_EVM_UTILS_VERSION := 1.2.1
Why 1.2.1? It's two years old and the latest release is 1.3.1.
There are patches for the old version.
Building can fail with:
make[2]: Entering directory '.../build-host/ima-evm-utils-1.2.1'
asciidoc -d manpage -b docbook -o evmctl.1.xsl README
/bin/bash: asciidoc: command not found
Upstream has a Patch to make building the docs optional.
Michael
> +IMA_EVM_UTILS_MD5 := 78dc33816ec7a73a4d73153375ac53e5
> IMA_EVM_UTILS := ima-evm-utils-$(IMA_EVM_UTILS_VERSION)
> IMA_EVM_UTILS_SUFFIX := tar.gz
> IMA_EVM_UTILS_URL := $(call ptx/mirror, SF, linux-ima/ima-evm-utils/$(IMA_EVM_UTILS).$(IMA_EVM_UTILS_SUFFIX))
> @@ -35,6 +35,7 @@ IMA_EVM_UTILS_LICENSE_FILES := \
> IMA_EVM_UTILS_CONF_TOOL := autoconf
> IMA_EVM_UTILS_AUTOCONF := \
> $(CROSS_AUTOCONF_USR) \
> + --enable-openssl-conf \
> --disable-debug
>
> # ----------------------------------------------------------------------------
> --
> 2.29.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@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-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [ptxdist] [PATCH 4/7] ima-evm-utils: fix license statement
2021-06-07 13:09 ` [ptxdist] [PATCH 4/7] ima-evm-utils: fix license statement Roland Hieber
@ 2021-06-11 12:24 ` Michael Olbrich
0 siblings, 0 replies; 21+ messages in thread
From: Michael Olbrich @ 2021-06-11 12:24 UTC (permalink / raw)
To: ptxdist
Some more text here would be nice. Maybe a comment about the exception?
On Mon, Jun 07, 2021 at 03:09:06PM +0200, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> rules/ima-evm-utils.make | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/rules/ima-evm-utils.make b/rules/ima-evm-utils.make
> index 1c5e15b1415f..eda5ad8a2883 100644
> --- a/rules/ima-evm-utils.make
> +++ b/rules/ima-evm-utils.make
> @@ -2,6 +2,7 @@
> #
> # Copyright (C) 2013 by Michael Grzeschik <mgr@pengutronix.de>
> # 2015 by Marc Kleine-Budde <mkl@pengutronix.de>
> +# 2021 Roland Hieber, Pengutronix <rhi@pengutronix.de>
> #
> # For further information about the PTXdist project and license conditions
> # see the README file.
> @@ -22,7 +23,10 @@ IMA_EVM_UTILS_SUFFIX := tar.gz
> IMA_EVM_UTILS_URL := $(call ptx/mirror, SF, linux-ima/ima-evm-utils/$(IMA_EVM_UTILS).$(IMA_EVM_UTILS_SUFFIX))
> IMA_EVM_UTILS_SOURCE := $(SRCDIR)/$(IMA_EVM_UTILS).$(IMA_EVM_UTILS_SUFFIX)
> IMA_EVM_UTILS_DIR := $(BUILDDIR)/$(IMA_EVM_UTILS)
> -IMA_EVM_UTILS_LICENSE := LGPL-2.0-or-later
> +IMA_EVM_UTILS_LICENSE := GPL-2.0-only WITH unknown-exception
"WITH custom-exception" right?
Michael
> +IMA_EVM_UTILS_LICENSE_FILES := \
> + file://src/evmctl.c;startline=13;endline=35;md5=1e6e51503ab04045269a92c0bc5d5b55 \
> + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
>
> # ----------------------------------------------------------------------------
> # Prepare
> --
> 2.29.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@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-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [ptxdist] [APPLIED] googletest: new package
2021-06-07 13:09 [ptxdist] [PATCH 1/7] googletest: new package Roland Hieber
` (5 preceding siblings ...)
2021-06-07 13:09 ` [ptxdist] [PATCH 7/7] systemd: make hostnamed and quotacheck optional Roland Hieber
@ 2021-06-16 10:35 ` Michael Olbrich
6 siblings, 0 replies; 21+ messages in thread
From: Michael Olbrich @ 2021-06-16 10:35 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as d02a6c1d0d1d47f0237cb618ad68510267a9fa55.
Michael
[sent from post-receive hook]
On Wed, 16 Jun 2021 12:35:37 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210607130909.4836-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/googletest.in b/rules/googletest.in
> new file mode 100644
> index 000000000000..ab876ffd8a66
> --- /dev/null
> +++ b/rules/googletest.in
> @@ -0,0 +1,41 @@
> +## SECTION=test_suites
> +
> +config GOOGLETEST
> + select HOST_CMAKE
> + tristate
> + prompt "googletest"
> + help
> + Google's C++ test framework sources
> +
> + Google Test is a framework for writing C++ tests on a
> + variety of platforms. Based on the xUnit
> + architecture. Supports automatic test discovery, a rich set
> + of assertions, user-defined assertions, death tests, fatal
> + and non-fatal failures, value- and type-parameterized tests,
> + various options for running the tests, and XML test report
> + generation.
> +
> + Google Mock is an extension of Google Test for C++ mocking.
> + Inspired by jMock, EasyMock, and Hamcrest, and designed with
> + C++'s specifics in mind, it can help you derive better
> + designs of your system and write better tests.
> +
> + Google Mock:
> +
> + * provides a declarative syntax for defining mocks,
> + * can easily define partial (hybrid) mocks, which are a
> + cross of real and mock objects,
> + * handles functions of arbitrary types and overloaded
> + functions,
> + * comes with a rich set of matchers for validating function
> + arguments,
> + * uses an intuitive syntax for controlling the behavior of a
> + mock,
> + * does automatic verification of expectations (no
> + record-and-replay needed),
> + * allows arbitrary (partial) ordering constraints on
> + function calls to be expressed,
> + * lets a user extend it by defining new matchers and
> + actions.
> + * does not use exceptions, and
> + * is easy to learn and use.
> diff --git a/rules/googletest.make b/rules/googletest.make
> new file mode 100644
> index 000000000000..7f0c54f341f6
> --- /dev/null
> +++ b/rules/googletest.make
> @@ -0,0 +1,66 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2018 by Niklas Reisser <Niklas.Reisser@de.bosch.com>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_GOOGLETEST) += googletest
> +
> +#
> +# Paths and names
> +#
> +GOOGLETEST_VERSION := 1.8.1
> +GOOGLETEST_MD5 := 2e6fbeb6a91310a16efe181886c59596
> +GOOGLETEST := googletest-release-$(GOOGLETEST_VERSION)
> +GOOGLETEST_SUFFIX := tar.gz
> +GOOGLETEST_URL := https://github.com/google/googletest/archive/release-$(GOOGLETEST_VERSION).$(GOOGLETEST_SUFFIX)
> +GOOGLETEST_SOURCE := $(SRCDIR)/$(GOOGLETEST).$(GOOGLETEST_SUFFIX)
> +GOOGLETEST_DIR := $(BUILDDIR)/$(GOOGLETEST)
> +GOOGLETEST_LICENSE := BSD-3-Clause
> +GOOGLETEST_LICENSE_FILES := file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +GOOGLETEST_CONF_TOOL := cmake
> +GOOGLETEST_CONF_OPT := \
> + $(CROSS_CMAKE_USR) \
> + -DBUILD_GMOCK=ON \
> + -DBUILD_SHARED_LIBS=ON \
> + -DINSTALL_GTEST=ON \
> + -Dgmock_build_tests=OFF \
> + -Dgtest_build_samples=OFF \
> + -Dgtest_build_tests=OFF \
> + -Dgtest_disable_pthreads=OFF \
> + -Dgtest_force_shared_crt=OFF \
> + -Dgtest_hide_internal_symbols=OFF
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/googletest.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, googletest)
> + @$(call install_fixup, googletest,PRIORITY,optional)
> + @$(call install_fixup, googletest,SECTION,base)
> + @$(call install_fixup, googletest,AUTHOR,"Niklas Reisser <Niklas.Reisser@de.bosch.com>")
> + @$(call install_fixup, googletest,DESCRIPTION,missing)
> +
> + @$(call install_lib, googletest, 0,0, 0644, libgmock)
> + @$(call install_lib, googletest, 0,0, 0644, libgtest)
> + @$(call install_lib, googletest, 0,0, 0644, libgtest_main)
> + @$(call install_lib, googletest, 0,0, 0644, libgmock_main)
> +
> + @$(call install_finish, googletest)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [ptxdist] [APPLIED] python3-pyro: new package
2021-06-07 13:09 ` [ptxdist] [PATCH 2/7] python3-pyro: " Roland Hieber
@ 2021-06-16 10:35 ` Michael Olbrich
0 siblings, 0 replies; 21+ messages in thread
From: Michael Olbrich @ 2021-06-16 10:35 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as df4d839ed0336f32c56c383eb49670cb20167914.
Michael
[sent from post-receive hook]
On Wed, 16 Jun 2021 12:35:39 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210607130909.4836-2-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/python3-pyro.in b/rules/python3-pyro.in
> new file mode 100644
> index 000000000000..fcf350dccec9
> --- /dev/null
> +++ b/rules/python3-pyro.in
> @@ -0,0 +1,20 @@
> +## SECTION=python3
> +
> +config PYTHON3_PYRO
> + tristate
> + prompt "python3-pyro"
> + select PYTHON3
> + select HOST_PYTHON3_SETUPTOOLS
> +
> + help
> + Pyro is a library that enables you to build applications
> + in which objects can talk to each other over the network,
> + with minimal programming effort. You can just use normal
> + Python method calls, with almost every possible parameter
> + and return value type, and Pyro takes care of locating the
> + right object on the right computer to execute the method.
> + It is designed to be very easy to use, and to generally stay
> + out of your way. But it also provides a set of powerful features
> + that enables you to build distributed applications rapidly and
> + effortlessly. Pyro is written in 100% pure Python and therefore
> + runs on many platforms and Python versions, including Python 3.x
> diff --git a/rules/python3-pyro.make b/rules/python3-pyro.make
> new file mode 100644
> index 000000000000..4751931d2ea9
> --- /dev/null
> +++ b/rules/python3-pyro.make
> @@ -0,0 +1,55 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2019 by Niklas Reisser <niklas.reisser@de.bosch.com>
> +# 2021 by Roland Hieber, Pengutronix <rhi@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_PYTHON3_PYRO) += python3-pyro
> +
> +#
> +# Paths and names
> +#
> +
> +PYTHON3_PYRO_VERSION := 4.76
> +PYTHON3_PYRO := Pyro4-$(PYTHON3_PYRO_VERSION)
> +PYTHON3_PYRO_MD5 := 03a09990328c9f2388ac806fa734689c
> +PYTHON3_PYRO_SUFFIX := tar.gz
> +PYTHON3_PYRO_URL := $(call ptx/mirror-pypi, pyro4, $(PYTHON3_PYRO_VERSION).$(PYTHON3_PYRO_SUFFIX))
> +PYTHON3_PYRO_SOURCE := $(SRCDIR)/$(PYTHON3_PYRO).$(PYTHON3_PYRO_SUFFIX)
> +PYTHON3_PYRO_DIR := $(BUILDDIR)/$(PYTHON3_PYRO)
> +PYTHON3_PYRO_LICENSE := MIT
> +PYTHON3_PYRO_LICENSE_FILES := file://LICENSE;md5=cd13dafd4eeb0802bb6efea6b4a4bdbc
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +PYTHON3_PYRO_CONF_TOOL := python3
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/python3-pyro.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, python3-pyro)
> + @$(call install_fixup, python3-pyro,PRIORITY,optional)
> + @$(call install_fixup, python3-pyro,SECTION,base)
> + @$(call install_fixup, python3-pyro,AUTHOR,"Niklas Reisser <niklas.reisser@de.bosch.com>")
> + @$(call install_fixup, python3-pyro,DESCRIPTION,missing)
> +
> + @$(call install_glob, python3-pyro, 0, 0, -, \
> + $(PYTHON3_SITEPACKAGES)/Pyro4,, *.py)
> +
> + @$(call install_finish, python3-pyro)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [ptxdist] [APPLIED] host-extract-cert: version bump 0.1 -> 0.2
2021-06-07 13:09 ` [ptxdist] [PATCH 3/7] host-extract-cert: version bump 0.1 -> 0.2 Roland Hieber
@ 2021-06-16 10:35 ` Michael Olbrich
0 siblings, 0 replies; 21+ messages in thread
From: Michael Olbrich @ 2021-06-16 10:35 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as dc1644907a31d9fcc20c6cfaaf5ef2f055802553.
Michael
[sent from post-receive hook]
On Wed, 16 Jun 2021 12:35:41 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210607130909.4836-3-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-extract-cert.make b/rules/host-extract-cert.make
> index e2423c584380..df7599011a71 100644
> --- a/rules/host-extract-cert.make
> +++ b/rules/host-extract-cert.make
> @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_EXTRACT_CERT) += host-extract-cert
> #
> # Paths and names
> #
> -HOST_EXTRACT_CERT_VERSION := 0.1
> -HOST_EXTRACT_CERT_MD5 := e6c947fd8334b805b4e6aa05d3dcd62e
> +HOST_EXTRACT_CERT_VERSION := 0.2
> +HOST_EXTRACT_CERT_MD5 := b2ec817a3d8bf9ec126b381642149d60
> HOST_EXTRACT_CERT := extract-cert-$(HOST_EXTRACT_CERT_VERSION)
> HOST_EXTRACT_CERT_SUFFIX := tar.gz
> HOST_EXTRACT_CERT_URL := https://git.pengutronix.de/cgit/extract-cert/snapshot/$(HOST_EXTRACT_CERT).$(HOST_EXTRACT_CERT_SUFFIX)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [ptxdist] [APPLIED] rng-tools: allow installing rngtest without rngd
2021-06-07 13:09 ` [ptxdist] [PATCH 6/7] rng-tools: allow installing rngtest without rngd Roland Hieber
@ 2021-06-16 10:35 ` Michael Olbrich
0 siblings, 0 replies; 21+ messages in thread
From: Michael Olbrich @ 2021-06-16 10:35 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as 88f17567fbef465e9bf24264897e7b2cdd3181f6.
Michael
[sent from post-receive hook]
On Wed, 16 Jun 2021 12:35:43 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Based on a patch by Steffen Trumtrar.
>
> Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210607130909.4836-6-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/rng-tools.in b/rules/rng-tools.in
> index 9345ab9fbafb..24bcd048f268 100644
> --- a/rules/rng-tools.in
> +++ b/rules/rng-tools.in
> @@ -17,6 +17,11 @@ menuconfig RNG_TOOLS
>
> if RNG_TOOLS
>
> +config RNG_TOOLS_RNGD
> + bool
> + default y
> + prompt "install rngd"
> +
> config RNG_TOOLS_STARTSCRIPT
> bool
> default y
> diff --git a/rules/rng-tools.make b/rules/rng-tools.make
> index 6c81543ea09f..5d8a09cee153 100644
> --- a/rules/rng-tools.make
> +++ b/rules/rng-tools.make
> @@ -41,7 +41,9 @@ $(STATEDIR)/rng-tools.targetinstall:
> @$(call install_fixup, rng-tools,AUTHOR,"Andreas Pretzsch <apr@cn-eng.de>")
> @$(call install_fixup, rng-tools,DESCRIPTION,"random number generator daemon - seed kernel random from hwrng")
>
> +ifdef PTXCONF_RNG_TOOLS_RNGD
> @$(call install_copy, rng-tools, 0, 0, 0755, -, /usr/sbin/rngd)
> +endif
> ifdef PTXCONF_RNG_TOOLS_STARTSCRIPT
> @$(call install_alternative, rng-tools, 0, 0, 0755, /etc/init.d/rngd)
> ifneq ($(call remove_quotes,$(PTXCONF_RNG_TOOLS_BBINIT_LINK)),)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [ptxdist] [PATCH 5/7] ima-evm-utils: version bump 1.1 -> 1.2.1
2021-06-11 12:18 ` Michael Olbrich
@ 2021-06-16 16:01 ` Roland Hieber
2021-06-17 6:44 ` Michael Olbrich
0 siblings, 1 reply; 21+ messages in thread
From: Roland Hieber @ 2021-06-16 16:01 UTC (permalink / raw)
To: ptxdist
On Fri, Jun 11, 2021 at 02:18:42PM +0200, Michael Olbrich wrote:
> On Mon, Jun 07, 2021 at 03:09:07PM +0200, Roland Hieber wrote:
> > The tarball does not include a configure script, generate it in the
> > extract.post stage.
> >
> > Based on a patch by Marc Kleine-Budde.
> >
> > Cc: Marc Kleine-Budde <mkl@pengutronix.de>
> > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > ---
> > patches/ima-evm-utils-1.2.1/autogen.sh | 1 +
> > rules/ima-evm-utils.make | 7 ++++---
> > 2 files changed, 5 insertions(+), 3 deletions(-)
> > create mode 120000 patches/ima-evm-utils-1.2.1/autogen.sh
> >
> > diff --git a/patches/ima-evm-utils-1.2.1/autogen.sh b/patches/ima-evm-utils-1.2.1/autogen.sh
> > new file mode 120000
> > index 000000000000..9f8a4cb7ddcb
> > --- /dev/null
> > +++ b/patches/ima-evm-utils-1.2.1/autogen.sh
> > @@ -0,0 +1 @@
> > +../autogen.sh
> > \ No newline at end of file
> > diff --git a/rules/ima-evm-utils.make b/rules/ima-evm-utils.make
> > index eda5ad8a2883..82c5641e3776 100644
> > --- a/rules/ima-evm-utils.make
> > +++ b/rules/ima-evm-utils.make
> > @@ -1,7 +1,7 @@
> > # -*-makefile-*-
> > #
> > # Copyright (C) 2013 by Michael Grzeschik <mgr@pengutronix.de>
> > -# 2015 by Marc Kleine-Budde <mkl@pengutronix.de>
> > +# 2015, 2020 by Marc Kleine-Budde <mkl@pengutronix.de>
> > # 2021 Roland Hieber, Pengutronix <rhi@pengutronix.de>
> > #
> > # For further information about the PTXdist project and license conditions
> > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_IMA_EVM_UTILS) += ima-evm-utils
> > #
> > # Paths and names
> > #
> > -IMA_EVM_UTILS_VERSION := 1.1
> > -IMA_EVM_UTILS_MD5 := 77455aeee54fdc7a70c733bcb65d33cc
> > +IMA_EVM_UTILS_VERSION := 1.2.1
>
> Why 1.2.1? It's two years old and the latest release is 1.3.1.
>
> There are patches for the old version.
>
> Building can fail with:
>
> make[2]: Entering directory '.../build-host/ima-evm-utils-1.2.1'
> asciidoc -d manpage -b docbook -o evmctl.1.xsl README
> /bin/bash: asciidoc: command not found
>
> Upstream has a Patch to make building the docs optional.
If you mean the MANPAGE_DOCBOOK_XSL configure variable, I didn't get
that to work, so I just expanded the "remove docs" patch in v2.
- Roland
>
> Michael
>
> > +IMA_EVM_UTILS_MD5 := 78dc33816ec7a73a4d73153375ac53e5
> > IMA_EVM_UTILS := ima-evm-utils-$(IMA_EVM_UTILS_VERSION)
> > IMA_EVM_UTILS_SUFFIX := tar.gz
> > IMA_EVM_UTILS_URL := $(call ptx/mirror, SF, linux-ima/ima-evm-utils/$(IMA_EVM_UTILS).$(IMA_EVM_UTILS_SUFFIX))
> > @@ -35,6 +35,7 @@ IMA_EVM_UTILS_LICENSE_FILES := \
> > IMA_EVM_UTILS_CONF_TOOL := autoconf
> > IMA_EVM_UTILS_AUTOCONF := \
> > $(CROSS_AUTOCONF_USR) \
> > + --enable-openssl-conf \
> > --disable-debug
> >
> > # ----------------------------------------------------------------------------
> > --
> > 2.29.2
> >
> >
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@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-5555 |
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@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-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [ptxdist] [PATCH 7/7] systemd: make hostnamed and quotacheck optional
2021-06-11 8:04 ` Michael Olbrich
@ 2021-06-16 16:14 ` Roland Hieber
2021-06-17 6:45 ` Michael Olbrich
0 siblings, 1 reply; 21+ messages in thread
From: Roland Hieber @ 2021-06-16 16:14 UTC (permalink / raw)
To: ptxdist
On Fri, Jun 11, 2021 at 10:04:35AM +0200, Michael Olbrich wrote:
> On Mon, Jun 07, 2021 at 03:09:09PM +0200, Roland Hieber wrote:
> > This reduces the dependency graph and can therefore decrease boot time
> > on systems that are configured with a static hostname, and which do not
> > use quota. With this, /usr/share/dbus-1/system-services/ may no longer
> > contain any service definitions, so add an empty kconfig option for it.
> >
> > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > ---
> > rules/systemd.in | 21 +++++++++++++++++++++
> > rules/systemd.make | 12 ++++++++----
> > 2 files changed, 29 insertions(+), 4 deletions(-)
> >
> > diff --git a/rules/systemd.in b/rules/systemd.in
> > index 854c344d5441..0f7ba889686e 100644
> > --- a/rules/systemd.in
> > +++ b/rules/systemd.in
> > @@ -56,11 +56,23 @@ comment "D-Bus is needed for the enabled features"
> > config SYSTEMD_DBUS
> > bool
> >
> > +config SYSTEMD_DBUS_SERVICES
> > + bool
> > +
> > +config SYSTEMD_HOSTNAMED
> > + bool
> > + select SYSTEMD_DBUS_SERVICES
> > + prompt "hostname daemon support"
> > + help
> > + A tiny daemon that can be used to control the host name and related
> > + machine meta data from user programs.
>
> This should be 'default y' so we don't break things during updates. And it
> most cases it really doesn't hurt.
Probably, but we are talking about an i.MX28 system here… :-|
- Roland
> Also, don't put it in the middle of the no-prompt options.
>
> Michael
>
> > +
> > config SYSTEMD_MICROHTTPD
> > bool
> >
> > config SYSTEMD_LOCALES
> > bool
> > + select SYSTEMD_DBUS_SERVICES
> > default LOCALES
> >
> > config SYSTEMD_VCONSOLE
> > @@ -80,6 +92,7 @@ config SYSTEMD_DISABLE_RANDOM_SEED
> > config SYSTEMD_LOGIND
> > bool
> > select SYSTEMD_DBUS
> > + select SYSTEMD_DBUS_SERVICES
> > prompt "login daemon"
> >
> > config SYSTEMD_UNITS_USER
> > @@ -89,6 +102,7 @@ config SYSTEMD_UNITS_USER
> >
> > config SYSTEMD_NETWORK
> > bool
> > + select SYSTEMD_DBUS_SERVICES
> > prompt "network configuration with systemd"
> >
> > config SYSTEMD_IPMASQUERADE
> > @@ -102,6 +116,7 @@ config SYSTEMD_TIMEDATE
> > bool
> > default y
> > select SYSTEMD_DBUS
> > + select SYSTEMD_DBUS_SERVICES
> > prompt "date/time handling"
> > help
> > NTP client for time synchronization and local timezone handling.
> > @@ -122,6 +137,12 @@ config SYSTEMD_POLKIT
> > bool
> > default POLKIT
> >
> > +config SYSTEMD_QUOTACHECK
> > + bool
> > + prompt "disk quota support"
> > + help
> > + File system quota checker logic.
> > +
> > menu "journald "
> >
> > config SYSTEMD_XZ
> > diff --git a/rules/systemd.make b/rules/systemd.make
> > index 8e80b8bcb244..e275322fd426 100644
> > --- a/rules/systemd.make
> > +++ b/rules/systemd.make
> > @@ -95,7 +95,7 @@ SYSTEMD_CONF_OPT := \
> > -Dgshadow=false \
> > -Dhibernate=false \
> > -Dhomed=false \
> > - -Dhostnamed=true \
> > + -Dhostnamed=$(call ptx/truefalse,PTXCONF_SYSTEMD_HOSTNAMED) \
> > -Dhtml=false \
> > -Dhwdb=$(call ptx/truefalse,PTXCONF_SYSTEMD_UDEV_HWDB) \
> > -Didn=false \
> > @@ -151,7 +151,7 @@ SYSTEMD_CONF_OPT := \
> > -Dpstore=false \
> > -Dpwquality=false \
> > -Dqrencode=false \
> > - -Dquotacheck=true \
> > + -Dquotacheck=$(call ptx/truefalse,PTXCONF_SYSTEMD_QUOTACHECK) \
> > -Dquotacheck-path=/usr/sbin/quotacheck \
> > -Dquotaon-path=/usr/sbin/quotaon \
> > -Drandomseed=$(call ptx/falsetrue,PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED) \
> > @@ -245,7 +245,7 @@ SYSTEMD_HELPER := \
> > $(call ptx/ifdef, PTXCONF_SYSTEMD_COREDUMP,systemd-coredump) \
> > systemd-fsck \
> > systemd-growfs \
> > - systemd-hostnamed \
> > + $(call ptx/ifdef, PTXCONF_SYSTEMD_HOSTNAMED,systemd-hostnamed) \
> > systemd-journald \
> > $(call ptx/ifdef, PTXCONF_SYSTEMD_JOURNAL_REMOTE,systemd-journal-remote) \
> > $(call ptx/ifdef, PTXCONF_SYSTEMD_LOCALES,systemd-localed) \
> > @@ -254,7 +254,7 @@ SYSTEMD_HELPER := \
> > systemd-modules-load \
> > $(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-networkd) \
> > $(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-networkd-wait-online) \
> > - systemd-quotacheck \
> > + $(call ptx/ifdef, PTXCONF_SYSTEMD_QUOTACHECK,systemd-quotacheck) \
> > $(call ptx/ifdef, PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED,,systemd-random-seed) \
> > systemd-remount-fs \
> > systemd-reply-password \
> > @@ -342,7 +342,9 @@ $(STATEDIR)/systemd.targetinstall:
> > @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-notify)
> > @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-tmpfiles)
> > @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/busctl)
> > +ifdef PTXCONF_SYSTEMD_HOSTNAMED
> > @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/hostnamectl)
> > +endif
> > @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-analyze)
> > @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cat)
> > @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cgls)
> > @@ -372,9 +374,11 @@ $(STATEDIR)/systemd.targetinstall:
> > @$(call install_tree, systemd, 0, 0, -, /usr/lib/tmpfiles.d/)
> > @$(call install_copy, systemd, 0, 0, 0644, -, /usr/lib/sysctl.d/50-default.conf)
> >
> > +ifdef PTXCONF_SYSTEMD_DBUS_SERVICES
> > @$(call install_copy, systemd, 0, 0, 0644, -, \
> > /usr/share/dbus-1/services/org.freedesktop.systemd1.service)
> > @$(call install_tree, systemd, 0, 0, -, /usr/share/dbus-1/system-services/)
> > +endif
> >
> > # # systemd expects this directory to exist.
> > @$(call install_copy, systemd, 0, 0, 0755, /var/lib/systemd)
> > --
> > 2.29.2
> >
> >
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@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-5555 |
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@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-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [ptxdist] [PATCH 5/7] ima-evm-utils: version bump 1.1 -> 1.2.1
2021-06-16 16:01 ` Roland Hieber
@ 2021-06-17 6:44 ` Michael Olbrich
2021-06-17 6:47 ` Michael Olbrich
0 siblings, 1 reply; 21+ messages in thread
From: Michael Olbrich @ 2021-06-17 6:44 UTC (permalink / raw)
To: ptxdist
On Wed, Jun 16, 2021 at 06:01:54PM +0200, Roland Hieber wrote:
> On Fri, Jun 11, 2021 at 02:18:42PM +0200, Michael Olbrich wrote:
> > On Mon, Jun 07, 2021 at 03:09:07PM +0200, Roland Hieber wrote:
> > > The tarball does not include a configure script, generate it in the
> > > extract.post stage.
> > >
> > > Based on a patch by Marc Kleine-Budde.
> > >
> > > Cc: Marc Kleine-Budde <mkl@pengutronix.de>
> > > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > > ---
> > > patches/ima-evm-utils-1.2.1/autogen.sh | 1 +
> > > rules/ima-evm-utils.make | 7 ++++---
> > > 2 files changed, 5 insertions(+), 3 deletions(-)
> > > create mode 120000 patches/ima-evm-utils-1.2.1/autogen.sh
> > >
> > > diff --git a/patches/ima-evm-utils-1.2.1/autogen.sh b/patches/ima-evm-utils-1.2.1/autogen.sh
> > > new file mode 120000
> > > index 000000000000..9f8a4cb7ddcb
> > > --- /dev/null
> > > +++ b/patches/ima-evm-utils-1.2.1/autogen.sh
> > > @@ -0,0 +1 @@
> > > +../autogen.sh
> > > \ No newline at end of file
> > > diff --git a/rules/ima-evm-utils.make b/rules/ima-evm-utils.make
> > > index eda5ad8a2883..82c5641e3776 100644
> > > --- a/rules/ima-evm-utils.make
> > > +++ b/rules/ima-evm-utils.make
> > > @@ -1,7 +1,7 @@
> > > # -*-makefile-*-
> > > #
> > > # Copyright (C) 2013 by Michael Grzeschik <mgr@pengutronix.de>
> > > -# 2015 by Marc Kleine-Budde <mkl@pengutronix.de>
> > > +# 2015, 2020 by Marc Kleine-Budde <mkl@pengutronix.de>
> > > # 2021 Roland Hieber, Pengutronix <rhi@pengutronix.de>
> > > #
> > > # For further information about the PTXdist project and license conditions
> > > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_IMA_EVM_UTILS) += ima-evm-utils
> > > #
> > > # Paths and names
> > > #
> > > -IMA_EVM_UTILS_VERSION := 1.1
> > > -IMA_EVM_UTILS_MD5 := 77455aeee54fdc7a70c733bcb65d33cc
> > > +IMA_EVM_UTILS_VERSION := 1.2.1
> >
> > Why 1.2.1? It's two years old and the latest release is 1.3.1.
> >
> > There are patches for the old version.
> >
> > Building can fail with:
> >
> > make[2]: Entering directory '.../build-host/ima-evm-utils-1.2.1'
> > asciidoc -d manpage -b docbook -o evmctl.1.xsl README
> > /bin/bash: asciidoc: command not found
> >
> > Upstream has a Patch to make building the docs optional.
>
> If you mean the MANPAGE_DOCBOOK_XSL configure variable, I didn't get
> that to work, so I just expanded the "remove docs" patch in v2.
I meant upstream commit 4a67103e9d9280273b349aebeedbb37eb3870aeb ("man:
Generate doc targets only when XSL found").
Michael
> - Roland
>
> >
> > Michael
> >
> > > +IMA_EVM_UTILS_MD5 := 78dc33816ec7a73a4d73153375ac53e5
> > > IMA_EVM_UTILS := ima-evm-utils-$(IMA_EVM_UTILS_VERSION)
> > > IMA_EVM_UTILS_SUFFIX := tar.gz
> > > IMA_EVM_UTILS_URL := $(call ptx/mirror, SF, linux-ima/ima-evm-utils/$(IMA_EVM_UTILS).$(IMA_EVM_UTILS_SUFFIX))
> > > @@ -35,6 +35,7 @@ IMA_EVM_UTILS_LICENSE_FILES := \
> > > IMA_EVM_UTILS_CONF_TOOL := autoconf
> > > IMA_EVM_UTILS_AUTOCONF := \
> > > $(CROSS_AUTOCONF_USR) \
> > > + --enable-openssl-conf \
> > > --disable-debug
> > >
> > > # ----------------------------------------------------------------------------
> > > --
> > > 2.29.2
> > >
> > >
> > > _______________________________________________
> > > ptxdist mailing list
> > > ptxdist@pengutronix.de
> > > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@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-5555 |
> >
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> >
>
> --
> Roland Hieber, Pengutronix e.K. | r.hieber@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-5555 |
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@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-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [ptxdist] [PATCH 7/7] systemd: make hostnamed and quotacheck optional
2021-06-16 16:14 ` Roland Hieber
@ 2021-06-17 6:45 ` Michael Olbrich
0 siblings, 0 replies; 21+ messages in thread
From: Michael Olbrich @ 2021-06-17 6:45 UTC (permalink / raw)
To: ptxdist
On Wed, Jun 16, 2021 at 06:14:38PM +0200, Roland Hieber wrote:
> On Fri, Jun 11, 2021 at 10:04:35AM +0200, Michael Olbrich wrote:
> > On Mon, Jun 07, 2021 at 03:09:09PM +0200, Roland Hieber wrote:
> > > This reduces the dependency graph and can therefore decrease boot time
> > > on systems that are configured with a static hostname, and which do not
> > > use quota. With this, /usr/share/dbus-1/system-services/ may no longer
> > > contain any service definitions, so add an empty kconfig option for it.
> > >
> > > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > > ---
> > > rules/systemd.in | 21 +++++++++++++++++++++
> > > rules/systemd.make | 12 ++++++++----
> > > 2 files changed, 29 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/rules/systemd.in b/rules/systemd.in
> > > index 854c344d5441..0f7ba889686e 100644
> > > --- a/rules/systemd.in
> > > +++ b/rules/systemd.in
> > > @@ -56,11 +56,23 @@ comment "D-Bus is needed for the enabled features"
> > > config SYSTEMD_DBUS
> > > bool
> > >
> > > +config SYSTEMD_DBUS_SERVICES
> > > + bool
> > > +
> > > +config SYSTEMD_HOSTNAMED
> > > + bool
> > > + select SYSTEMD_DBUS_SERVICES
> > > + prompt "hostname daemon support"
> > > + help
> > > + A tiny daemon that can be used to control the host name and related
> > > + machine meta data from user programs.
> >
> > This should be 'default y' so we don't break things during updates. And it
> > most cases it really doesn't hurt.
>
> Probably, but we are talking about an i.MX28 system here… :-|
That's why I said 'most'. I do remember that particular system... :-).
I'm fine with the option, but I'd like to keep it enabled by default.
Michael
> > Also, don't put it in the middle of the no-prompt options.
> >
> > Michael
> >
> > > +
> > > config SYSTEMD_MICROHTTPD
> > > bool
> > >
> > > config SYSTEMD_LOCALES
> > > bool
> > > + select SYSTEMD_DBUS_SERVICES
> > > default LOCALES
> > >
> > > config SYSTEMD_VCONSOLE
> > > @@ -80,6 +92,7 @@ config SYSTEMD_DISABLE_RANDOM_SEED
> > > config SYSTEMD_LOGIND
> > > bool
> > > select SYSTEMD_DBUS
> > > + select SYSTEMD_DBUS_SERVICES
> > > prompt "login daemon"
> > >
> > > config SYSTEMD_UNITS_USER
> > > @@ -89,6 +102,7 @@ config SYSTEMD_UNITS_USER
> > >
> > > config SYSTEMD_NETWORK
> > > bool
> > > + select SYSTEMD_DBUS_SERVICES
> > > prompt "network configuration with systemd"
> > >
> > > config SYSTEMD_IPMASQUERADE
> > > @@ -102,6 +116,7 @@ config SYSTEMD_TIMEDATE
> > > bool
> > > default y
> > > select SYSTEMD_DBUS
> > > + select SYSTEMD_DBUS_SERVICES
> > > prompt "date/time handling"
> > > help
> > > NTP client for time synchronization and local timezone handling.
> > > @@ -122,6 +137,12 @@ config SYSTEMD_POLKIT
> > > bool
> > > default POLKIT
> > >
> > > +config SYSTEMD_QUOTACHECK
> > > + bool
> > > + prompt "disk quota support"
> > > + help
> > > + File system quota checker logic.
> > > +
> > > menu "journald "
> > >
> > > config SYSTEMD_XZ
> > > diff --git a/rules/systemd.make b/rules/systemd.make
> > > index 8e80b8bcb244..e275322fd426 100644
> > > --- a/rules/systemd.make
> > > +++ b/rules/systemd.make
> > > @@ -95,7 +95,7 @@ SYSTEMD_CONF_OPT := \
> > > -Dgshadow=false \
> > > -Dhibernate=false \
> > > -Dhomed=false \
> > > - -Dhostnamed=true \
> > > + -Dhostnamed=$(call ptx/truefalse,PTXCONF_SYSTEMD_HOSTNAMED) \
> > > -Dhtml=false \
> > > -Dhwdb=$(call ptx/truefalse,PTXCONF_SYSTEMD_UDEV_HWDB) \
> > > -Didn=false \
> > > @@ -151,7 +151,7 @@ SYSTEMD_CONF_OPT := \
> > > -Dpstore=false \
> > > -Dpwquality=false \
> > > -Dqrencode=false \
> > > - -Dquotacheck=true \
> > > + -Dquotacheck=$(call ptx/truefalse,PTXCONF_SYSTEMD_QUOTACHECK) \
> > > -Dquotacheck-path=/usr/sbin/quotacheck \
> > > -Dquotaon-path=/usr/sbin/quotaon \
> > > -Drandomseed=$(call ptx/falsetrue,PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED) \
> > > @@ -245,7 +245,7 @@ SYSTEMD_HELPER := \
> > > $(call ptx/ifdef, PTXCONF_SYSTEMD_COREDUMP,systemd-coredump) \
> > > systemd-fsck \
> > > systemd-growfs \
> > > - systemd-hostnamed \
> > > + $(call ptx/ifdef, PTXCONF_SYSTEMD_HOSTNAMED,systemd-hostnamed) \
> > > systemd-journald \
> > > $(call ptx/ifdef, PTXCONF_SYSTEMD_JOURNAL_REMOTE,systemd-journal-remote) \
> > > $(call ptx/ifdef, PTXCONF_SYSTEMD_LOCALES,systemd-localed) \
> > > @@ -254,7 +254,7 @@ SYSTEMD_HELPER := \
> > > systemd-modules-load \
> > > $(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-networkd) \
> > > $(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-networkd-wait-online) \
> > > - systemd-quotacheck \
> > > + $(call ptx/ifdef, PTXCONF_SYSTEMD_QUOTACHECK,systemd-quotacheck) \
> > > $(call ptx/ifdef, PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED,,systemd-random-seed) \
> > > systemd-remount-fs \
> > > systemd-reply-password \
> > > @@ -342,7 +342,9 @@ $(STATEDIR)/systemd.targetinstall:
> > > @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-notify)
> > > @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-tmpfiles)
> > > @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/busctl)
> > > +ifdef PTXCONF_SYSTEMD_HOSTNAMED
> > > @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/hostnamectl)
> > > +endif
> > > @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-analyze)
> > > @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cat)
> > > @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cgls)
> > > @@ -372,9 +374,11 @@ $(STATEDIR)/systemd.targetinstall:
> > > @$(call install_tree, systemd, 0, 0, -, /usr/lib/tmpfiles.d/)
> > > @$(call install_copy, systemd, 0, 0, 0644, -, /usr/lib/sysctl.d/50-default.conf)
> > >
> > > +ifdef PTXCONF_SYSTEMD_DBUS_SERVICES
> > > @$(call install_copy, systemd, 0, 0, 0644, -, \
> > > /usr/share/dbus-1/services/org.freedesktop.systemd1.service)
> > > @$(call install_tree, systemd, 0, 0, -, /usr/share/dbus-1/system-services/)
> > > +endif
> > >
> > > # # systemd expects this directory to exist.
> > > @$(call install_copy, systemd, 0, 0, 0755, /var/lib/systemd)
> > > --
> > > 2.29.2
> > >
> > >
> > > _______________________________________________
> > > ptxdist mailing list
> > > ptxdist@pengutronix.de
> > > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@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-5555 |
> >
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> >
>
> --
> Roland Hieber, Pengutronix e.K. | r.hieber@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-5555 |
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@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-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [ptxdist] [PATCH 5/7] ima-evm-utils: version bump 1.1 -> 1.2.1
2021-06-17 6:44 ` Michael Olbrich
@ 2021-06-17 6:47 ` Michael Olbrich
2021-06-17 7:08 ` Michael Olbrich
0 siblings, 1 reply; 21+ messages in thread
From: Michael Olbrich @ 2021-06-17 6:47 UTC (permalink / raw)
To: ptxdist
On Thu, Jun 17, 2021 at 08:44:02AM +0200, Michael Olbrich wrote:
> On Wed, Jun 16, 2021 at 06:01:54PM +0200, Roland Hieber wrote:
> > On Fri, Jun 11, 2021 at 02:18:42PM +0200, Michael Olbrich wrote:
> > > On Mon, Jun 07, 2021 at 03:09:07PM +0200, Roland Hieber wrote:
> > > > The tarball does not include a configure script, generate it in the
> > > > extract.post stage.
> > > >
> > > > Based on a patch by Marc Kleine-Budde.
> > > >
> > > > Cc: Marc Kleine-Budde <mkl@pengutronix.de>
> > > > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > > > ---
> > > > patches/ima-evm-utils-1.2.1/autogen.sh | 1 +
> > > > rules/ima-evm-utils.make | 7 ++++---
> > > > 2 files changed, 5 insertions(+), 3 deletions(-)
> > > > create mode 120000 patches/ima-evm-utils-1.2.1/autogen.sh
> > > >
> > > > diff --git a/patches/ima-evm-utils-1.2.1/autogen.sh b/patches/ima-evm-utils-1.2.1/autogen.sh
> > > > new file mode 120000
> > > > index 000000000000..9f8a4cb7ddcb
> > > > --- /dev/null
> > > > +++ b/patches/ima-evm-utils-1.2.1/autogen.sh
> > > > @@ -0,0 +1 @@
> > > > +../autogen.sh
> > > > \ No newline at end of file
> > > > diff --git a/rules/ima-evm-utils.make b/rules/ima-evm-utils.make
> > > > index eda5ad8a2883..82c5641e3776 100644
> > > > --- a/rules/ima-evm-utils.make
> > > > +++ b/rules/ima-evm-utils.make
> > > > @@ -1,7 +1,7 @@
> > > > # -*-makefile-*-
> > > > #
> > > > # Copyright (C) 2013 by Michael Grzeschik <mgr@pengutronix.de>
> > > > -# 2015 by Marc Kleine-Budde <mkl@pengutronix.de>
> > > > +# 2015, 2020 by Marc Kleine-Budde <mkl@pengutronix.de>
> > > > # 2021 Roland Hieber, Pengutronix <rhi@pengutronix.de>
> > > > #
> > > > # For further information about the PTXdist project and license conditions
> > > > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_IMA_EVM_UTILS) += ima-evm-utils
> > > > #
> > > > # Paths and names
> > > > #
> > > > -IMA_EVM_UTILS_VERSION := 1.1
> > > > -IMA_EVM_UTILS_MD5 := 77455aeee54fdc7a70c733bcb65d33cc
> > > > +IMA_EVM_UTILS_VERSION := 1.2.1
> > >
> > > Why 1.2.1? It's two years old and the latest release is 1.3.1.
> > >
> > > There are patches for the old version.
> > >
> > > Building can fail with:
> > >
> > > make[2]: Entering directory '.../build-host/ima-evm-utils-1.2.1'
> > > asciidoc -d manpage -b docbook -o evmctl.1.xsl README
> > > /bin/bash: asciidoc: command not found
> > >
> > > Upstream has a Patch to make building the docs optional.
> >
> > If you mean the MANPAGE_DOCBOOK_XSL configure variable, I didn't get
> > that to work, so I just expanded the "remove docs" patch in v2.
>
> I meant upstream commit 4a67103e9d9280273b349aebeedbb37eb3870aeb ("man:
> Generate doc targets only when XSL found").
Ignore this. I'm not quite awake yet. I'll take a look.
Michael
--
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-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [ptxdist] [PATCH 5/7] ima-evm-utils: version bump 1.1 -> 1.2.1
2021-06-17 6:47 ` Michael Olbrich
@ 2021-06-17 7:08 ` Michael Olbrich
2021-06-17 13:01 ` Roland Hieber
0 siblings, 1 reply; 21+ messages in thread
From: Michael Olbrich @ 2021-06-17 7:08 UTC (permalink / raw)
To: ptxdist
On Thu, Jun 17, 2021 at 08:47:39AM +0200, Michael Olbrich wrote:
> On Thu, Jun 17, 2021 at 08:44:02AM +0200, Michael Olbrich wrote:
> > On Wed, Jun 16, 2021 at 06:01:54PM +0200, Roland Hieber wrote:
> > > On Fri, Jun 11, 2021 at 02:18:42PM +0200, Michael Olbrich wrote:
> > > > On Mon, Jun 07, 2021 at 03:09:07PM +0200, Roland Hieber wrote:
> > > > > The tarball does not include a configure script, generate it in the
> > > > > extract.post stage.
> > > > >
> > > > > Based on a patch by Marc Kleine-Budde.
> > > > >
> > > > > Cc: Marc Kleine-Budde <mkl@pengutronix.de>
> > > > > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > > > > ---
> > > > > patches/ima-evm-utils-1.2.1/autogen.sh | 1 +
> > > > > rules/ima-evm-utils.make | 7 ++++---
> > > > > 2 files changed, 5 insertions(+), 3 deletions(-)
> > > > > create mode 120000 patches/ima-evm-utils-1.2.1/autogen.sh
> > > > >
> > > > > diff --git a/patches/ima-evm-utils-1.2.1/autogen.sh b/patches/ima-evm-utils-1.2.1/autogen.sh
> > > > > new file mode 120000
> > > > > index 000000000000..9f8a4cb7ddcb
> > > > > --- /dev/null
> > > > > +++ b/patches/ima-evm-utils-1.2.1/autogen.sh
> > > > > @@ -0,0 +1 @@
> > > > > +../autogen.sh
> > > > > \ No newline at end of file
> > > > > diff --git a/rules/ima-evm-utils.make b/rules/ima-evm-utils.make
> > > > > index eda5ad8a2883..82c5641e3776 100644
> > > > > --- a/rules/ima-evm-utils.make
> > > > > +++ b/rules/ima-evm-utils.make
> > > > > @@ -1,7 +1,7 @@
> > > > > # -*-makefile-*-
> > > > > #
> > > > > # Copyright (C) 2013 by Michael Grzeschik <mgr@pengutronix.de>
> > > > > -# 2015 by Marc Kleine-Budde <mkl@pengutronix.de>
> > > > > +# 2015, 2020 by Marc Kleine-Budde <mkl@pengutronix.de>
> > > > > # 2021 Roland Hieber, Pengutronix <rhi@pengutronix.de>
> > > > > #
> > > > > # For further information about the PTXdist project and license conditions
> > > > > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_IMA_EVM_UTILS) += ima-evm-utils
> > > > > #
> > > > > # Paths and names
> > > > > #
> > > > > -IMA_EVM_UTILS_VERSION := 1.1
> > > > > -IMA_EVM_UTILS_MD5 := 77455aeee54fdc7a70c733bcb65d33cc
> > > > > +IMA_EVM_UTILS_VERSION := 1.2.1
> > > >
> > > > Why 1.2.1? It's two years old and the latest release is 1.3.1.
> > > >
> > > > There are patches for the old version.
> > > >
> > > > Building can fail with:
> > > >
> > > > make[2]: Entering directory '.../build-host/ima-evm-utils-1.2.1'
> > > > asciidoc -d manpage -b docbook -o evmctl.1.xsl README
> > > > /bin/bash: asciidoc: command not found
> > > >
> > > > Upstream has a Patch to make building the docs optional.
> > >
> > > If you mean the MANPAGE_DOCBOOK_XSL configure variable, I didn't get
> > > that to work, so I just expanded the "remove docs" patch in v2.
> >
> > I meant upstream commit 4a67103e9d9280273b349aebeedbb37eb3870aeb ("man:
> > Generate doc targets only when XSL found").
>
> Ignore this. I'm not quite awake yet. I'll take a look.
ac_cv_path_XMLCATALOG= in the environment should work. I've done a local
fixup. No need to send an update unless my build tests reveal more issues.
Michael
--
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-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [ptxdist] [PATCH 5/7] ima-evm-utils: version bump 1.1 -> 1.2.1
2021-06-17 7:08 ` Michael Olbrich
@ 2021-06-17 13:01 ` Roland Hieber
0 siblings, 0 replies; 21+ messages in thread
From: Roland Hieber @ 2021-06-17 13:01 UTC (permalink / raw)
To: ptxdist
On Thu, Jun 17, 2021 at 09:08:09AM +0200, Michael Olbrich wrote:
> ac_cv_path_XMLCATALOG= in the environment should work. I've done a local
> fixup. No need to send an update unless my build tests reveal more issues.
Thanks. I had also unsuccessfully tried ac_cv_path_XMLCATALOG=, but
maybe my cofe level wasn't high enough either.
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hieber@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-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2021-06-17 13:02 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-07 13:09 [ptxdist] [PATCH 1/7] googletest: new package Roland Hieber
2021-06-07 13:09 ` [ptxdist] [PATCH 2/7] python3-pyro: " Roland Hieber
2021-06-16 10:35 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-06-07 13:09 ` [ptxdist] [PATCH 3/7] host-extract-cert: version bump 0.1 -> 0.2 Roland Hieber
2021-06-16 10:35 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-06-07 13:09 ` [ptxdist] [PATCH 4/7] ima-evm-utils: fix license statement Roland Hieber
2021-06-11 12:24 ` Michael Olbrich
2021-06-07 13:09 ` [ptxdist] [PATCH 5/7] ima-evm-utils: version bump 1.1 -> 1.2.1 Roland Hieber
2021-06-11 12:18 ` Michael Olbrich
2021-06-16 16:01 ` Roland Hieber
2021-06-17 6:44 ` Michael Olbrich
2021-06-17 6:47 ` Michael Olbrich
2021-06-17 7:08 ` Michael Olbrich
2021-06-17 13:01 ` Roland Hieber
2021-06-07 13:09 ` [ptxdist] [PATCH 6/7] rng-tools: allow installing rngtest without rngd Roland Hieber
2021-06-16 10:35 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-06-07 13:09 ` [ptxdist] [PATCH 7/7] systemd: make hostnamed and quotacheck optional Roland Hieber
2021-06-11 8:04 ` Michael Olbrich
2021-06-16 16:14 ` Roland Hieber
2021-06-17 6:45 ` Michael Olbrich
2021-06-16 10:35 ` [ptxdist] [APPLIED] googletest: new package Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox