[ptxdist] [PATCH 2/2] host-coreutils: remove
The last dependency on this package has been removed in the previous patch. So remove this package. Signed-off-by: Marc Kleine-Budde --- rules/host-coreutils.in | 5 rules/host-coreutils.make | 62 --- 2 files changed, 67 deletions(-) delete mode 100644 rules/host-coreutils.in delete mode 100644 rules/host-coreutils.make diff --git a/rules/host-coreutils.in b/rules/host-coreutils.in deleted file mode 100644 index 7cd2e45f1469.. --- a/rules/host-coreutils.in +++ /dev/null @@ -1,5 +0,0 @@ -## SECTION=hosttools_noprompt - -config HOST_COREUTILS - tristate - default y if ALLYES diff --git a/rules/host-coreutils.make b/rules/host-coreutils.make deleted file mode 100644 index a65aa6d70df5.. --- a/rules/host-coreutils.make +++ /dev/null @@ -1,62 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2014 by Michael Olbrich -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -HOST_PACKAGES-$(PTXCONF_HOST_COREUTILS) += host-coreutils - -# -# Prepare -# - -HOST_COREUTILS_SKIP := \ - base64 basename cat chcon chgrp chmod chown chroot cksum comm cp \ - csplit cut date dd df dir dircolors dirname du echo env expand \ - expr factor false fmt fold groups head hostid id install join \ - kill link logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl \ - nohup nproc numfmt od paste pathchk pinky pr printenv printf ptx \ - pwd readlink realpath rm rmdir runcon seq sha1sum sha224sum \ - sha256sum sha384sum sha512sum shred shuf sleep sort split stat \ - stdbuf stty sum sync tac tail tee test [ timeout touch tr true \ - truncate tsort tty uname unexpand uniq unlink uptime users vdir \ - wc who whoami yes - -# -# autoconf -# -HOST_COREUTILS_CONF_TOOL := autoconf -HOST_COREUTILS_CONF_OPT:= \ - $(HOST_AUTOCONF) \ - --disable-silent-rules \ - --enable-threads=posix \ - --disable-assert \ - --disable-rpath \ - --disable-libsmack \ - --disable-xattr \ - --disable-libcap \ - --enable-install-program=ln \ - --enable-no-install-program=$(subst $(space),$(comma),$(strip $(HOST_COREUTILS_SKIP))) \ - --disable-nls \ - --without-openssl \ - --without-selinux \ - --without-gmp - -# -# Install -# - -$(STATEDIR)/host-coreutils.install: - @$(call targetinfo) - @$(call world/install, HOST_COREUTILS) - @find $(HOST_COREUTILS_PKGDIR) -type f -executable ! -name ln | xargs rm - @$(call touch) - -# vim: syntax=make -- 2.19.2 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] systemd: remove coreutils dependency
Even the ln of ubuntu 14.04's coreutils supports --relative, do not compile host-coreutils, as it will fail on that ubuntu version, due to a too old glibc. Signed-off-by: Marc Kleine-Budde --- rules/host-systemd.in | 2 -- rules/systemd.in | 2 -- 2 files changed, 4 deletions(-) diff --git a/rules/host-systemd.in b/rules/host-systemd.in index ab901c7a236c..f80d9de10fb6 100644 --- a/rules/host-systemd.in +++ b/rules/host-systemd.in @@ -5,7 +5,5 @@ config HOST_SYSTEMD default y if ALLYES select HOST_MESON select HOST_GPERF - # for 'ln --relative' - select HOST_COREUTILS select HOST_UTIL_LINUX_NG select HOST_LIBCAP diff --git a/rules/systemd.in b/rules/systemd.in index 29d7bf2b9a43..1c26e92b9b41 100644 --- a/rules/systemd.in +++ b/rules/systemd.in @@ -5,8 +5,6 @@ menuconfig SYSTEMD depends on INITMETHOD_SYSTEMD select HOST_MESON select HOST_GPERF - # for 'ln --relative' - select HOST_COREUTILS select ROOTFS_RUN select LIBC_PTHREAD select LIBC_RT -- 2.19.2 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [ANNOUNCE] OSELAS.Toolchain() 2018.12.0 released
Hi, I'm happy to announce that I've just released OSELAS.Toolchain-2018.12.0. This is a major release with significant changes. All components of the primary toolchains have been updated to the latest versions. The highlights are: - gcc 8.2 - glibc 2.28 - binutils 2.31.1 - kernel headers 4.19 - gdb 8.2 There are two new toolchains this time. A RISC-V 64-bit and a MIPS 32-bit big-endian toolchain. All other toolchains are the same as before. Download the release here: https://public.pengutronix.de/oselas/toolchain/ Enjoy, Michael Olbrich -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | signature.asc Description: PGP signature ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2 2/4] barebox: depend on HOST_LZOP
On Thu, Dec 13, 2018 at 01:02:50PM +, Baeuerle, Florian wrote: > Am Donnerstag, den 13.12.2018, 12:16 +0100 schrieb Michael Olbrich: > > On Wed, Dec 12, 2018 at 02:52:54PM +, Baeuerle, Florian wrote: > > > The version shipped by ptxdist allows us to override the modification > > > time in the lzop headers. > > > > > > Signed-off-by: Florian Bäuerle > > > --- > > > platforms/barebox.in | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/platforms/barebox.in b/platforms/barebox.in > > > index 645366e93..46ab32a07 100644 > > > --- a/platforms/barebox.in > > > +++ b/platforms/barebox.in > > > @@ -12,7 +12,7 @@ menuconfig BAREBOX > > > select HOST_LIBUSB if BAREBOX_NEEDS_HOST_LIBUSB > > > select HOST_OPENSSL if BAREBOX_NEEDS_HOST_OPENSSL > > > select HOST_IMX_CST if BAREBOX_NEEDS_HOST_IMX_CST > > > - select HOST_LZOP if BAREBOX_NEEDS_HOST_LZOP > > > + select HOST_LZOP if BAREBOX_NEEDS_HOST_LZOP || > > > !SETUP_DISABLE_REPRODUCIBLE > > > > This does not work. You will need to enable BAREBOX_NEEDS_HOST_LZOP > > manually if lzop is used by barebox. > > Oops, you're right – in the platformconfig menu all SETUP_ symbols seem to be > undefined. Anyway, it's probably a bad idea to depend on regenerating a > platformconfig when the user en/disables user properties. > > Can I just make barebox unconditionally depend on HOST_LZOP? > > Other suggestions? Why not leave it as is? lzop is not always used in barebox. You should enable BAREBOX_NEEDS_HOST_LZOP if lzop compression is used in barebox. That's the use-case for this option. Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2 2/4] barebox: depend on HOST_LZOP
Am Donnerstag, den 13.12.2018, 12:16 +0100 schrieb Michael Olbrich: > On Wed, Dec 12, 2018 at 02:52:54PM +, Baeuerle, Florian wrote: > > The version shipped by ptxdist allows us to override the modification > > time in the lzop headers. > > > > Signed-off-by: Florian Bäuerle > > --- > > platforms/barebox.in | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/platforms/barebox.in b/platforms/barebox.in > > index 645366e93..46ab32a07 100644 > > --- a/platforms/barebox.in > > +++ b/platforms/barebox.in > > @@ -12,7 +12,7 @@ menuconfig BAREBOX > > select HOST_LIBUSB if BAREBOX_NEEDS_HOST_LIBUSB > > select HOST_OPENSSL if BAREBOX_NEEDS_HOST_OPENSSL > > select HOST_IMX_CST if BAREBOX_NEEDS_HOST_IMX_CST > > - select HOST_LZOP if BAREBOX_NEEDS_HOST_LZOP > > + select HOST_LZOP if BAREBOX_NEEDS_HOST_LZOP || > > !SETUP_DISABLE_REPRODUCIBLE > > This does not work. You will need to enable BAREBOX_NEEDS_HOST_LZOP > manually if lzop is used by barebox. Oops, you're right – in the platformconfig menu all SETUP_ symbols seem to be undefined. Anyway, it's probably a bad idea to depend on regenerating a platformconfig when the user en/disables user properties. Can I just make barebox unconditionally depend on HOST_LZOP? Other suggestions? - Florian > > Michael > > > prompt "barebox " > > bool > > help > > -- > > 2.19.2 > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] template-src-linux-driver: Only install driver if selected
If a local package "foo-mod" for a Linux kernel module is selected by a local tristate configuration option PTXCONF_FOO_MOD, then based on the template for Linux drivers, it would include the following in its foo-mod.make file: ifdef PTXCONF_FOO_MOD $(STATEDIR)/kernel.targetinstall.post: $(STATEDIR)/foo-mod.targetinstall endif However, this rule will be invoked even if the PTXCONF_FOO_MOD option has been configured with the tristate option 'm' and has not been changed to 'y' by a selected_collectionconfig. This causes the Linux kernel module to be built and installed unintentionally. To prevent that happening, the above lines in the foo-mod.make file can be changed as follows (using a conditional test suggested by Michael Olbrich): ifneq ($(filter foo-mod,$(PTX_PACKAGES_SELECTED)),) $(STATEDIR)/kernel.targetinstall.post: $(STATEDIR)/foo-mod.targetinstall endif This patch changes the template for Linux driver packages in accordance with the above change. Signed-off-by: Ian Abbott Cc: Michael Olbrich --- v2: Changed the conditional test to that suggested by Michael Olbrich in Message-ID <20181212111846.zb3kxfs6jsc5r...@pengutronix.de> to avoid breaking the build if the package is configured using the tristate 'm' option and no collection is selected. rules/templates/template-src-linux-driver-make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/templates/template-src-linux-driver-make b/rules/templates/template-src-linux-driver-make index e06a22497..c13857924 100644 --- a/rules/templates/template-src-linux-driver-make +++ b/rules/templates/template-src-linux-driver-make @@ -22,7 +22,7 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@ @PACKAGE@_DIR := $(BUILDDIR)/$(@PACKAGE@) @PACKAGE@_LICENSE := unknown -ifdef PTXCONF_@PACKAGE@ +ifneq ($(filter @package@,$(PTX_PACKAGES_SELECTED)),) $(STATEDIR)/kernel.targetinstall.post: $(STATEDIR)/@package@.targetinstall endif -- 2.19.2 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] template-src-linux-driver: Only install driver if selected
On 12/12/2018 11:18, Michael Olbrich wrote: On Wed, Dec 12, 2018 at 10:42:38AM +, Ian Abbott wrote: If a local package "foo-mod" for a Linux kernel module is selected by a local tristate configuration option PTXCONF_FOO_MOD, then based on the template for Linux drivers, it would include the following in its foo-mod.make file: ifdef PTXCONF_FOO_MOD $(STATEDIR)/kernel.targetinstall.post: $(STATEDIR)/foo-mod.targetinstall endif However, this rule will be invoked even if the PTXCONF_FOO_MOD option has been configured with the tristate option 'm' and has not been changed to 'y' by a selected_collectionconfig. This causes the Linux kernel module to be built and installed unintentionally. To prevent that happening, the above lines in the foo-mod.make file can be changed as follows (only the conditional test is changed): ifeq ($(PTXCONF_FOO_MOD),y) $(STATEDIR)/kernel.targetinstall.post: $(STATEDIR)/foo-mod.targetinstall endif This patch changes the template for Linux driver packages in accordance with the above change. No, this break building if PTXCONF_FOO_MOD=m and no collection is selected. Untested: ifneq ($(filter foo-mod,$(PTX_PACKAGES_SELECTED)),) Michael Thanks Michael. I tested your change with and without a selected_collectionconfig and it works. I'll submit a v2 patch incorporating your change. -- -=( Ian Abbott || Web: www.mev.co.uk )=- -=( MEV Ltd. is a company registered in England & Wales. )=- -=( Registered number: 02862268. Registered address:)=- -=( 15 West Park Road, Bramhall, STOCKPORT, SK7 3JZ, UK. )=- ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2 2/4] barebox: depend on HOST_LZOP
On Wed, Dec 12, 2018 at 02:52:54PM +, Baeuerle, Florian wrote: > The version shipped by ptxdist allows us to override the modification > time in the lzop headers. > > Signed-off-by: Florian Bäuerle > --- > platforms/barebox.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/platforms/barebox.in b/platforms/barebox.in > index 645366e93..46ab32a07 100644 > --- a/platforms/barebox.in > +++ b/platforms/barebox.in > @@ -12,7 +12,7 @@ menuconfig BAREBOX > select HOST_LIBUSB if BAREBOX_NEEDS_HOST_LIBUSB > select HOST_OPENSSL if BAREBOX_NEEDS_HOST_OPENSSL > select HOST_IMX_CST if BAREBOX_NEEDS_HOST_IMX_CST > - select HOST_LZOP if BAREBOX_NEEDS_HOST_LZOP > + select HOST_LZOP if BAREBOX_NEEDS_HOST_LZOP || > !SETUP_DISABLE_REPRODUCIBLE This does not work. You will need to enable BAREBOX_NEEDS_HOST_LZOP manually if lzop is used by barebox. Michael > prompt "barebox " > bool > help > -- > 2.19.2 > > ___ > ptxdist mailing list > ptxdist@pengutronix.de -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] setlocalversion: only use tags actually on current branch
Hi, for interested listeners, my custom auto-version with '-' handling. It defers in format, but thats okay to me. $ git describe OSELAS.BSP-Pengutronix-Generic-2014.07.0-6-g3266e67 $ ./p print PTXDIST_BSP_AUTOVERSION 2014.07.0-6-g3266e67f0b46 $ ./p print BSP_AUTOVERSION 2014.07.0-6-g3266e67 Regards Denis --- rules/pre/autoversion.make | 17 + 1 file changed, 17 insertions(+) diff --git a/rules/pre/autoversion.make b/rules/pre/autoversion.make new file mode 100644 index 000..cceeb09 --- /dev/null +++ b/rules/pre/autoversion.make @@ -0,0 +1,17 @@ +# -*-makefile-*- +# +# Copyright (C) 2018 by Denis Osterland +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +AUTOVERSION_GIT_LAST_TAG := $(shell git describe --first-parent --abbrev=0) +AUTOVERSION_GIT_DESCRIBE := $(shell git describe --first-parent --dirty) +BSP_AUTOVERSION := $(addprefix \ + $(lastword $(subst -, ,$(AUTOVERSION_GIT_LAST_TAG))), \ + $(AUTOVERSION_GIT_DESCRIBE:$(AUTOVERSION_GIT_LAST_TAG)%=%)) + +# vim: syntax=make Diehl Connectivity Solutions GmbH Geschäftsführung: Horst Leonberger Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht Nürnberg: HRB 32315 ___ Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt. The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. ___ ptxdist mailing list ptxdist@pengutronix.de
