Re: [ptxdist] [APPLIED] gnupg: version bump 2.2.9 -> 2.2.23
Thanks, applied as 501fdd5ff93b18b1c06daf8280f184612ee7e774. Michael [sent from post-receive hook] On Fri, 09 Oct 2020 08:38:37 +0200, Clemens Gruber wrote: > Fixes build errors with GCC 10. > > Signed-off-by: Clemens Gruber > Message-Id: <20200922092015.84149-5-clemens.gru...@pqgruber.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/gnupg.make b/rules/gnupg.make > index 90a91cb06847..cdf70e9edffb 100644 > --- a/rules/gnupg.make > +++ b/rules/gnupg.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GNUPG) += gnupg > # > # Paths and names > # > -GNUPG_VERSION:= 2.2.9 > -GNUPG_MD5:= 52c895a81f514a65e08923736c38654a > +GNUPG_VERSION:= 2.2.23 > +GNUPG_MD5:= a094ff856a53a9a9fd5465657d998079 > GNUPG:= gnupg-$(GNUPG_VERSION) > GNUPG_SUFFIX := tar.bz2 > GNUPG_URL:= ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX) > @@ -80,7 +80,6 @@ GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \ > --disable-rpath \ > --disable-nls \ > --enable-endian-check \ > - --disable-regex \ > --enable-optimization \ > --disable-werror \ > --disable-all-tests \ ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] sudo: version bump 1.8.28 -> 1.9.3
Thanks, applied as 53d21c94eee4b29212b6ec18da8f62d76621b05f. Michael [sent from post-receive hook] On Fri, 09 Oct 2020 08:38:38 +0200, Jon Ringle wrote: > sudo fails to crosscompile with OSELAS.Toolchain-2020.08.0 with glibc-2.32 > > > target: sudo.compile > > > make: Entering directory '/src/build/platform-ec1k/build-target/sudo-1.8.28' > > [...] > > ./mksigname > signame.c > /bin/sh: ./mksigname: cannot execute binary file: Exec format error > make[1]: *** [Makefile:194: signame.c] Error 126 > make[1]: *** Waiting for unfinished jobs > > There is a matching gentoo bug report on this here: > https://bugs.gentoo.org/739016 > with a fix applied upstream and incorporated into sudo-1.9.3 > > Signed-off-by: Jon Ringle > Message-Id: <20201006130610.1276-1-...@ringle.org> > Signed-off-by: Michael Olbrich > > diff --git a/rules/sudo.make b/rules/sudo.make > index eb65060a7831..efd420674bbd 100644 > --- a/rules/sudo.make > +++ b/rules/sudo.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_SUDO) += sudo > # > # Paths and names > # > -SUDO_VERSION := 1.8.28 > -SUDO_MD5 := 5afa5acd0c55b40916e4ad864607edfe > +SUDO_VERSION := 1.9.3 > +SUDO_MD5 := ecf74b49275f15a3e46f1903c6cb2211 > SUDO := sudo-$(SUDO_VERSION) > SUDO_SUFFIX := tar.gz > SUDO_URL := \ > @@ -25,7 +25,7 @@ SUDO_URL:= \ > SUDO_SOURCE := $(SRCDIR)/$(SUDO).$(SUDO_SUFFIX) > SUDO_DIR := $(BUILDDIR)/$(SUDO) > SUDO_LICENSE := ISC AND BSD-3-Clause AND BSD-2-Clause-NetBSD AND Zlib > -SUDO_LICENSE_FILES := file://doc/LICENSE;md5=6c76b73603ac7763ab0516ebfbe67b42 > +SUDO_LICENSE_FILES := file://doc/LICENSE;md5=828cd502ad216ff869bf83adf3301e02 > > # > > # Prepare ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] systemd: version bump 246.3 -> 246.6
Thanks, applied as f2e7df06ea6fcac67fe197627adb4d13679d35aa. Michael [sent from post-receive hook] On Fri, 09 Oct 2020 08:38:38 +0200, Clemens Gruber wrote: > Signed-off-by: Clemens Gruber > Message-Id: <20200922092015.84149-6-clemens.gru...@pqgruber.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/systemd.make b/rules/systemd.make > index e6090f141247..fa0efe41a609 100644 > --- a/rules/systemd.make > +++ b/rules/systemd.make > @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd > # > # Paths and names > # > -SYSTEMD_VERSION := 246.3 > +SYSTEMD_VERSION := 246.6 > SYSTEMD_VERSION_MAJOR:= $(firstword $(subst -, ,$(subst ., > ,$(SYSTEMD_VERSION > -SYSTEMD_MD5 := 1408c07c017470fa49cbb6d78c9aedea > +SYSTEMD_MD5 := a17b5e6b9e0aa1ac71587c05124e46e7 > SYSTEMD := systemd-$(SYSTEMD_VERSION) > SYSTEMD_SUFFIX := tar.gz > ifeq ($(SYSTEMD_VERSION),$(SYSTEMD_VERSION_MAJOR)) ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] glu: fix build optimization
Thanks, applied as 964f676ebd67201486a27b937d705a2f242160ea. Michael [sent from post-receive hook] On Fri, 09 Oct 2020 08:38:40 +0200, Lucas Stach wrote: > A bug in th configure script caused the package to be built with > debug flags when --disable-debug is specified. > > Signed-off-by: Lucas Stach > Message-Id: <20201005190640.5483-1-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git > a/patches/glu-9.0.1/0001-build-fix-the-debug-parameter-to-properly-handle-dis.patch > > b/patches/glu-9.0.1/0001-build-fix-the-debug-parameter-to-properly-handle-dis.patch > new file mode 100644 > index ..c1bb17c632dd > --- /dev/null > +++ > b/patches/glu-9.0.1/0001-build-fix-the-debug-parameter-to-properly-handle-dis.patch > @@ -0,0 +1,30 @@ > +From: Lucas Stach > +Date: Mon, 5 Oct 2020 16:45:11 +0200 > +Subject: [PATCH] build: fix the debug parameter to properly handle > + --disable-debug > + > +Right now the the enableval isn't checked, so the debug options are added > +for --enable-debug and --disable-debug, which is quite surprising for a > +user. Fix this to peroply handle the disable case. > +--- > + configure.ac | 7 +-- > + 1 file changed, 5 insertions(+), 2 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index 6d9b04b45cb2..f1bb7b14eae4 100644 > +--- a/configure.ac > b/configure.ac > +@@ -42,8 +42,11 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) > + AC_ARG_ENABLE(debug, > + AS_HELP_STRING([--enable-debug], > + [Enable debugging information]), > +- [CFLAGS="$CFLAGS -g -O0 -DDEBUG" > +- CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG"], > ++ [if test x$enableval = xyes; then > ++ CFLAGS="$CFLAGS -g -O0 -DDEBUG" > ++ CXXFLAGS="$CXXFLAGS -g -O0 -DDEBUG"; else > ++ CFLAGS="$CFLAGS -DNDEBUG" > ++ CXXFLAGS="$CXXFLAGS -DNDEBUG"; fi], > + [CFLAGS="$CFLAGS -DNDEBUG" > +CXXFLAGS="$CXXFLAGS -DNDEBUG"]) > + > diff --git a/patches/glu-9.0.1/autogen.sh b/patches/glu-9.0.1/autogen.sh > new file mode 12 > index ..9f8a4cb7ddcb > --- /dev/null > +++ b/patches/glu-9.0.1/autogen.sh > @@ -0,0 +1 @@ > +../autogen.sh > \ No newline at end of file > diff --git a/patches/glu-9.0.1/series b/patches/glu-9.0.1/series > new file mode 100644 > index ..1ad43d010e0f > --- /dev/null > +++ b/patches/glu-9.0.1/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-build-fix-the-debug-parameter-to-properly-handle-dis.patch > +# d78721868a7016e340f9e3fe654aa62e - git-ptx-patches magic ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] stress-ng: add missing GCCLIBS_ATOMIC select
Thanks, applied as 9bc5b9ee6d4be954f7e487070c522ecf4ed6e00a. Michael [sent from post-receive hook] On Fri, 09 Oct 2020 08:38:39 +0200, Bastian Krause wrote: > stress-ng uses libatomic since v0.11.15. > > Signed-off-by: Bastian Krause > Message-Id: <20201006172854.28716-1-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/stress-ng.in b/rules/stress-ng.in > index 1397ef24f053..d5c71196ae5d 100644 > --- a/rules/stress-ng.in > +++ b/rules/stress-ng.in > @@ -3,6 +3,7 @@ > config STRESS_NG > tristate > prompt "stress-ng" > + select GCCLIBS_ATOMIC > select LIBAIO > select LIBBSD > select ZLIB ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] git-ptx-patches: support flag -n to get unnumbered patches
Thanks, applied as fc60b543beee61e191dae256a8c7723bd3242dde. Michael [sent from post-receive hook] On Fri, 09 Oct 2020 08:38:33 +0200, Uwe Kleine-König wrote: > When passing -n to git-ptx-patches the filenames in the patch stack > don't get a number as prefix. > > The obvious downside is that the order of the patches isn't obvious > without the series file and you cannot create a patch stack if two > patches share have the same shortlog (which ideally shouldn't happen > ...) > > The obvious advantage is that when a patch is added or removed in the > middle of the series there are no renames for the later patches > necessary and the changes to series are smaller accordingly. > > So if the patchstack of openssl used unnumbered patches the commit > c45d66cdae4b ("openssl: remove engines-path patch") would only have to > touch two lines in series (i.e. the removal of the patch and the changed > checksum) and contain no renames. > > Signed-off-by: Uwe Kleine-König > Message-Id: <20200922084730.11671-1-u.kleine-koe...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/scripts/git-ptx-patches b/scripts/git-ptx-patches > index fe680273085b..772d20992838 100755 > --- a/scripts/git-ptx-patches > +++ b/scripts/git-ptx-patches > @@ -34,6 +34,7 @@ fi > > remove_old=no > tag=base > +numbered_patches=true > > if grep -q "$PTX_PATCHES_HEADER" .ptxdist/series; then > echo "Found series file generated by git-ptx-patches." > @@ -52,7 +53,7 @@ if [ "x$1" = "x--force-remove" ]; then > shift > fi > > -while getopts "ft:n:" opt; do > +while getopts "ft:n" opt; do > case "${opt}" in > f) > remove_old="force" > @@ -61,6 +62,9 @@ while getopts "ft:n:" opt; do > tag="${OPTARG}" > range="${tag}" > ;; > + n) > + numbered_patches=false > + ;; > esac > done > shift $((${OPTIND} - 1)) > @@ -144,7 +148,16 @@ fi > GIT_EXTRA_ARGS="$GIT_EXTRA_ARGS --summary --stat=80" > > cat .ptxdist/series.0 > .ptxdist/series > -${GIT} format-patch -N $GIT_EXTRA_ARGS ${tagopt} -o .ptxdist/patches/ > ${range} | sed -e 's,^.ptxdist/patches/,,' > .ptxdist/series.auto > +${GIT} format-patch -N $GIT_EXTRA_ARGS ${tagopt} -o .ptxdist/patches/ > ${range} | while read patch; do > + if "$numbered_patches"; then > + patchname="${patch#.ptxdist/patches/}" > + else > + patchname="${patch#.ptxdist/patches/[0-9][0-9][0-9][0-9]-}" > + mv -n "$patch" ".ptxdist/patches/$patchname" > + fi > + echo "$patchname" > +done > .ptxdist/series.auto > + > cat .ptxdist/series.auto >> .ptxdist/series > cat .ptxdist/series.1 >> .ptxdist/series > cat .ptxdist/series | _md5sum >> .ptxdist/series ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] nginx: version bump 1.16.1 -> 1.18.0
Thanks, applied as 4566f7a8c6a668ccb4aa02633b5cf827a1b3ca01. Michael [sent from post-receive hook] On Fri, 09 Oct 2020 08:38:35 +0200, Clemens Gruber wrote: > Signed-off-by: Clemens Gruber > Message-Id: <20200922092015.84149-1-clemens.gru...@pqgruber.com> > Signed-off-by: Michael Olbrich > > diff --git > a/patches/nginx-1.16.1/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch > > b/patches/nginx-1.18.0/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch > similarity index 100% > rename from > patches/nginx-1.16.1/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch > rename to > patches/nginx-1.18.0/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch > diff --git > a/patches/nginx-1.16.1/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch > > b/patches/nginx-1.18.0/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch > similarity index 100% > rename from > patches/nginx-1.16.1/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch > rename to > patches/nginx-1.18.0/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch > diff --git > a/patches/nginx-1.16.1/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch > > b/patches/nginx-1.18.0/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch > similarity index 100% > rename from > patches/nginx-1.16.1/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch > rename to > patches/nginx-1.18.0/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch > diff --git > a/patches/nginx-1.16.1/0004-auto-lib-libxslt-conf-use-pkg-config.patch > b/patches/nginx-1.18.0/0004-auto-lib-libxslt-conf-use-pkg-config.patch > similarity index 100% > rename from > patches/nginx-1.16.1/0004-auto-lib-libxslt-conf-use-pkg-config.patch > rename to patches/nginx-1.18.0/0004-auto-lib-libxslt-conf-use-pkg-config.patch > diff --git > a/patches/nginx-1.16.1/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch > > b/patches/nginx-1.18.0/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch > similarity index 100% > rename from > patches/nginx-1.16.1/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch > rename to > patches/nginx-1.18.0/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch > diff --git > a/patches/nginx-1.16.1/0006-auto-lib-openssl-conf-use-pkg-config.patch > b/patches/nginx-1.18.0/0006-auto-lib-openssl-conf-use-pkg-config.patch > similarity index 100% > rename from > patches/nginx-1.16.1/0006-auto-lib-openssl-conf-use-pkg-config.patch > rename to patches/nginx-1.18.0/0006-auto-lib-openssl-conf-use-pkg-config.patch > diff --git > a/patches/nginx-1.16.1/0007-auto-lib-libgd-conf-use-pkg-config.patch > b/patches/nginx-1.18.0/0007-auto-lib-libgd-conf-use-pkg-config.patch > similarity index 100% > rename from patches/nginx-1.16.1/0007-auto-lib-libgd-conf-use-pkg-config.patch > rename to patches/nginx-1.18.0/0007-auto-lib-libgd-conf-use-pkg-config.patch > diff --git > a/patches/nginx-1.16.1/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch > > b/patches/nginx-1.18.0/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch > similarity index 100% > rename from > patches/nginx-1.16.1/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch > rename to > patches/nginx-1.18.0/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch > diff --git > a/patches/nginx-1.16.1/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch > > b/patches/nginx-1.18.0/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch > similarity index 100% > rename from > patches/nginx-1.16.1/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch > rename to > patches/nginx-1.18.0/0100-auto-endianness-add-mechanism-allowing-to-force-resu.patch > diff --git > a/patches/nginx-1.16.1/0101-auto-unix-allow-overriding-the-IPv6-build-tests.patch > > b/patches/nginx-1.18.0/0101-auto-unix-allow-overriding-the-IPv6-build-tests.patch > similarity index 100% > rename from > patches/nginx-1.16.1/0101-auto-unix-allow-overriding-the-IPv6-build-tests.patch > rename to > patches/nginx-1.18.0/0101-auto-unix-allow-overriding-the-IPv6-build-tests.patch > diff --git a/patches/nginx-1.16.1/series b/patches/nginx-1.18.0/series > similarity index 100% > rename from patches/nginx-1.16.1/series > rename to patches/nginx-1.18.0/series > diff --git a/rules/nginx.make b/rules/nginx.make > index 15e71d25ab27..fe12acf2eac3 100644 > --- a/rules/nginx.make > +++ b/rules/nginx.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_NGINX) += nginx > # > # Paths and names > # > -NGINX_VERSION:= 1.16.1 > -NGINX_MD5:= 45a80f75336c980d240987badc3dcf60 > +NGINX_VERSION:= 1.18.0 > +NGINX_MD5:= b2d33d24d89b8b1f87ff5d251aa27eb8 > NGINX:= nginx-$(NGINX_VERSION) > NGINX_SUFFIX := tar.gz > NGINX_URL:= https://nginx.org/download/$(NGINX).$(NGINX_SUFFIX) _
Re: [ptxdist] [APPLIED] mpg123: version bump 1.25.10 -> 1.26.3
Thanks, applied as 415b62d4488ac338ef1ea56fff6d81b385fd9bd8. Michael [sent from post-receive hook] On Fri, 09 Oct 2020 08:38:36 +0200, Clemens Gruber wrote: > Signed-off-by: Clemens Gruber > Message-Id: <20200922092015.84149-2-clemens.gru...@pqgruber.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/mpg123.make b/rules/mpg123.make > index 72271a8d6246..89c1dac653e4 100644 > --- a/rules/mpg123.make > +++ b/rules/mpg123.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MPG123) += mpg123 > # > # Paths and names > # > -MPG123_VERSION := 1.25.10 > -MPG123_MD5 := ea32caa61d41d8be797f0b04a1b43ad9 > +MPG123_VERSION := 1.26.3 > +MPG123_MD5 := 2cd73024aafe4873f691ae8c889c7692 > MPG123 := mpg123-$(MPG123_VERSION) > MPG123_SUFFIX:= tar.bz2 > MPG123_URL := http://www.mpg123.org/download/$(MPG123).$(MPG123_SUFFIX) > @@ -90,6 +90,7 @@ $(STATEDIR)/mpg123.targetinstall: > @$(call install_copy, mpg123, 0, 0, 0755, -, /usr/bin/mpg123) > @$(call install_lib, mpg123, 0, 0, 0644, libmpg123) > @$(call install_lib, mpg123, 0, 0, 0644, libout123) > + @$(call install_lib, mpg123, 0, 0, 0644, libsyn123) > > @$(call install_finish, mpg123) > ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] libgcrypt: version bump 1.8.5 -> 1.8.6
Thanks, applied as ac308a2611f9acbc4dcb385eea98c192709ef992. Michael [sent from post-receive hook] On Fri, 09 Oct 2020 08:38:37 +0200, Clemens Gruber wrote: > Signed-off-by: Clemens Gruber > Message-Id: <20200922092015.84149-4-clemens.gru...@pqgruber.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make > index 18b61c5a1403..95597c0c937e 100644 > --- a/rules/libgcrypt.make > +++ b/rules/libgcrypt.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBGCRYPT) += libgcrypt > # > # Paths and names > # > -LIBGCRYPT_VERSION:= 1.8.5 > -LIBGCRYPT_MD5:= 348cc4601ca34307fc6cd6c945467743 > +LIBGCRYPT_VERSION:= 1.8.6 > +LIBGCRYPT_MD5:= e9dfc1e789a2a42f36917c543fcd7862 > LIBGCRYPT:= libgcrypt-$(LIBGCRYPT_VERSION) > LIBGCRYPT_SUFFIX := tar.bz2 > LIBGCRYPT_URL:= > https://www.gnupg.org/ftp/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX) ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] ptxd_make_license_report: remove deprecated package tocstyle
Thanks, applied as 5ab4b202a81a3de56e383fd618c066dc688c8f69. Michael [sent from post-receive hook] On Fri, 09 Oct 2020 08:38:35 +0200, Roland Hieber wrote: > The tocstyle package was never meant for production use, and was removed > completely in KOMA-script 3.31 (released on 2020-07-26), so building the > license report fails to find tocstyle.sty. Remove the package from the > license report header; however, removing it doesn't seem to make any > difference to the rendered license report. > > Link: > https://ctan.org/ctan-ann/id/mailman.339.1595768614.2548.ctan-...@ctan.org > Signed-off-by: Roland Hieber > Message-Id: <20201004211725.32369-1-...@pengutronix.de> > [mol: also remove the second occurance] > Signed-off-by: Michael Olbrich > > diff --git a/scripts/lib/ptxd_make_license_report.sh > b/scripts/lib/ptxd_make_license_report.sh > index e04cb4a4b134..c92dc725d1f7 100644 > --- a/scripts/lib/ptxd_make_license_report.sh > +++ b/scripts/lib/ptxd_make_license_report.sh > @@ -19,8 +19,6 @@ ptxd_make_license_report_header() { > \usepackage{adjustbox} > \usepackage{spverbatim} > \hypersetup{colorlinks=true,linkcolor=blue,urlcolor=blue} > - \usepackage{tocstyle} > - \usetocstyle{KOMAlike} > > %% Something like this may be needed depending on the package list > %\usepackage[CJK]{ucharclasses} > @@ -212,8 +210,6 @@ ptxd_make_license_compliance_header() { > \usepackage{adjustbox} > \usepackage{spverbatim} > \hypersetup{colorlinks=true,linkcolor=blue,urlcolor=blue} > - \usepackage{tocstyle} > - \usetocstyle{KOMAlike} > > %% Something like this may be needed depending on the package list > %\usepackage[CJK]{ucharclasses} ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] mesalib: version bump 20.1.7 -> 20.1.9
Thanks, applied as 7a7317b82bd7f8b4cbd4895ada9af85c355a89f5. Michael [sent from post-receive hook] On Fri, 09 Oct 2020 08:38:34 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20201002133527.30240-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/mesalib.make b/rules/mesalib.make > index 9ac6eef68eac..40d0057792d0 100644 > --- a/rules/mesalib.make > +++ b/rules/mesalib.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib > # > # Paths and names > # > -MESALIB_VERSION := 20.1.7 > -MESALIB_MD5 := d4a092d7b5a2c6ed52aad0f6b6b1447c > +MESALIB_VERSION := 20.1.9 > +MESALIB_MD5 := a29ff0d65a067ffaf08e4c48fd6d2d03 > MESALIB := mesa-$(MESALIB_VERSION) > MESALIB_SUFFIX := tar.xz > MESALIB_URL := \ ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] kernel: use kernelconfig file without version by default
Thanks, applied as 8e6dfc64ba675a055644c2a4ca3d461d95657c57. Michael [sent from post-receive hook] On Fri, 09 Oct 2020 08:38:34 +0200, Roland Hieber wrote: > Removing the version number from the file name makes it easier to update > the kernel to a new version, since the file would otherwise need to be > renamed anyway. > > Also improve the help text. > > Signed-off-by: Roland Hieber > Message-Id: <20200927214336.23382-1-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/platforms/kernel.in b/platforms/kernel.in > index 34d05c825929..30b70f28349b 100644 > --- a/platforms/kernel.in > +++ b/platforms/kernel.in > @@ -258,9 +258,10 @@ config KERNEL_SERIES > config KERNEL_CONFIG > prompt "kernel config file" > string > - default "kernelconfig-${PTXCONF_KERNEL_VERSION}" > + default "kernelconfig" > help > This entry specifies the .config file used to compile your kernel. > + Specify the path relative to the platformconfig directory. > > endmenu > ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] custom FIT image
Thanks! That was just what I needed. El mié., 7 oct. 2020 a las 9:18, Michael Olbrich () escribió: > On Wed, Sep 30, 2020 at 12:41:13PM +0200, Alejandro Vázquez wrote: > > El mar., 29 sept. 2020 a las 15:13, Roland Hieber () > > escribió: > > > > > On Tue, Sep 29, 2020 at 01:28:34PM +0200, Alejandro Vázquez wrote: > > > > Hi all! > > > > I need to create a FIT image kernel and I need to add the arguments: > > > load > > > > and entry. > > > > These arguments are not defined in the script ptxd_make_fit_image.sh > > > > > > > > Is there a way to indicate these arguments? > > > > Can I use a custom "its" file? > > > > Can I modify the script locally in my BSP? > > > > > > You can overwrite the functions by placing their new definition in a > > > script (name doesn't matter) in scripts/lib/ in your BSP. PTXdist > > > sources all files in there automatically after the scripts in PTXdist > > > itself. > > > > > > > > Thanks! work! > > > > Now, I would like to put the arguments load and entry as customizable > > parameters in kernel-fit.in > > Ex: > > config KERNEL_FIT_LOAD > > string > > default "0xABC12340" > > prompt "Load address" > > > > I tried to get the value in the script (ptxd_make_fit_image.sh) but it > > doesn't work. > > Ex: > > load = "${PTXCONF_KERNEL_FIT_LOAD}"; > > > > Would it be possible to access these variables from the script? > > load="$(ptxd_get_ptxconf PTXCONF_KERNEL_FIT_LOAD)" > > 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- | > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de > ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v2] file: version bump 5.36 -> 5.39
Signed-off-by: Clemens Gruber --- Changes since v1: - Disable bzip2 and xz support rules/file.make | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/file.make b/rules/file.make index 0d42cdece..dafbd14ac 100644 --- a/rules/file.make +++ b/rules/file.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_FILE) += file # # Paths and names # -FILE_VERSION := 5.36 -FILE_MD5 := 9af0eb3f5db4ae00fffc37f7b861575c +FILE_VERSION := 5.39 +FILE_MD5 := 1c450306053622803a25647d88f80f25 FILE := file-$(FILE_VERSION) FILE_SUFFIX:= tar.gz FILE_URL := http://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX) @@ -38,6 +38,8 @@ FILE_CONF_OPT := \ --enable-elf \ --enable-elf-core \ --enable-zlib \ + --disable-bzlib \ + --disable-xzlib \ --$(call ptx/endis, PTXCONF_FILE_SECCOMP)-libseccomp \ --disable-fsect-man5 \ $(GLOBAL_LARGE_FILE_OPTION) \ -- 2.28.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH] dbus-broker: new package
On Wed, Oct 07, 2020 at 09:11:53AM +0200, Michael Olbrich wrote: > On Tue, Sep 22, 2020 at 11:20:15AM +0200, Clemens Gruber wrote: > > dbus-broker is a high-performance D-Bus message broker which serves as > > a drop-in replacement for the dbus-daemon. The original dbus is > > installed as a dependency (due to required files). > > > > If dbus-broker is enabled, it is used as the system bus. > > > > At runtime, a Linux Kernel >= 4.14 is required (theoretically >= 4.10 > > works too, but lacks security-related AF_UNIX patches according to > > dbus-broker docs) > > I've done some experimentation with this myself in the past. The last time > I tried this, I still needed the /usr/share/dbus-1/system.conf from the > regular package. That made installing only dbus-broker somewhat awkward. > > Is that still necessary? Yes it is, and on https://github.com/bus1/dbus-broker/wiki they write: "You still need the dbus reference implementation installed, since it provides tools used by many applications, as well as the dbus.socket unit file." >From PTXdist point of view, dbus could be a dependency for dbus-broker, and "overriding" dbus.service in /etc/systemd/system seemed like a good choice. Do you think this could lead to problems? Until they ship all files they need with dbus-broker, I am not sure there is a better way. Clemens > > Michael > > > Signed-off-by: Clemens Gruber > > --- > > rules/dbus-broker.in | 19 +++ > > rules/dbus-broker.make | 75 ++ > > 2 files changed, 94 insertions(+) > > create mode 100644 rules/dbus-broker.in > > create mode 100644 rules/dbus-broker.make > > > > diff --git a/rules/dbus-broker.in b/rules/dbus-broker.in > > new file mode 100644 > > index 0..9ae261284 > > --- /dev/null > > +++ b/rules/dbus-broker.in > > @@ -0,0 +1,19 @@ > > +## SECTION=middleware > > + > > +menuconfig DBUS_BROKER > > + tristate > > + prompt "dbus-broker " > > + select HOST_MESON > > + select DBUS > > + select EXPAT > > + select LIBC_M > > + select LIBC_PTHREAD > > + select SYSTEMD > > + help > > + The dbus-broker project is an implementation of a message bus as > > + defined by the D-Bus specification. Its aim is to provide high > > + performance and reliability, while keeping compatibility to the > > + D-Bus reference implementation. > > + This package is designed to be a drop-in replacement for dbus > > + (as the system bus), but the dbus package still has to be > > + installed. > > diff --git a/rules/dbus-broker.make b/rules/dbus-broker.make > > new file mode 100644 > > index 0..7d32c5425 > > --- /dev/null > > +++ b/rules/dbus-broker.make > > @@ -0,0 +1,75 @@ > > +# -*-makefile-*- > > +# > > +# Copyright (C) 2020 by Clemens Gruber > > +# > > +# For further information about the PTXdist project and license conditions > > +# see the README file. > > +# > > + > > +# > > +# We provide this package > > +# > > +PACKAGES-$(PTXCONF_DBUS_BROKER) += dbus-broker > > + > > +# > > +# Paths and names > > +# > > +DBUS_BROKER_VERSION:= 24 > > +DBUS_BROKER_MD5:= b60f426bc92a4f6119e51a69aef301a2 > > +DBUS_BROKER:= dbus-broker-$(DBUS_BROKER_VERSION) > > +DBUS_BROKER_SUFFIX := tar.xz > > +DBUS_BROKER_URL:= > > https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION)/$(DBUS_BROKER).$(DBUS_BROKER_SUFFIX) > > +DBUS_BROKER_SOURCE := $(SRCDIR)/$(DBUS_BROKER).$(DBUS_BROKER_SUFFIX) > > +DBUS_BROKER_DIR:= $(BUILDDIR)/$(DBUS_BROKER) > > +DBUS_BROKER_LICENSE:= Apache-2.0 > > +DBUS_BROKER_LICENSE_FILES := \ > > + file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8 > > + > > +# > > > > +# Prepare > > +# > > > > + > > +DBUS_BROKER_CONF_TOOL := meson > > +DBUS_BROKER_CONF_OPT := \ > > + $(CROSS_MESON_USR) \ > > + -Daudit=false \ > > + -Ddocs=false \ > > + -Dlauncher=true \ > > + -Dlinux-4-17=false \ > > + -Dreference-test=false \ > > + -Dselinux=$(call ptx/truefalse,PTXCONF_GLOBAL_SELINUX) > > + > > +# dbus-broker requires a kernel and kernel headers >= 4.14 > > +ifdef PTXCONF_KERNEL_HEADER > > +DBUS_BROKER_CPPFLAGS := \ > > + -isystem $(KERNEL_HEADERS_INCLUDE_DIR) > > +endif > > + > > +# > > > > +# Target-Install > > +# > > > > + > > +$(STATEDIR)/dbus-broker.targetinstall: > > + @$(call targetinfo) > > + > > + @$(call install_init, dbus-broker) > > + @$(call install_fixup, dbus-broker, PRIORITY, optional) > > + @$(call install_fixup, dbus-broker, SECTION, base) > > + @$(call install_fixup, dbus-broker, AUTHOR, "Clemens Gruber > > ") > > + @$(call install_fix
[ptxdist] [PATCH] systemd: Fix dependency to /var/spool at runtime
systemd installs /usr/lib/tmpfiles.d/var.conf which contains d /var/spool 0755 - - - This makes systemd-tmpfilesd fail creating this directory if the rootfs is readonly. This patch selects ROOTFS_VAR_SPOOL, as runtime dependency, to ensure this directory is already available which makes systemd-tmpfilesd happy. Signed-off-by: Gavin Schenk --- I tested this patch: https://eckelmann.kpaste.net/c13172 rules/systemd.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/systemd.in b/rules/systemd.in index 95f77d064..04c6ee998 100644 --- a/rules/systemd.in +++ b/rules/systemd.in @@ -33,6 +33,7 @@ menuconfig SYSTEMD select HOST_SYSTEMD if SYSTEMD_UDEV_HWDB select ROOTFS_VAR_LIB if RUNTIME select ROOTFS_VAR_CACHE if RUNTIME + select ROOTFS_VAR_SPOOL if RUNTIME prompt "systemd " help systemd is a system and session manager for Linux, compatible with SysV -- 2.28.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH v3] rootfs: Fix creation of the /media directory
On Thu, Oct 08, 2020 at 09:32:53AM +0200, Gavin Schenk wrote: > Ensure that with PTXCONF_ROOTFS_MEDIA set directory '/media' is created > even if none of PTXCONF_ROOTFS_MEDIA[1-6] is set. > > On our read-only system we mount a tmpfs on directory '/media' in order > to dynamically create additional mount points there. > > Fixes: 63e2d8696 (rootfs: don't create empty /media subdirs) > Signed-off-by: Gavin Schenk > --- > Hi, > > the "messed whitespaces" of changes in our mail server software. > Our IT department implemented a workaround, I hope this > mail looks better. It seems the workaround worked fine. I didn't try to apply, but at least now there are tabs in your patch. Acked-by: Uwe Kleine-König Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | https://www.pengutronix.de/ | signature.asc Description: PGP signature ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH v3] rootfs: Fix creation of the /media directory
Ensure that with PTXCONF_ROOTFS_MEDIA set directory '/media' is created even if none of PTXCONF_ROOTFS_MEDIA[1-6] is set. On our read-only system we mount a tmpfs on directory '/media' in order to dynamically create additional mount points there. Fixes: 63e2d8696 (rootfs: don't create empty /media subdirs) Signed-off-by: Gavin Schenk --- Hi, the "messed whitespaces" of changes in our mail server software. Our IT department implemented a workaround, I hope this mail looks better. Regards Gavin rules/rootfs.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/rootfs.make b/rules/rootfs.make index 6b37db5bd..419ca001e 100644 --- a/rules/rootfs.make +++ b/rules/rootfs.make @@ -63,6 +63,7 @@ ifdef PTXCONF_ROOTFS_HOME_ROOT @$(call install_copy, rootfs, 0, 0, 0700, /root) endif ifdef PTXCONF_ROOTFS_MEDIA + @$(call install_copy, rootfs, 0, 0, 0755, /media) ifneq ($(call remove_quotes,$(PTXCONF_ROOTFS_MEDIA1)),) @$(call install_copy, rootfs, 0, 0, 0777, /media/$(PTXCONF_ROOTFS_MEDIA1)) endif -- 2.28.0 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de