diff options
| author | Roland Hieber <rhi@pengutronix.de> | 2021-05-24 23:21:29 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-05-26 11:40:54 +0200 |
| commit | 8f259a6e887248160a01ccdfdd6d271dd3d05daa (patch) | |
| tree | 8b947a50c3886ecc82ef2e4771da2675c1716c4d /rules | |
| parent | 82fe4760bebf1ed79cf13324dc8b76b4e3be0eb6 (diff) | |
| download | ptxdist-8f259a6e887248160a01ccdfdd6d271dd3d05daa.tar.gz ptxdist-8f259a6e887248160a01ccdfdd6d271dd3d05daa.tar.xz | |
minicom: version bump 2.6.2. -> 2.8
Add two patches for reproducible builds and compatibility with GCC 11,
renovate the variable names, sort the config options in the order in
which they appear in configure.ac for configure_helper.py, and pin them
down so that configure does not try to autodetect paths on the build
host. Also make it work with ckermit if desired.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
Message-Id: <20210524212129.8277-2-rhi@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/minicom.in | 6 | ||||
| -rw-r--r-- | rules/minicom.make | 22 |
2 files changed, 21 insertions, 7 deletions
diff --git a/rules/minicom.in b/rules/minicom.in index f1ba05417..d3580bda0 100644 --- a/rules/minicom.in +++ b/rules/minicom.in @@ -4,6 +4,9 @@ menuconfig MINICOM tristate prompt "minicom " select NCURSES + select ROOTFS + select ROOTFS_VAR_LOCK + select CKERMIT if MINICOM_KERMIT help friendly menu driven serial communication program @@ -19,4 +22,7 @@ config MINICOM_DEFCONFIG help Install /etc/minirc.dfl config file from projectroot or ptxdist generic. +config MINICOM_KERMIT + bool + prompt "ckermit support" endif diff --git a/rules/minicom.make b/rules/minicom.make index 8722f0e29..e757b3230 100644 --- a/rules/minicom.make +++ b/rules/minicom.make @@ -2,6 +2,7 @@ # # Copyright (C) 2007 by Carsten Schlote <c.schlote@konzeptpark.de> # 2009, 2010 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. @@ -15,12 +16,12 @@ PACKAGES-$(PTXCONF_MINICOM) += minicom # # Paths and names # -MINICOM_VERSION := 2.6.2 -MINICOM_MD5 := 203c56c4b447f45e2301b0cc4e83da3c -MINICOM_SUFFIX := tar.gz +MINICOM_VERSION := 2.8 +MINICOM_MD5 := d32eb2e615f286611c4d1877a25939be +MINICOM_SUFFIX := tar.bz2 MINICOM := minicom-$(MINICOM_VERSION) MINICOM_TARBALL := minicom_$(MINICOM_VERSION).orig.$(MINICOM_SUFFIX) -MINICOM_URL := http://snapshot.debian.org/archive/debian/20130208T032801Z/pool/main/m/minicom/$(MINICOM_TARBALL) +MINICOM_URL := http://snapshot.debian.org/archive/debian/20210524T032801Z/pool/main/m/minicom/$(MINICOM_TARBALL) MINICOM_SOURCE := $(SRCDIR)/$(MINICOM).$(MINICOM_SUFFIX) MINICOM_DIR := $(BUILDDIR)/$(MINICOM) MINICOM_LICENSE := LGPL-2.0-or-later AND xinetd AND GPL-2.0-or-later @@ -37,12 +38,19 @@ MINICOM_LICENSE_FILES := \ # # autoconf # -MINICOM_AUTOCONF := \ +MINICOM_CONF_TOOL := autoconf +MINICOM_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --disable-nls \ --disable-rpath \ + --disable-music \ --enable-socket \ - --disable-music + --enable-lock-dir=/var/lock \ + --enable-dfl-port=/dev/modem \ + --enable-dfl-baud=115200 \ + --enable-cfg-dir=/etc \ + --enable-kermit=$(call ptx/ifdef,PTXCONF_MINICOM_KERMIT,/usr/bin/ckermit,/usr/bin/false) \ + --disable-nls \ + --without-dmalloc # ---------------------------------------------------------------------------- # Target-Install |