From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH v2] CanFestival: version bump 3-20081204-1 -> 3+hg20180126.794
Date: Wed, 7 Mar 2018 15:44:26 +0100 [thread overview]
Message-ID: <20180307144426.inuoqps7gzxmsew6@pengutronix.de> (raw)
In-Reply-To: <20180307100716.6704-1-u.kleine-koenig@pengutronix.de>
On Wed, Mar 07, 2018 at 11:07:16AM +0100, Uwe Kleine-König wrote:
> This uses a new snapshot of CanFestival available from the repository
> https://hg.beremiz.org/CanFestival-3/ which is the "main repo" according
> to https://canfestival.org/code .
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> Compared to (implicit) v1 sent with Message-Id:
> <20180302200558.14579-1-u.kleine-koenig@pengutronix.de>:
>
> - get source from hg webif
> - add more configure flags
>
> ...1-fix-for-ldconfig-crash-on-make-install.patch} | 2 +-
> .../0002-fix-for-CAN-ID-byteorder.patch} | 162 +++-----
> .../0003-Makefile.in-fix-suffix-rules.patch | 46 +++
> patches/CanFestival-3+hg20180126.794/series | 6 +
> .../0001-add-DESTDIR-to-Makefile.in.patch | 161 --------
> .../0003-install-networkedit.ico.patch | 25 --
> .../0005-Makefile.in-fix-suffix-rules.patch | 406 ---------------------
> patches/CanFestival-3-20081204-1/series | 8 -
> rules/canfestival.make | 26 +-
> 9 files changed, 128 insertions(+), 714 deletions(-)
> rename patches/{CanFestival-3-20081204-1/0002-fix-for-ldconfig-crash-on-make-install.patch => CanFestival-3+hg20180126.794/0001-fix-for-ldconfig-crash-on-make-install.patch} (93%)
> rename patches/{CanFestival-3-20081204-1/0004-fix-for-CAN-ID-byteorder.patch => CanFestival-3+hg20180126.794/0002-fix-for-CAN-ID-byteorder.patch} (59%)
> create mode 100644 patches/CanFestival-3+hg20180126.794/0003-Makefile.in-fix-suffix-rules.patch
> create mode 100644 patches/CanFestival-3+hg20180126.794/series
> delete mode 100644 patches/CanFestival-3-20081204-1/0001-add-DESTDIR-to-Makefile.in.patch
> delete mode 100644 patches/CanFestival-3-20081204-1/0003-install-networkedit.ico.patch
> delete mode 100644 patches/CanFestival-3-20081204-1/0005-Makefile.in-fix-suffix-rules.patch
> delete mode 100644 patches/CanFestival-3-20081204-1/series
>
[...]
> diff --git a/rules/canfestival.make b/rules/canfestival.make
> index d8aed433b774..0b8c5f6cc9e3 100644
> --- a/rules/canfestival.make
> +++ b/rules/canfestival.make
> @@ -19,11 +19,12 @@ endif
> #
> # Paths and names
> #
> -CANFESTIVAL_VERSION := 3-20081204-1
> -CANFESTIVAL_MD5 := 792e225678402dcd026b7b25796d23ad
> -CANFESTIVAL := CanFestival-$(CANFESTIVAL_VERSION)
> -CANFESTIVAL_SUFFIX := tar.bz2
> -CANFESTIVAL_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(CANFESTIVAL).$(CANFESTIVAL_SUFFIX)
> +# Taken from https://hg.beremiz.org/CanFestival-3/rev/8bfe0ac00cdb
> +CANFESTIVAL_VERSION := 3+hg20180126.794
> +CANFESTIVAL_MD5 := c97bca1c4a81a17b1a75a1f8d068b2b3
> +CANFESTIVAL := canfestival-$(CANFESTIVAL_VERSION)
> +CANFESTIVAL_SUFFIX := tar.gz
> +CANFESTIVAL_URL := https://hg.beremiz.org/CanFestival-3/archive/8bfe0ac00cdb.$(CANFESTIVAL_SUFFIX)
> CANFESTIVAL_SOURCE := $(SRCDIR)/$(CANFESTIVAL).$(CANFESTIVAL_SUFFIX)
> CANFESTIVAL_DIR := $(BUILDDIR)/$(CANFESTIVAL)
>
> @@ -34,14 +35,25 @@ CANFESTIVAL_DIR := $(BUILDDIR)/$(CANFESTIVAL)
> CANFESTIVAL_PATH := PATH=$(CROSS_PATH)
> CANFESTIVAL_ENV := $(CROSS_ENV_CC)
> # Overwrite OPT_CFLAGS instead of CFLAGS so we don't loose other flags
> -# such as -fPIC for libs. Not this breaks when using "--disable-Ox"
> +# such as -fPIC for libs. Note this breaks when using "--disable-Ox"
> CANFESTIVAL_MAKEVARS := OPT_CFLAGS="-isystem $(KERNEL_HEADERS_INCLUDE_DIR) -O2"
> #
> # autoconf
> #
> CANFESTIVAL_AUTOCONF := \
CANFESTIVAL_CONF_TOOL := autoconf
CANFESTIVAL_CONF_OPT := \
> --prefix=/usr \
> - --can=socket
> + --can=socket \
> + --timers=unix \
> + --wx=0 \
> + --enabled-dll \
"Unknown argument --enabled-dll"
> + --disable-lss \
This will probably fail too.
> + --MAX_CAN_BUS_ID=1 \
> + --SDO_MAX_LENGTH_TRANSFER=32 \
> + --SDO_BLOCK_SIZE=16 \
> + --SDO_MAX_SIMULTANEOUS_TRANSFERS=4 \
> + --NMT_MAX_NODE_ID=128 \
> + --SDO_TIMEOUT_MS=3000 \
> + --EMCY_MAX_ERRORS=8 \
These are just hardcoded values, right? No autodetection? In that case, not
setting them is ok.
>
> ifdef PTXCONF_ENDIAN_BIG
> CANFESTIVAL_AUTOCONF += --CANOPEN_BIG_ENDIAN=1
$(call ptx/ifdef,PTXCONF_ENDIAN_BIG,--CANOPEN_BIG_ENDIAN=1)
Michael
> --
> 2.16.1
>
>
> _______________________________________________
> 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-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2018-03-07 14:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-07 10:07 Uwe Kleine-König
2018-03-07 14:44 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180307144426.inuoqps7gzxmsew6@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox