* [Buildroot] [PATCH 1/4] minicom: update package to use git repository.
2018-08-01 12:57 [Buildroot] [PATCH 0/4] minicom: update to use latest git repository Giulio Benetti
@ 2018-08-01 12:57 ` Giulio Benetti
2018-08-01 12:57 ` [Buildroot] [PATCH 2/4] minicom: add pre-configure hook to call autogen.sh Giulio Benetti
` (3 subsequent siblings)
4 siblings, 0 replies; 13+ messages in thread
From: Giulio Benetti @ 2018-08-01 12:57 UTC (permalink / raw)
To: buildroot
Minicom is now hosted on a git repository:
https://salsa.debian.org/minicom-team/minicom.git
Change package to use git method pointing to last commit.
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
package/minicom/minicom.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk
index cb06482379..1a3426899f 100644
--- a/package/minicom/minicom.mk
+++ b/package/minicom/minicom.mk
@@ -4,8 +4,9 @@
#
################################################################################
-MINICOM_VERSION = 2.7.1
-MINICOM_SITE = https://alioth.debian.org/frs/download.php/file/4215
+MINICOM_VERSION = 0e79d0bb731a16a3126d926740f923bcb6ecd738
+MINICOM_SITE = https://salsa.debian.org/minicom-team/minicom.git
+MINICOM_SITE_METHOD = git
MINICOM_LICENSE = GPL-2.0+
MINICOM_LICENSE_FILES = COPYING
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 2/4] minicom: add pre-configure hook to call autogen.sh
2018-08-01 12:57 [Buildroot] [PATCH 0/4] minicom: update to use latest git repository Giulio Benetti
2018-08-01 12:57 ` [Buildroot] [PATCH 1/4] minicom: update package to use " Giulio Benetti
@ 2018-08-01 12:57 ` Giulio Benetti
2018-08-01 14:48 ` Thomas Petazzoni
2018-08-01 12:57 ` [Buildroot] [PATCH 3/4] minicom: delete patches Giulio Benetti
` (2 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Giulio Benetti @ 2018-08-01 12:57 UTC (permalink / raw)
To: buildroot
Using latest minicom git commit need to call autogen.sh instead of
relying on Buildroot MINICOM_AUTORECONF = YES
Add MINICOM_RUN_AUTOGEN to MINICOM_PRE_CONFIGURE_HOOKS and dependencies
needed by autogen.sh like: host-automake, host-autoconf, host-libtool.
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
package/minicom/minicom.mk | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk
index 1a3426899f..91eb74c9ad 100644
--- a/package/minicom/minicom.mk
+++ b/package/minicom/minicom.mk
@@ -18,4 +18,13 @@ MINICOM_CONF_ENV = PKG_CONFIG=/bin/false
MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv)
+# configure is missing and minicom is not compatible with our autoreconf
+# mechanism so we have to do it manually instead of using MINICOM_AUTORECONF = YES
+define MINICOM_RUN_AUTOGEN
+ cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
+endef
+MINICOM_PRE_CONFIGURE_HOOKS += MINICOM_RUN_AUTOGEN
+
+MINICOM_DEPENDENCIES += host-automake host-autoconf host-libtool
+
$(eval $(autotools-package))
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 2/4] minicom: add pre-configure hook to call autogen.sh
2018-08-01 12:57 ` [Buildroot] [PATCH 2/4] minicom: add pre-configure hook to call autogen.sh Giulio Benetti
@ 2018-08-01 14:48 ` Thomas Petazzoni
2018-08-01 15:05 ` Giulio Benetti
0 siblings, 1 reply; 13+ messages in thread
From: Thomas Petazzoni @ 2018-08-01 14:48 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 1 Aug 2018 14:57:19 +0200, Giulio Benetti wrote:
> Using latest minicom git commit need to call autogen.sh instead of
> relying on Buildroot MINICOM_AUTORECONF = YES
>
> Add MINICOM_RUN_AUTOGEN to MINICOM_PRE_CONFIGURE_HOOKS and dependencies
> needed by autogen.sh like: host-automake, host-autoconf, host-libtool.
>
> Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
Looking at the autogen.sh script, I don't see anything fancy. What is
happening when you use MINICOM_AUTORECONF = YES ?
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 2/4] minicom: add pre-configure hook to call autogen.sh
2018-08-01 14:48 ` Thomas Petazzoni
@ 2018-08-01 15:05 ` Giulio Benetti
2018-08-01 15:10 ` Thomas Petazzoni
0 siblings, 1 reply; 13+ messages in thread
From: Giulio Benetti @ 2018-08-01 15:05 UTC (permalink / raw)
To: buildroot
Hello,
Il 01/08/2018 16:48, Thomas Petazzoni ha scritto:
> Hello,
>
> On Wed, 1 Aug 2018 14:57:19 +0200, Giulio Benetti wrote:
>> Using latest minicom git commit need to call autogen.sh instead of
>> relying on Buildroot MINICOM_AUTORECONF = YES
>>
>> Add MINICOM_RUN_AUTOGEN to MINICOM_PRE_CONFIGURE_HOOKS and dependencies
>> needed by autogen.sh like: host-automake, host-autoconf, host-libtool.
>>
>> Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
>
> Looking at the autogen.sh script, I don't see anything fancy. What is
> happening when you use MINICOM_AUTORECONF = YES ?
It complains about m4 directory missing.
Maybe I could create a workaround for that?
Giulio
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 2/4] minicom: add pre-configure hook to call autogen.sh
2018-08-01 15:05 ` Giulio Benetti
@ 2018-08-01 15:10 ` Thomas Petazzoni
2018-08-01 15:13 ` Giulio Benetti
0 siblings, 1 reply; 13+ messages in thread
From: Thomas Petazzoni @ 2018-08-01 15:10 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 1 Aug 2018 17:05:08 +0200, Giulio Benetti wrote:
> It complains about m4 directory missing.
> Maybe I could create a workaround for that?
Example:
# Autoreconf requires an existing m4 directory
define BLUEZ_ALSA_MKDIR_M4
mkdir -p $(@D)/m4
endef
BLUEZ_ALSA_POST_PATCH_HOOKS += BLUEZ_ALSA_MKDIR_M4
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 2/4] minicom: add pre-configure hook to call autogen.sh
2018-08-01 15:10 ` Thomas Petazzoni
@ 2018-08-01 15:13 ` Giulio Benetti
0 siblings, 0 replies; 13+ messages in thread
From: Giulio Benetti @ 2018-08-01 15:13 UTC (permalink / raw)
To: buildroot
Hi,
Il 01/08/2018 17:10, Thomas Petazzoni ha scritto:
> Hello,
>
> On Wed, 1 Aug 2018 17:05:08 +0200, Giulio Benetti wrote:
>
>> It complains about m4 directory missing.
>> Maybe I could create a workaround for that?
>
> Example:
>
> # Autoreconf requires an existing m4 directory
> define BLUEZ_ALSA_MKDIR_M4
> mkdir -p $(@D)/m4
> endef
> BLUEZ_ALSA_POST_PATCH_HOOKS += BLUEZ_ALSA_MKDIR_M4
Ah, yes, I've noticed it, but I thought it was "more right" using
autogen.sh as in gpm package.
So I follow ALSA package model.
Thank you.
Giulio
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 3/4] minicom: delete patches
2018-08-01 12:57 [Buildroot] [PATCH 0/4] minicom: update to use latest git repository Giulio Benetti
2018-08-01 12:57 ` [Buildroot] [PATCH 1/4] minicom: update package to use " Giulio Benetti
2018-08-01 12:57 ` [Buildroot] [PATCH 2/4] minicom: add pre-configure hook to call autogen.sh Giulio Benetti
@ 2018-08-01 12:57 ` Giulio Benetti
2018-08-01 12:57 ` [Buildroot] [PATCH 4/4] minicom: delete hash file Giulio Benetti
2018-08-01 14:47 ` [Buildroot] [PATCH 0/4] minicom: update to use latest git repository Thomas Petazzoni
4 siblings, 0 replies; 13+ messages in thread
From: Giulio Benetti @ 2018-08-01 12:57 UTC (permalink / raw)
To: buildroot
Patches are now part of sources.
Delete patches.
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
.../minicom/0001-musl-libc-compile-fix.patch | 28 ----------
...-change-maxnamlen-to-posixs-name-max.patch | 51 -------------------
2 files changed, 79 deletions(-)
delete mode 100644 package/minicom/0001-musl-libc-compile-fix.patch
delete mode 100644 package/minicom/0002-change-maxnamlen-to-posixs-name-max.patch
diff --git a/package/minicom/0001-musl-libc-compile-fix.patch b/package/minicom/0001-musl-libc-compile-fix.patch
deleted file mode 100644
index 94c0da06a5..0000000000
--- a/package/minicom/0001-musl-libc-compile-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# HG changeset patch
-# User Adam Lackorzynski <adam@os.inf.tu-dresden.de>
-# Date 1432407431 -7200
-# Sat May 23 20:57:11 2015 +0200
-# Node ID 8bf81e6a8e60e37c2dec9577a1be6357b8d56165
-# Parent 8c784c80c17aa7a346d982db23bca5df67302cda
-musl-libc compile fix
-
-By Felix Janda <felix.janda@posteo.de>:
-VC_MUSIC is enabled by default on linux and in dial.c the
-necessary header are only included for glibc. (The wrong conditional
-include has likely been introduced by the 2003-03-30 GNU/Hurd patch.)
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-[Taken from upstream Mercurial commit 8bf81e6a8e60]
-
-diff -r 8c784c80c17a -r 8bf81e6a8e60 src/dial.c
---- a/src/dial.c Sat May 23 20:56:29 2015 +0200
-+++ b/src/dial.c Sat May 23 20:57:11 2015 +0200
-@@ -39,7 +39,7 @@
- #include "intl.h"
-
- #ifdef VC_MUSIC
--# if defined(__GLIBC__)
-+# if defined(__linux__) || defined(__GLIBC__)
- # include <sys/ioctl.h>
- # include <sys/kd.h>
- # include <sys/time.h>
diff --git a/package/minicom/0002-change-maxnamlen-to-posixs-name-max.patch b/package/minicom/0002-change-maxnamlen-to-posixs-name-max.patch
deleted file mode 100644
index 83e1530600..0000000000
--- a/package/minicom/0002-change-maxnamlen-to-posixs-name-max.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-# HG changeset patch
-# User Adam Lackorzynski <adam@os.inf.tu-dresden.de>
-# Date 1432407475 -7200
-# Sat May 23 20:57:55 2015 +0200
-# Node ID 93e5dd955c8bd944fd64bb04fd117c963c3758bc
-# Parent 8bf81e6a8e60e37c2dec9577a1be6357b8d56165
-Change MAXNAMLEN to POSIX's NAME_MAX
-
-By Felix Janda <felix.janda@posteo.de>:
-MAXNAMLEN is usually defined in <sys/param.h> but it is
-better to use the equivalent POSIX NAME_MAX.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-[Taken from upstream Mercurial commit 93e5dd955c8b]
-
-diff -r 8bf81e6a8e60 -r 93e5dd955c8b src/getsdir.c
---- a/src/getsdir.c Sat May 23 20:57:11 2015 +0200
-+++ b/src/getsdir.c Sat May 23 20:57:55 2015 +0200
-@@ -145,7 +145,7 @@
- *
- * The data will be in the form:
- * typedef struct dirEntry {
-- * char fname[MAXNAMLEN + 1];
-+ * char fname[NAME_MAX + 1];
- * time_t time;
- * mode_t mode;
- * } GETSDIR_ENTRY;
-@@ -232,7 +232,7 @@
- }
-
- /* copy the filename */
-- strncpy((*datptr)[cnt].fname, dp->d_name, MAXNAMLEN);
-+ strncpy((*datptr)[cnt].fname, dp->d_name, NAME_MAX);
-
- /* get information about the directory entry */
- snprintf(fpath, sizeof(fpath), "%s/%s", dirpath, dp->d_name);
-diff -r 8bf81e6a8e60 -r 93e5dd955c8b src/getsdir.h
---- a/src/getsdir.h Sat May 23 20:57:11 2015 +0200
-+++ b/src/getsdir.h Sat May 23 20:57:55 2015 +0200
-@@ -23,9 +23,10 @@
- */
-
- #include <dirent.h>
-+#include <limits.h>
-
- typedef struct dirEntry { /* structure of data item */
-- char fname[MAXNAMLEN + 1]; /* filename + terminating null */
-+ char fname[NAME_MAX + 1]; /* filename + terminating null */
- time_t time; /* last modification date */
- mode_t mode; /* file mode (dir? etc.) */
- ushort cflags; /* caller field for convenience */
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 4/4] minicom: delete hash file.
2018-08-01 12:57 [Buildroot] [PATCH 0/4] minicom: update to use latest git repository Giulio Benetti
` (2 preceding siblings ...)
2018-08-01 12:57 ` [Buildroot] [PATCH 3/4] minicom: delete patches Giulio Benetti
@ 2018-08-01 12:57 ` Giulio Benetti
2018-08-01 14:47 ` [Buildroot] [PATCH 0/4] minicom: update to use latest git repository Thomas Petazzoni
4 siblings, 0 replies; 13+ messages in thread
From: Giulio Benetti @ 2018-08-01 12:57 UTC (permalink / raw)
To: buildroot
Minicom is now under git repo, not tar.gz anymore.
With git repo don't need hash file.
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
package/minicom/minicom.hash | 2 --
1 file changed, 2 deletions(-)
delete mode 100644 package/minicom/minicom.hash
diff --git a/package/minicom/minicom.hash b/package/minicom/minicom.hash
deleted file mode 100644
index ca3087160b..0000000000
--- a/package/minicom/minicom.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256 532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1 minicom-2.7.1.tar.gz
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 0/4] minicom: update to use latest git repository
2018-08-01 12:57 [Buildroot] [PATCH 0/4] minicom: update to use latest git repository Giulio Benetti
` (3 preceding siblings ...)
2018-08-01 12:57 ` [Buildroot] [PATCH 4/4] minicom: delete hash file Giulio Benetti
@ 2018-08-01 14:47 ` Thomas Petazzoni
2018-08-01 15:14 ` Giulio Benetti
4 siblings, 1 reply; 13+ messages in thread
From: Thomas Petazzoni @ 2018-08-01 14:47 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 1 Aug 2018 14:57:17 +0200, Giulio Benetti wrote:
> Giulio Benetti (4):
> minicom: update package to use git repository.
> minicom: add pre-configure hook to call autogen.sh
> minicom: delete patches
> minicom: delete hash file.
All these patches should be just one, otherwise your series is not
bisectable.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 0/4] minicom: update to use latest git repository
2018-08-01 14:47 ` [Buildroot] [PATCH 0/4] minicom: update to use latest git repository Thomas Petazzoni
@ 2018-08-01 15:14 ` Giulio Benetti
2018-08-01 17:00 ` Thomas Petazzoni
0 siblings, 1 reply; 13+ messages in thread
From: Giulio Benetti @ 2018-08-01 15:14 UTC (permalink / raw)
To: buildroot
Hello,
Il 01/08/2018 16:47, Thomas Petazzoni ha scritto:
> Hello,
>
> On Wed, 1 Aug 2018 14:57:17 +0200, Giulio Benetti wrote:
>
>> Giulio Benetti (4):
>> minicom: update package to use git repository.
>> minicom: add pre-configure hook to call autogen.sh
>> minicom: delete patches
>> minicom: delete hash file.
>
> All these patches should be just one, otherwise your series is not
> bisectable.
Ah ok, I thought it was easier break all patches.
So basically the commit log will be the cover letter, right?
And btw, is commit log of cover letter acceptable?
I don't know if it's too long or messy.
Please let me know,
thank you very much
Giulio
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 0/4] minicom: update to use latest git repository
2018-08-01 15:14 ` Giulio Benetti
@ 2018-08-01 17:00 ` Thomas Petazzoni
2018-08-01 20:57 ` Giulio Benetti
0 siblings, 1 reply; 13+ messages in thread
From: Thomas Petazzoni @ 2018-08-01 17:00 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 1 Aug 2018 17:14:42 +0200, Giulio Benetti wrote:
> >> Giulio Benetti (4):
> >> minicom: update package to use git repository.
> >> minicom: add pre-configure hook to call autogen.sh
> >> minicom: delete patches
> >> minicom: delete hash file.
> >
> > All these patches should be just one, otherwise your series is not
> > bisectable.
>
> Ah ok, I thought it was easier break all patches.
It's not about being "easy". It's about separating logical changes, one
per patch.
Here the problem of your patch series is that if I apply just PATCH
1/4, minicom no longer builds, because it doesn't do the autoreconf
tweak, the patches won't apply, and the hash file doesn't match. This
is why I said your series is "not bisectable": it doesn't build/work
between each patch of the series.
In your situation, the change to use this different download location
for Minicom is the change, and as part of the change, it is necessary
to remove patches, tweak for autoreconf and delete the hash file. This
is all one change.
> So basically the commit log will be the cover letter, right?
Yes.
> And btw, is commit log of cover letter acceptable?
There is no "commit log" in the cover letter. The commit logs are in the
patches themselves. The cover letter contains some introduction text,
and is only necessary for patch series with multiple patches, for which
additional explanations about what the whole series is doing.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 0/4] minicom: update to use latest git repository
2018-08-01 17:00 ` Thomas Petazzoni
@ 2018-08-01 20:57 ` Giulio Benetti
0 siblings, 0 replies; 13+ messages in thread
From: Giulio Benetti @ 2018-08-01 20:57 UTC (permalink / raw)
To: buildroot
Hello,
Il 01/08/2018 19:00, Thomas Petazzoni ha scritto:
> Hello,
>
> On Wed, 1 Aug 2018 17:14:42 +0200, Giulio Benetti wrote:
>
>>>> Giulio Benetti (4):
>>>> minicom: update package to use git repository.
>>>> minicom: add pre-configure hook to call autogen.sh
>>>> minicom: delete patches
>>>> minicom: delete hash file.
>>>
>>> All these patches should be just one, otherwise your series is not
>>> bisectable.
>>
>> Ah ok, I thought it was easier break all patches.
>
> It's not about being "easy". It's about separating logical changes, one
> per patch.
>
> Here the problem of your patch series is that if I apply just PATCH
> 1/4, minicom no longer builds, because it doesn't do the autoreconf
> tweak, the patches won't apply, and the hash file doesn't match. This
> is why I said your series is "not bisectable": it doesn't build/work
> between each patch of the series.
>
> In your situation, the change to use this different download location
> for Minicom is the change, and as part of the change, it is necessary
> to remove patches, tweak for autoreconf and delete the hash file. This
> is all one change.
All clear now, thanks.
>
>> So basically the commit log will be the cover letter, right?
>
> Yes.
>
>> And btw, is commit log of cover letter acceptable?
>
> There is no "commit log" in the cover letter. The commit logs are in the
> patches themselves. The cover letter contains some introduction text,
> and is only necessary for patch series with multiple patches, for which
> additional explanations about what the whole series is doing.
Yes, sorry i've used wrong words.
Thank you very much for explanation.
I follow with new patch.
Giulio
^ permalink raw reply [flat|nested] 13+ messages in thread