* [PATCH] serialcheck: switch to a fork and update to the latest
@ 2020-06-11 22:41 Denys Dmytriyenko
2020-06-11 23:14 ` [oe] " Khem Raj
0 siblings, 1 reply; 6+ messages in thread
From: Denys Dmytriyenko @ 2020-06-11 22:41 UTC (permalink / raw)
To: openembedded-devel; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@ti.com>
Original serialcheck at https://git.breakpoint.cc/cgit/bigeasy/serialcheck.git/
hasn't been updated since early 2015 and has been forked and continued at
https://github.com/nsekhar/serialcheck
Switch to the fork and update to the latest, while dropping merged and unneeded
patches.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
...01-Add-option-to-enable-internal-loopback.patch | 81 ----------------------
.../0001-Makefile-Change-order-of-link-flags.patch | 34 ---------
.../0002-Restore-original-loopback-config.patch | 49 -------------
.../serialcheck/serialcheck_1.0.0.bb | 25 +++----
4 files changed, 11 insertions(+), 178 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
delete mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
delete mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch b/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
deleted file mode 100644
index f69254a..0000000
--- a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 059d5512e840fe68e2bb37add6c9208fa9c34d15 Mon Sep 17 00:00:00 2001
-From: Sekhar Nori <nsekhar@ti.com>
-Date: Tue, 24 Feb 2015 22:16:37 +0530
-Subject: [PATCH 1/2] Add option to enable internal loopback
-
-Upstream-status: Pending
----
- serialcheck.c | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
-diff --git a/serialcheck.c b/serialcheck.c
-index 4f5b747..4100c37 100644
---- a/serialcheck.c
-+++ b/serialcheck.c
-@@ -12,6 +12,8 @@
- #include <sys/ioctl.h>
- #include <linux/serial.h>
-
-+#define TIOCM_LOOP 0x8000
-+
- #define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
- #define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
- #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
-@@ -40,6 +42,7 @@ struct g_opt {
- unsigned char hflow;
- unsigned char do_termios;
- unsigned char *cmp_buff;
-+ unsigned char loopback;
- };
-
- /* name, key, arg, flags, doc, group */
-@@ -51,6 +54,7 @@ static struct argp_option options[] = {
- {"mode", 'm', "M", 0, "transfer mode (d = duplex, t = send r = receive)", 0},
- {"loops", 'l', "NUM", 0, "loops to perform (0 => wait fot CTRL-C", 0},
- {"no-termios", 'n', NULL, 0, "No termios change (baud rate etc. remains unchanged)", 0},
-+ {"loopback", 'k', NULL, 0, "loopback mode", 0},
- {NULL, 0, NULL, 0, NULL, 0}
- };
-
-@@ -67,6 +71,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
- go->baudrate = 115200;
- go->loops = UINT_MAX;
- go->do_termios = 1;
-+ go->loopback = 0;
- break;
- case ARGP_KEY_ARG:
- ret = ARGP_ERR_UNKNOWN;
-@@ -113,6 +118,9 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
- } else
- go->loops = num;
- break;
-+ case 'k':
-+ go->loopback = 1;
-+ break;
- default:
- ret = ARGP_ERR_UNKNOWN;
- }
-@@ -487,6 +495,21 @@ int main(int argc, char *argv[])
- die("tcflush failed: %m\n");
- }
-
-+ if (opts.loopback) {
-+ unsigned int mcr;
-+
-+ ret = ioctl(fd, TIOCMGET, &mcr);
-+ if (ret < 0)
-+ die("mcr get failed: %m\n");
-+
-+ mcr |= TIOCM_LOOP;
-+
-+ ret = ioctl(fd, TIOCMSET, &mcr);
-+ if (ret < 0)
-+ die ("mcr set failed: %m\n");
-+
-+ }
-+
- ret = fcntl(fd, F_SETFL, 0);
- if (ret)
- printf("Failed to remove nonblock mode\n");
---
-1.9.1
diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch b/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
deleted file mode 100644
index 2ab4834..0000000
--- a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From efc8a4e717ba919c869c2da1c7de2d08bc976926 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 24 Feb 2016 18:48:07 +0000
-Subject: [PATCH] Makefile: Change order of link flags
-
-This helps in injectcting LDFLAGS from env to take effect
-as it appears last on cmdline now
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- Makefile | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ba2bfbb..6d13e68 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,3 +1,9 @@
--CFLAGS=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign
--CC=gcc
-+CFLAGS?=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign
-+CC?=gcc
- all: serialcheck
-+serialcheck : serialcheck.o
-+ $(CC) -o serialcheck serialcheck.o $(CFLAGS) $(LDFLAGS)
-+
-+%.o : %.c
-+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
-+
---
-1.9.1
-
diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch b/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
deleted file mode 100644
index 1b8c95b..0000000
--- a/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From a6e5813d2f8402bf3a311c8bcda02623bfb76882 Mon Sep 17 00:00:00 2001
-From: Carlos Hernandez <ceh@ti.com>
-Date: Tue, 24 Feb 2015 16:00:34 -0500
-Subject: [PATCH 2/2] Restore original loopback config
-
-If loopback option is enabled, disable it at the end of the test.
-
-Signed-off-by: Carlos Hernandez <ceh@ti.com>
-Upstream-status: Pending
----
- serialcheck.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/serialcheck.c b/serialcheck.c
-index 4100c37..06470f7 100644
---- a/serialcheck.c
-+++ b/serialcheck.c
-@@ -427,6 +427,7 @@ int main(int argc, char *argv[])
- unsigned char *data;
- unsigned int open_mode;
- off_t data_len;
-+ unsigned int mcr;
-
- argp_parse(&argp, argc, argv, 0, NULL, &opts);
- if (!opts.file_trans)
-@@ -496,8 +497,6 @@ int main(int argc, char *argv[])
- }
-
- if (opts.loopback) {
-- unsigned int mcr;
--
- ret = ioctl(fd, TIOCMGET, &mcr);
- if (ret < 0)
- die("mcr get failed: %m\n");
-@@ -535,6 +534,12 @@ int main(int argc, char *argv[])
- ret = tcsetattr(fd, TCSAFLUSH, &old_term);
- if (ret)
- printf("tcsetattr() of old ones failed: %m\n");
-+ if (opts.loopback) {
-+ mcr &= ~(TIOCM_LOOP);
-+ ret = ioctl(fd, TIOCMSET, &mcr);
-+ }
-+ if (ret)
-+ printf("disabling loopback failed: %m\n");
-
- close(fd);
- return status;
---
-1.9.1
diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
index cd5e0a4..0ec96ab 100644
--- a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
+++ b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
@@ -1,30 +1,27 @@
SUMMARY = "Application to verify operation of serial ports"
-HOMEPAGE = "http://git.breakpoint.cc/cgit/bigeasy/serialcheck.git/"
+HOMEPAGE = "https://github.com/nsekhar/serialcheck"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRC_URI = "git://git.breakpoint.cc/bigeasy/serialcheck.git \
- file://0001-Add-option-to-enable-internal-loopback.patch \
- file://0002-Restore-original-loopback-config.patch \
- file://0001-Makefile-Change-order-of-link-flags.patch \
- "
+SRC_URI = " \
+ git://github.com/nsekhar/serialcheck.git \
+"
-SRCREV = "63854a2d0c0129efab132ec328a75279e013fb84"
+SRCREV = "45eb2ffa5378396e85432872833890b0a1cba872"
S = "${WORKDIR}/git"
-DEPENDS_append_libc-musl = " argp-standalone"
-EXTRA_OEMAKE = "-e MAKEFLAGS="
+inherit autotools
-CFLAGS_prepend = "-Wall -Wextra -Wno-sign-compare -Wno-pointer-sign "
-LDFLAGS_append_libc-musl = " -largp"
+DEPENDS_append_libc-musl = " argp-standalone"
+EXTRA_OEMAKE_append_libc-musl = " LIBS='-largp'"
do_install() {
install -d ${D}${bindir}
- install ${S}/serialcheck ${D}${bindir}
+ install ${B}/serialcheck ${D}${bindir}
+ install ${B}/serialstats ${D}${bindir}
install -d ${D}${docdir}/${BP}
- install ${S}/Readme.txt ${D}${docdir}/${BP}
+ install ${S}/README ${D}${docdir}/${BP}
}
-CLEANBROKEN = "1"
BBCLASSEXTEND = "nativesdk"
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [oe] [PATCH] serialcheck: switch to a fork and update to the latest
2020-06-11 22:41 [PATCH] serialcheck: switch to a fork and update to the latest Denys Dmytriyenko
@ 2020-06-11 23:14 ` Khem Raj
2020-06-11 23:21 ` Denys Dmytriyenko
0 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2020-06-11 23:14 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: openembeded-devel, Denys Dmytriyenko
On Thu, Jun 11, 2020 at 3:41 PM Denys Dmytriyenko <denis@denix.org> wrote:
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> Original serialcheck at https://git.breakpoint.cc/cgit/bigeasy/serialcheck.git/
> hasn't been updated since early 2015 and has been forked and continued at
> https://github.com/nsekhar/serialcheck
>
> Switch to the fork and update to the latest, while dropping merged and unneeded
> patches.
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> ...01-Add-option-to-enable-internal-loopback.patch | 81 ----------------------
> .../0001-Makefile-Change-order-of-link-flags.patch | 34 ---------
> .../0002-Restore-original-loopback-config.patch | 49 -------------
> .../serialcheck/serialcheck_1.0.0.bb | 25 +++----
> 4 files changed, 11 insertions(+), 178 deletions(-)
> delete mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> delete mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> delete mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
>
> diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch b/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> deleted file mode 100644
> index f69254a..0000000
> --- a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> +++ /dev/null
> @@ -1,81 +0,0 @@
> -From 059d5512e840fe68e2bb37add6c9208fa9c34d15 Mon Sep 17 00:00:00 2001
> -From: Sekhar Nori <nsekhar@ti.com>
> -Date: Tue, 24 Feb 2015 22:16:37 +0530
> -Subject: [PATCH 1/2] Add option to enable internal loopback
> -
> -Upstream-status: Pending
> ----
> - serialcheck.c | 23 +++++++++++++++++++++++
> - 1 file changed, 23 insertions(+)
> -
> -diff --git a/serialcheck.c b/serialcheck.c
> -index 4f5b747..4100c37 100644
> ---- a/serialcheck.c
> -+++ b/serialcheck.c
> -@@ -12,6 +12,8 @@
> - #include <sys/ioctl.h>
> - #include <linux/serial.h>
> -
> -+#define TIOCM_LOOP 0x8000
> -+
> - #define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
> - #define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
> - #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
> -@@ -40,6 +42,7 @@ struct g_opt {
> - unsigned char hflow;
> - unsigned char do_termios;
> - unsigned char *cmp_buff;
> -+ unsigned char loopback;
> - };
> -
> - /* name, key, arg, flags, doc, group */
> -@@ -51,6 +54,7 @@ static struct argp_option options[] = {
> - {"mode", 'm', "M", 0, "transfer mode (d = duplex, t = send r = receive)", 0},
> - {"loops", 'l', "NUM", 0, "loops to perform (0 => wait fot CTRL-C", 0},
> - {"no-termios", 'n', NULL, 0, "No termios change (baud rate etc. remains unchanged)", 0},
> -+ {"loopback", 'k', NULL, 0, "loopback mode", 0},
> - {NULL, 0, NULL, 0, NULL, 0}
> - };
> -
> -@@ -67,6 +71,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
> - go->baudrate = 115200;
> - go->loops = UINT_MAX;
> - go->do_termios = 1;
> -+ go->loopback = 0;
> - break;
> - case ARGP_KEY_ARG:
> - ret = ARGP_ERR_UNKNOWN;
> -@@ -113,6 +118,9 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
> - } else
> - go->loops = num;
> - break;
> -+ case 'k':
> -+ go->loopback = 1;
> -+ break;
> - default:
> - ret = ARGP_ERR_UNKNOWN;
> - }
> -@@ -487,6 +495,21 @@ int main(int argc, char *argv[])
> - die("tcflush failed: %m\n");
> - }
> -
> -+ if (opts.loopback) {
> -+ unsigned int mcr;
> -+
> -+ ret = ioctl(fd, TIOCMGET, &mcr);
> -+ if (ret < 0)
> -+ die("mcr get failed: %m\n");
> -+
> -+ mcr |= TIOCM_LOOP;
> -+
> -+ ret = ioctl(fd, TIOCMSET, &mcr);
> -+ if (ret < 0)
> -+ die ("mcr set failed: %m\n");
> -+
> -+ }
> -+
> - ret = fcntl(fd, F_SETFL, 0);
> - if (ret)
> - printf("Failed to remove nonblock mode\n");
> ---
> -1.9.1
> diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch b/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> deleted file mode 100644
> index 2ab4834..0000000
> --- a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -From efc8a4e717ba919c869c2da1c7de2d08bc976926 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Wed, 24 Feb 2016 18:48:07 +0000
> -Subject: [PATCH] Makefile: Change order of link flags
> -
> -This helps in injectcting LDFLAGS from env to take effect
> -as it appears last on cmdline now
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> -Upstream-Status: Pending
> -
> - Makefile | 10 ++++++++--
> - 1 file changed, 8 insertions(+), 2 deletions(-)
> -
> -diff --git a/Makefile b/Makefile
> -index ba2bfbb..6d13e68 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -1,3 +1,9 @@
> --CFLAGS=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign
> --CC=gcc
> -+CFLAGS?=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign
> -+CC?=gcc
> - all: serialcheck
> -+serialcheck : serialcheck.o
> -+ $(CC) -o serialcheck serialcheck.o $(CFLAGS) $(LDFLAGS)
> -+
> -+%.o : %.c
> -+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
> -+
> ---
> -1.9.1
> -
> diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch b/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
> deleted file mode 100644
> index 1b8c95b..0000000
> --- a/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
> +++ /dev/null
> @@ -1,49 +0,0 @@
> -From a6e5813d2f8402bf3a311c8bcda02623bfb76882 Mon Sep 17 00:00:00 2001
> -From: Carlos Hernandez <ceh@ti.com>
> -Date: Tue, 24 Feb 2015 16:00:34 -0500
> -Subject: [PATCH 2/2] Restore original loopback config
> -
> -If loopback option is enabled, disable it at the end of the test.
> -
> -Signed-off-by: Carlos Hernandez <ceh@ti.com>
> -Upstream-status: Pending
> ----
> - serialcheck.c | 9 +++++++--
> - 1 file changed, 7 insertions(+), 2 deletions(-)
> -
> -diff --git a/serialcheck.c b/serialcheck.c
> -index 4100c37..06470f7 100644
> ---- a/serialcheck.c
> -+++ b/serialcheck.c
> -@@ -427,6 +427,7 @@ int main(int argc, char *argv[])
> - unsigned char *data;
> - unsigned int open_mode;
> - off_t data_len;
> -+ unsigned int mcr;
> -
> - argp_parse(&argp, argc, argv, 0, NULL, &opts);
> - if (!opts.file_trans)
> -@@ -496,8 +497,6 @@ int main(int argc, char *argv[])
> - }
> -
> - if (opts.loopback) {
> -- unsigned int mcr;
> --
> - ret = ioctl(fd, TIOCMGET, &mcr);
> - if (ret < 0)
> - die("mcr get failed: %m\n");
> -@@ -535,6 +534,12 @@ int main(int argc, char *argv[])
> - ret = tcsetattr(fd, TCSAFLUSH, &old_term);
> - if (ret)
> - printf("tcsetattr() of old ones failed: %m\n");
> -+ if (opts.loopback) {
> -+ mcr &= ~(TIOCM_LOOP);
> -+ ret = ioctl(fd, TIOCMSET, &mcr);
> -+ }
> -+ if (ret)
> -+ printf("disabling loopback failed: %m\n");
> -
> - close(fd);
> - return status;
> ---
> -1.9.1
> diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
> index cd5e0a4..0ec96ab 100644
> --- a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
> +++ b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
> @@ -1,30 +1,27 @@
> SUMMARY = "Application to verify operation of serial ports"
> -HOMEPAGE = "http://git.breakpoint.cc/cgit/bigeasy/serialcheck.git/"
> +HOMEPAGE = "https://github.com/nsekhar/serialcheck"
> LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>
> -SRC_URI = "git://git.breakpoint.cc/bigeasy/serialcheck.git \
> - file://0001-Add-option-to-enable-internal-loopback.patch \
> - file://0002-Restore-original-loopback-config.patch \
> - file://0001-Makefile-Change-order-of-link-flags.patch \
> - "
> +SRC_URI = " \
> + git://github.com/nsekhar/serialcheck.git \
> +"
>
> -SRCREV = "63854a2d0c0129efab132ec328a75279e013fb84"
> +SRCREV = "45eb2ffa5378396e85432872833890b0a1cba872"
>
> S = "${WORKDIR}/git"
>
> -DEPENDS_append_libc-musl = " argp-standalone"
> -EXTRA_OEMAKE = "-e MAKEFLAGS="
> +inherit autotools
>
> -CFLAGS_prepend = "-Wall -Wextra -Wno-sign-compare -Wno-pointer-sign "
> -LDFLAGS_append_libc-musl = " -largp"
> +DEPENDS_append_libc-musl = " argp-standalone"
> +EXTRA_OEMAKE_append_libc-musl = " LIBS='-largp'"
>
> do_install() {
> install -d ${D}${bindir}
> - install ${S}/serialcheck ${D}${bindir}
> + install ${B}/serialcheck ${D}${bindir}
> + install ${B}/serialstats ${D}${bindir}
should this be packaged into a package of its own ?
> install -d ${D}${docdir}/${BP}
> - install ${S}/Readme.txt ${D}${docdir}/${BP}
> + install ${S}/README ${D}${docdir}/${BP}
> }
> -CLEANBROKEN = "1"
>
> BBCLASSEXTEND = "nativesdk"
> --
> 2.7.4
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe] [PATCH] serialcheck: switch to a fork and update to the latest
2020-06-11 23:14 ` [oe] " Khem Raj
@ 2020-06-11 23:21 ` Denys Dmytriyenko
2020-06-11 23:26 ` Khem Raj
0 siblings, 1 reply; 6+ messages in thread
From: Denys Dmytriyenko @ 2020-06-11 23:21 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On Thu, Jun 11, 2020 at 04:14:19PM -0700, Khem Raj wrote:
> On Thu, Jun 11, 2020 at 3:41 PM Denys Dmytriyenko <denis@denix.org> wrote:
> >
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > Original serialcheck at https://git.breakpoint.cc/cgit/bigeasy/serialcheck.git/
> > hasn't been updated since early 2015 and has been forked and continued at
> > https://github.com/nsekhar/serialcheck
> >
> > Switch to the fork and update to the latest, while dropping merged and unneeded
> > patches.
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> > ...01-Add-option-to-enable-internal-loopback.patch | 81 ----------------------
> > .../0001-Makefile-Change-order-of-link-flags.patch | 34 ---------
> > .../0002-Restore-original-loopback-config.patch | 49 -------------
> > .../serialcheck/serialcheck_1.0.0.bb | 25 +++----
> > 4 files changed, 11 insertions(+), 178 deletions(-)
> > delete mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> > delete mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> > delete mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
> >
> > diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch b/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> > deleted file mode 100644
> > index f69254a..0000000
> > --- a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> > +++ /dev/null
> > @@ -1,81 +0,0 @@
> > -From 059d5512e840fe68e2bb37add6c9208fa9c34d15 Mon Sep 17 00:00:00 2001
> > -From: Sekhar Nori <nsekhar@ti.com>
> > -Date: Tue, 24 Feb 2015 22:16:37 +0530
> > -Subject: [PATCH 1/2] Add option to enable internal loopback
> > -
> > -Upstream-status: Pending
> > ----
> > - serialcheck.c | 23 +++++++++++++++++++++++
> > - 1 file changed, 23 insertions(+)
> > -
> > -diff --git a/serialcheck.c b/serialcheck.c
> > -index 4f5b747..4100c37 100644
> > ---- a/serialcheck.c
> > -+++ b/serialcheck.c
> > -@@ -12,6 +12,8 @@
> > - #include <sys/ioctl.h>
> > - #include <linux/serial.h>
> > -
> > -+#define TIOCM_LOOP 0x8000
> > -+
> > - #define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
> > - #define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
> > - #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
> > -@@ -40,6 +42,7 @@ struct g_opt {
> > - unsigned char hflow;
> > - unsigned char do_termios;
> > - unsigned char *cmp_buff;
> > -+ unsigned char loopback;
> > - };
> > -
> > - /* name, key, arg, flags, doc, group */
> > -@@ -51,6 +54,7 @@ static struct argp_option options[] = {
> > - {"mode", 'm', "M", 0, "transfer mode (d = duplex, t = send r = receive)", 0},
> > - {"loops", 'l', "NUM", 0, "loops to perform (0 => wait fot CTRL-C", 0},
> > - {"no-termios", 'n', NULL, 0, "No termios change (baud rate etc. remains unchanged)", 0},
> > -+ {"loopback", 'k', NULL, 0, "loopback mode", 0},
> > - {NULL, 0, NULL, 0, NULL, 0}
> > - };
> > -
> > -@@ -67,6 +71,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
> > - go->baudrate = 115200;
> > - go->loops = UINT_MAX;
> > - go->do_termios = 1;
> > -+ go->loopback = 0;
> > - break;
> > - case ARGP_KEY_ARG:
> > - ret = ARGP_ERR_UNKNOWN;
> > -@@ -113,6 +118,9 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
> > - } else
> > - go->loops = num;
> > - break;
> > -+ case 'k':
> > -+ go->loopback = 1;
> > -+ break;
> > - default:
> > - ret = ARGP_ERR_UNKNOWN;
> > - }
> > -@@ -487,6 +495,21 @@ int main(int argc, char *argv[])
> > - die("tcflush failed: %m\n");
> > - }
> > -
> > -+ if (opts.loopback) {
> > -+ unsigned int mcr;
> > -+
> > -+ ret = ioctl(fd, TIOCMGET, &mcr);
> > -+ if (ret < 0)
> > -+ die("mcr get failed: %m\n");
> > -+
> > -+ mcr |= TIOCM_LOOP;
> > -+
> > -+ ret = ioctl(fd, TIOCMSET, &mcr);
> > -+ if (ret < 0)
> > -+ die ("mcr set failed: %m\n");
> > -+
> > -+ }
> > -+
> > - ret = fcntl(fd, F_SETFL, 0);
> > - if (ret)
> > - printf("Failed to remove nonblock mode\n");
> > ---
> > -1.9.1
> > diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch b/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> > deleted file mode 100644
> > index 2ab4834..0000000
> > --- a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> > +++ /dev/null
> > @@ -1,34 +0,0 @@
> > -From efc8a4e717ba919c869c2da1c7de2d08bc976926 Mon Sep 17 00:00:00 2001
> > -From: Khem Raj <raj.khem@gmail.com>
> > -Date: Wed, 24 Feb 2016 18:48:07 +0000
> > -Subject: [PATCH] Makefile: Change order of link flags
> > -
> > -This helps in injectcting LDFLAGS from env to take effect
> > -as it appears last on cmdline now
> > -
> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ----
> > -Upstream-Status: Pending
> > -
> > - Makefile | 10 ++++++++--
> > - 1 file changed, 8 insertions(+), 2 deletions(-)
> > -
> > -diff --git a/Makefile b/Makefile
> > -index ba2bfbb..6d13e68 100644
> > ---- a/Makefile
> > -+++ b/Makefile
> > -@@ -1,3 +1,9 @@
> > --CFLAGS=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign
> > --CC=gcc
> > -+CFLAGS?=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign
> > -+CC?=gcc
> > - all: serialcheck
> > -+serialcheck : serialcheck.o
> > -+ $(CC) -o serialcheck serialcheck.o $(CFLAGS) $(LDFLAGS)
> > -+
> > -+%.o : %.c
> > -+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
> > -+
> > ---
> > -1.9.1
> > -
> > diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch b/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
> > deleted file mode 100644
> > index 1b8c95b..0000000
> > --- a/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
> > +++ /dev/null
> > @@ -1,49 +0,0 @@
> > -From a6e5813d2f8402bf3a311c8bcda02623bfb76882 Mon Sep 17 00:00:00 2001
> > -From: Carlos Hernandez <ceh@ti.com>
> > -Date: Tue, 24 Feb 2015 16:00:34 -0500
> > -Subject: [PATCH 2/2] Restore original loopback config
> > -
> > -If loopback option is enabled, disable it at the end of the test.
> > -
> > -Signed-off-by: Carlos Hernandez <ceh@ti.com>
> > -Upstream-status: Pending
> > ----
> > - serialcheck.c | 9 +++++++--
> > - 1 file changed, 7 insertions(+), 2 deletions(-)
> > -
> > -diff --git a/serialcheck.c b/serialcheck.c
> > -index 4100c37..06470f7 100644
> > ---- a/serialcheck.c
> > -+++ b/serialcheck.c
> > -@@ -427,6 +427,7 @@ int main(int argc, char *argv[])
> > - unsigned char *data;
> > - unsigned int open_mode;
> > - off_t data_len;
> > -+ unsigned int mcr;
> > -
> > - argp_parse(&argp, argc, argv, 0, NULL, &opts);
> > - if (!opts.file_trans)
> > -@@ -496,8 +497,6 @@ int main(int argc, char *argv[])
> > - }
> > -
> > - if (opts.loopback) {
> > -- unsigned int mcr;
> > --
> > - ret = ioctl(fd, TIOCMGET, &mcr);
> > - if (ret < 0)
> > - die("mcr get failed: %m\n");
> > -@@ -535,6 +534,12 @@ int main(int argc, char *argv[])
> > - ret = tcsetattr(fd, TCSAFLUSH, &old_term);
> > - if (ret)
> > - printf("tcsetattr() of old ones failed: %m\n");
> > -+ if (opts.loopback) {
> > -+ mcr &= ~(TIOCM_LOOP);
> > -+ ret = ioctl(fd, TIOCMSET, &mcr);
> > -+ }
> > -+ if (ret)
> > -+ printf("disabling loopback failed: %m\n");
> > -
> > - close(fd);
> > - return status;
> > ---
> > -1.9.1
> > diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
> > index cd5e0a4..0ec96ab 100644
> > --- a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
> > +++ b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
> > @@ -1,30 +1,27 @@
> > SUMMARY = "Application to verify operation of serial ports"
> > -HOMEPAGE = "http://git.breakpoint.cc/cgit/bigeasy/serialcheck.git/"
> > +HOMEPAGE = "https://github.com/nsekhar/serialcheck"
> > LICENSE = "GPLv2"
> > LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> >
> > -SRC_URI = "git://git.breakpoint.cc/bigeasy/serialcheck.git \
> > - file://0001-Add-option-to-enable-internal-loopback.patch \
> > - file://0002-Restore-original-loopback-config.patch \
> > - file://0001-Makefile-Change-order-of-link-flags.patch \
> > - "
> > +SRC_URI = " \
> > + git://github.com/nsekhar/serialcheck.git \
> > +"
> >
> > -SRCREV = "63854a2d0c0129efab132ec328a75279e013fb84"
> > +SRCREV = "45eb2ffa5378396e85432872833890b0a1cba872"
> >
> > S = "${WORKDIR}/git"
> >
> > -DEPENDS_append_libc-musl = " argp-standalone"
> > -EXTRA_OEMAKE = "-e MAKEFLAGS="
> > +inherit autotools
> >
> > -CFLAGS_prepend = "-Wall -Wextra -Wno-sign-compare -Wno-pointer-sign "
> > -LDFLAGS_append_libc-musl = " -largp"
> > +DEPENDS_append_libc-musl = " argp-standalone"
> > +EXTRA_OEMAKE_append_libc-musl = " LIBS='-largp'"
> >
> > do_install() {
> > install -d ${D}${bindir}
> > - install ${S}/serialcheck ${D}${bindir}
> > + install ${B}/serialcheck ${D}${bindir}
> > + install ${B}/serialstats ${D}${bindir}
>
> should this be packaged into a package of its own ?
I don't see why - do you have any specific reason in mind?
> > install -d ${D}${docdir}/${BP}
> > - install ${S}/Readme.txt ${D}${docdir}/${BP}
> > + install ${S}/README ${D}${docdir}/${BP}
> > }
> > -CLEANBROKEN = "1"
> >
> > BBCLASSEXTEND = "nativesdk"
> > --
> > 2.7.4
> >
> >
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe] [PATCH] serialcheck: switch to a fork and update to the latest
2020-06-11 23:21 ` Denys Dmytriyenko
@ 2020-06-11 23:26 ` Khem Raj
2020-06-12 1:30 ` Denys Dmytriyenko
0 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2020-06-11 23:26 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: openembeded-devel
On Thu, Jun 11, 2020 at 4:21 PM Denys Dmytriyenko <denis@denix.org> wrote:
>
> On Thu, Jun 11, 2020 at 04:14:19PM -0700, Khem Raj wrote:
> > On Thu, Jun 11, 2020 at 3:41 PM Denys Dmytriyenko <denis@denix.org> wrote:
> > >
> > > From: Denys Dmytriyenko <denys@ti.com>
> > >
> > > Original serialcheck at https://git.breakpoint.cc/cgit/bigeasy/serialcheck.git/
> > > hasn't been updated since early 2015 and has been forked and continued at
> > > https://github.com/nsekhar/serialcheck
> > >
> > > Switch to the fork and update to the latest, while dropping merged and unneeded
> > > patches.
> > >
> > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > > ---
> > > ...01-Add-option-to-enable-internal-loopback.patch | 81 ----------------------
> > > .../0001-Makefile-Change-order-of-link-flags.patch | 34 ---------
> > > .../0002-Restore-original-loopback-config.patch | 49 -------------
> > > .../serialcheck/serialcheck_1.0.0.bb | 25 +++----
> > > 4 files changed, 11 insertions(+), 178 deletions(-)
> > > delete mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> > > delete mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> > > delete mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
> > >
> > > diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch b/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> > > deleted file mode 100644
> > > index f69254a..0000000
> > > --- a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> > > +++ /dev/null
> > > @@ -1,81 +0,0 @@
> > > -From 059d5512e840fe68e2bb37add6c9208fa9c34d15 Mon Sep 17 00:00:00 2001
> > > -From: Sekhar Nori <nsekhar@ti.com>
> > > -Date: Tue, 24 Feb 2015 22:16:37 +0530
> > > -Subject: [PATCH 1/2] Add option to enable internal loopback
> > > -
> > > -Upstream-status: Pending
> > > ----
> > > - serialcheck.c | 23 +++++++++++++++++++++++
> > > - 1 file changed, 23 insertions(+)
> > > -
> > > -diff --git a/serialcheck.c b/serialcheck.c
> > > -index 4f5b747..4100c37 100644
> > > ---- a/serialcheck.c
> > > -+++ b/serialcheck.c
> > > -@@ -12,6 +12,8 @@
> > > - #include <sys/ioctl.h>
> > > - #include <linux/serial.h>
> > > -
> > > -+#define TIOCM_LOOP 0x8000
> > > -+
> > > - #define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
> > > - #define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
> > > - #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
> > > -@@ -40,6 +42,7 @@ struct g_opt {
> > > - unsigned char hflow;
> > > - unsigned char do_termios;
> > > - unsigned char *cmp_buff;
> > > -+ unsigned char loopback;
> > > - };
> > > -
> > > - /* name, key, arg, flags, doc, group */
> > > -@@ -51,6 +54,7 @@ static struct argp_option options[] = {
> > > - {"mode", 'm', "M", 0, "transfer mode (d = duplex, t = send r = receive)", 0},
> > > - {"loops", 'l', "NUM", 0, "loops to perform (0 => wait fot CTRL-C", 0},
> > > - {"no-termios", 'n', NULL, 0, "No termios change (baud rate etc. remains unchanged)", 0},
> > > -+ {"loopback", 'k', NULL, 0, "loopback mode", 0},
> > > - {NULL, 0, NULL, 0, NULL, 0}
> > > - };
> > > -
> > > -@@ -67,6 +71,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
> > > - go->baudrate = 115200;
> > > - go->loops = UINT_MAX;
> > > - go->do_termios = 1;
> > > -+ go->loopback = 0;
> > > - break;
> > > - case ARGP_KEY_ARG:
> > > - ret = ARGP_ERR_UNKNOWN;
> > > -@@ -113,6 +118,9 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
> > > - } else
> > > - go->loops = num;
> > > - break;
> > > -+ case 'k':
> > > -+ go->loopback = 1;
> > > -+ break;
> > > - default:
> > > - ret = ARGP_ERR_UNKNOWN;
> > > - }
> > > -@@ -487,6 +495,21 @@ int main(int argc, char *argv[])
> > > - die("tcflush failed: %m\n");
> > > - }
> > > -
> > > -+ if (opts.loopback) {
> > > -+ unsigned int mcr;
> > > -+
> > > -+ ret = ioctl(fd, TIOCMGET, &mcr);
> > > -+ if (ret < 0)
> > > -+ die("mcr get failed: %m\n");
> > > -+
> > > -+ mcr |= TIOCM_LOOP;
> > > -+
> > > -+ ret = ioctl(fd, TIOCMSET, &mcr);
> > > -+ if (ret < 0)
> > > -+ die ("mcr set failed: %m\n");
> > > -+
> > > -+ }
> > > -+
> > > - ret = fcntl(fd, F_SETFL, 0);
> > > - if (ret)
> > > - printf("Failed to remove nonblock mode\n");
> > > ---
> > > -1.9.1
> > > diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch b/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> > > deleted file mode 100644
> > > index 2ab4834..0000000
> > > --- a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> > > +++ /dev/null
> > > @@ -1,34 +0,0 @@
> > > -From efc8a4e717ba919c869c2da1c7de2d08bc976926 Mon Sep 17 00:00:00 2001
> > > -From: Khem Raj <raj.khem@gmail.com>
> > > -Date: Wed, 24 Feb 2016 18:48:07 +0000
> > > -Subject: [PATCH] Makefile: Change order of link flags
> > > -
> > > -This helps in injectcting LDFLAGS from env to take effect
> > > -as it appears last on cmdline now
> > > -
> > > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > ----
> > > -Upstream-Status: Pending
> > > -
> > > - Makefile | 10 ++++++++--
> > > - 1 file changed, 8 insertions(+), 2 deletions(-)
> > > -
> > > -diff --git a/Makefile b/Makefile
> > > -index ba2bfbb..6d13e68 100644
> > > ---- a/Makefile
> > > -+++ b/Makefile
> > > -@@ -1,3 +1,9 @@
> > > --CFLAGS=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign
> > > --CC=gcc
> > > -+CFLAGS?=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign
> > > -+CC?=gcc
> > > - all: serialcheck
> > > -+serialcheck : serialcheck.o
> > > -+ $(CC) -o serialcheck serialcheck.o $(CFLAGS) $(LDFLAGS)
> > > -+
> > > -+%.o : %.c
> > > -+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
> > > -+
> > > ---
> > > -1.9.1
> > > -
> > > diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch b/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
> > > deleted file mode 100644
> > > index 1b8c95b..0000000
> > > --- a/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
> > > +++ /dev/null
> > > @@ -1,49 +0,0 @@
> > > -From a6e5813d2f8402bf3a311c8bcda02623bfb76882 Mon Sep 17 00:00:00 2001
> > > -From: Carlos Hernandez <ceh@ti.com>
> > > -Date: Tue, 24 Feb 2015 16:00:34 -0500
> > > -Subject: [PATCH 2/2] Restore original loopback config
> > > -
> > > -If loopback option is enabled, disable it at the end of the test.
> > > -
> > > -Signed-off-by: Carlos Hernandez <ceh@ti.com>
> > > -Upstream-status: Pending
> > > ----
> > > - serialcheck.c | 9 +++++++--
> > > - 1 file changed, 7 insertions(+), 2 deletions(-)
> > > -
> > > -diff --git a/serialcheck.c b/serialcheck.c
> > > -index 4100c37..06470f7 100644
> > > ---- a/serialcheck.c
> > > -+++ b/serialcheck.c
> > > -@@ -427,6 +427,7 @@ int main(int argc, char *argv[])
> > > - unsigned char *data;
> > > - unsigned int open_mode;
> > > - off_t data_len;
> > > -+ unsigned int mcr;
> > > -
> > > - argp_parse(&argp, argc, argv, 0, NULL, &opts);
> > > - if (!opts.file_trans)
> > > -@@ -496,8 +497,6 @@ int main(int argc, char *argv[])
> > > - }
> > > -
> > > - if (opts.loopback) {
> > > -- unsigned int mcr;
> > > --
> > > - ret = ioctl(fd, TIOCMGET, &mcr);
> > > - if (ret < 0)
> > > - die("mcr get failed: %m\n");
> > > -@@ -535,6 +534,12 @@ int main(int argc, char *argv[])
> > > - ret = tcsetattr(fd, TCSAFLUSH, &old_term);
> > > - if (ret)
> > > - printf("tcsetattr() of old ones failed: %m\n");
> > > -+ if (opts.loopback) {
> > > -+ mcr &= ~(TIOCM_LOOP);
> > > -+ ret = ioctl(fd, TIOCMSET, &mcr);
> > > -+ }
> > > -+ if (ret)
> > > -+ printf("disabling loopback failed: %m\n");
> > > -
> > > - close(fd);
> > > - return status;
> > > ---
> > > -1.9.1
> > > diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
> > > index cd5e0a4..0ec96ab 100644
> > > --- a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
> > > +++ b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
> > > @@ -1,30 +1,27 @@
> > > SUMMARY = "Application to verify operation of serial ports"
> > > -HOMEPAGE = "http://git.breakpoint.cc/cgit/bigeasy/serialcheck.git/"
> > > +HOMEPAGE = "https://github.com/nsekhar/serialcheck"
> > > LICENSE = "GPLv2"
> > > LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> > >
> > > -SRC_URI = "git://git.breakpoint.cc/bigeasy/serialcheck.git \
> > > - file://0001-Add-option-to-enable-internal-loopback.patch \
> > > - file://0002-Restore-original-loopback-config.patch \
> > > - file://0001-Makefile-Change-order-of-link-flags.patch \
> > > - "
> > > +SRC_URI = " \
> > > + git://github.com/nsekhar/serialcheck.git \
> > > +"
> > >
> > > -SRCREV = "63854a2d0c0129efab132ec328a75279e013fb84"
> > > +SRCREV = "45eb2ffa5378396e85432872833890b0a1cba872"
> > >
> > > S = "${WORKDIR}/git"
> > >
> > > -DEPENDS_append_libc-musl = " argp-standalone"
> > > -EXTRA_OEMAKE = "-e MAKEFLAGS="
> > > +inherit autotools
> > >
> > > -CFLAGS_prepend = "-Wall -Wextra -Wno-sign-compare -Wno-pointer-sign "
> > > -LDFLAGS_append_libc-musl = " -largp"
> > > +DEPENDS_append_libc-musl = " argp-standalone"
> > > +EXTRA_OEMAKE_append_libc-musl = " LIBS='-largp'"
> > >
> > > do_install() {
> > > install -d ${D}${bindir}
> > > - install ${S}/serialcheck ${D}${bindir}
> > > + install ${B}/serialcheck ${D}${bindir}
> > > + install ${B}/serialstats ${D}${bindir}
> >
> > should this be packaged into a package of its own ?
>
> I don't see why - do you have any specific reason in mind?
for size reasons, we have seen that size with upgrades grow and if we
can keep a check
on while it happens will help end users. So this sounded like an
additional binary which perhaps
could live on its own.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe] [PATCH] serialcheck: switch to a fork and update to the latest
2020-06-11 23:26 ` Khem Raj
@ 2020-06-12 1:30 ` Denys Dmytriyenko
2020-06-12 4:38 ` Khem Raj
0 siblings, 1 reply; 6+ messages in thread
From: Denys Dmytriyenko @ 2020-06-12 1:30 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On Thu, Jun 11, 2020 at 04:26:51PM -0700, Khem Raj wrote:
> On Thu, Jun 11, 2020 at 4:21 PM Denys Dmytriyenko <denis@denix.org> wrote:
> >
> > On Thu, Jun 11, 2020 at 04:14:19PM -0700, Khem Raj wrote:
> > > On Thu, Jun 11, 2020 at 3:41 PM Denys Dmytriyenko <denis@denix.org> wrote:
> > > >
> > > > From: Denys Dmytriyenko <denys@ti.com>
> > > >
> > > > Original serialcheck at https://git.breakpoint.cc/cgit/bigeasy/serialcheck.git/
> > > > hasn't been updated since early 2015 and has been forked and continued at
> > > > https://github.com/nsekhar/serialcheck
> > > >
> > > > Switch to the fork and update to the latest, while dropping merged and unneeded
> > > > patches.
> > > >
> > > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > > > ---
> > > > ...01-Add-option-to-enable-internal-loopback.patch | 81 ----------------------
> > > > .../0001-Makefile-Change-order-of-link-flags.patch | 34 ---------
> > > > .../0002-Restore-original-loopback-config.patch | 49 -------------
> > > > .../serialcheck/serialcheck_1.0.0.bb | 25 +++----
> > > > 4 files changed, 11 insertions(+), 178 deletions(-)
> > > > delete mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> > > > delete mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> > > > delete mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
> > > >
> > > > diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch b/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> > > > deleted file mode 100644
> > > > index f69254a..0000000
> > > > --- a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> > > > +++ /dev/null
> > > > @@ -1,81 +0,0 @@
> > > > -From 059d5512e840fe68e2bb37add6c9208fa9c34d15 Mon Sep 17 00:00:00 2001
> > > > -From: Sekhar Nori <nsekhar@ti.com>
> > > > -Date: Tue, 24 Feb 2015 22:16:37 +0530
> > > > -Subject: [PATCH 1/2] Add option to enable internal loopback
> > > > -
> > > > -Upstream-status: Pending
> > > > ----
> > > > - serialcheck.c | 23 +++++++++++++++++++++++
> > > > - 1 file changed, 23 insertions(+)
> > > > -
> > > > -diff --git a/serialcheck.c b/serialcheck.c
> > > > -index 4f5b747..4100c37 100644
> > > > ---- a/serialcheck.c
> > > > -+++ b/serialcheck.c
> > > > -@@ -12,6 +12,8 @@
> > > > - #include <sys/ioctl.h>
> > > > - #include <linux/serial.h>
> > > > -
> > > > -+#define TIOCM_LOOP 0x8000
> > > > -+
> > > > - #define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
> > > > - #define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
> > > > - #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
> > > > -@@ -40,6 +42,7 @@ struct g_opt {
> > > > - unsigned char hflow;
> > > > - unsigned char do_termios;
> > > > - unsigned char *cmp_buff;
> > > > -+ unsigned char loopback;
> > > > - };
> > > > -
> > > > - /* name, key, arg, flags, doc, group */
> > > > -@@ -51,6 +54,7 @@ static struct argp_option options[] = {
> > > > - {"mode", 'm', "M", 0, "transfer mode (d = duplex, t = send r = receive)", 0},
> > > > - {"loops", 'l', "NUM", 0, "loops to perform (0 => wait fot CTRL-C", 0},
> > > > - {"no-termios", 'n', NULL, 0, "No termios change (baud rate etc. remains unchanged)", 0},
> > > > -+ {"loopback", 'k', NULL, 0, "loopback mode", 0},
> > > > - {NULL, 0, NULL, 0, NULL, 0}
> > > > - };
> > > > -
> > > > -@@ -67,6 +71,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
> > > > - go->baudrate = 115200;
> > > > - go->loops = UINT_MAX;
> > > > - go->do_termios = 1;
> > > > -+ go->loopback = 0;
> > > > - break;
> > > > - case ARGP_KEY_ARG:
> > > > - ret = ARGP_ERR_UNKNOWN;
> > > > -@@ -113,6 +118,9 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
> > > > - } else
> > > > - go->loops = num;
> > > > - break;
> > > > -+ case 'k':
> > > > -+ go->loopback = 1;
> > > > -+ break;
> > > > - default:
> > > > - ret = ARGP_ERR_UNKNOWN;
> > > > - }
> > > > -@@ -487,6 +495,21 @@ int main(int argc, char *argv[])
> > > > - die("tcflush failed: %m\n");
> > > > - }
> > > > -
> > > > -+ if (opts.loopback) {
> > > > -+ unsigned int mcr;
> > > > -+
> > > > -+ ret = ioctl(fd, TIOCMGET, &mcr);
> > > > -+ if (ret < 0)
> > > > -+ die("mcr get failed: %m\n");
> > > > -+
> > > > -+ mcr |= TIOCM_LOOP;
> > > > -+
> > > > -+ ret = ioctl(fd, TIOCMSET, &mcr);
> > > > -+ if (ret < 0)
> > > > -+ die ("mcr set failed: %m\n");
> > > > -+
> > > > -+ }
> > > > -+
> > > > - ret = fcntl(fd, F_SETFL, 0);
> > > > - if (ret)
> > > > - printf("Failed to remove nonblock mode\n");
> > > > ---
> > > > -1.9.1
> > > > diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch b/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> > > > deleted file mode 100644
> > > > index 2ab4834..0000000
> > > > --- a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> > > > +++ /dev/null
> > > > @@ -1,34 +0,0 @@
> > > > -From efc8a4e717ba919c869c2da1c7de2d08bc976926 Mon Sep 17 00:00:00 2001
> > > > -From: Khem Raj <raj.khem@gmail.com>
> > > > -Date: Wed, 24 Feb 2016 18:48:07 +0000
> > > > -Subject: [PATCH] Makefile: Change order of link flags
> > > > -
> > > > -This helps in injectcting LDFLAGS from env to take effect
> > > > -as it appears last on cmdline now
> > > > -
> > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > > ----
> > > > -Upstream-Status: Pending
> > > > -
> > > > - Makefile | 10 ++++++++--
> > > > - 1 file changed, 8 insertions(+), 2 deletions(-)
> > > > -
> > > > -diff --git a/Makefile b/Makefile
> > > > -index ba2bfbb..6d13e68 100644
> > > > ---- a/Makefile
> > > > -+++ b/Makefile
> > > > -@@ -1,3 +1,9 @@
> > > > --CFLAGS=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign
> > > > --CC=gcc
> > > > -+CFLAGS?=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign
> > > > -+CC?=gcc
> > > > - all: serialcheck
> > > > -+serialcheck : serialcheck.o
> > > > -+ $(CC) -o serialcheck serialcheck.o $(CFLAGS) $(LDFLAGS)
> > > > -+
> > > > -+%.o : %.c
> > > > -+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
> > > > -+
> > > > ---
> > > > -1.9.1
> > > > -
> > > > diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch b/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
> > > > deleted file mode 100644
> > > > index 1b8c95b..0000000
> > > > --- a/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
> > > > +++ /dev/null
> > > > @@ -1,49 +0,0 @@
> > > > -From a6e5813d2f8402bf3a311c8bcda02623bfb76882 Mon Sep 17 00:00:00 2001
> > > > -From: Carlos Hernandez <ceh@ti.com>
> > > > -Date: Tue, 24 Feb 2015 16:00:34 -0500
> > > > -Subject: [PATCH 2/2] Restore original loopback config
> > > > -
> > > > -If loopback option is enabled, disable it at the end of the test.
> > > > -
> > > > -Signed-off-by: Carlos Hernandez <ceh@ti.com>
> > > > -Upstream-status: Pending
> > > > ----
> > > > - serialcheck.c | 9 +++++++--
> > > > - 1 file changed, 7 insertions(+), 2 deletions(-)
> > > > -
> > > > -diff --git a/serialcheck.c b/serialcheck.c
> > > > -index 4100c37..06470f7 100644
> > > > ---- a/serialcheck.c
> > > > -+++ b/serialcheck.c
> > > > -@@ -427,6 +427,7 @@ int main(int argc, char *argv[])
> > > > - unsigned char *data;
> > > > - unsigned int open_mode;
> > > > - off_t data_len;
> > > > -+ unsigned int mcr;
> > > > -
> > > > - argp_parse(&argp, argc, argv, 0, NULL, &opts);
> > > > - if (!opts.file_trans)
> > > > -@@ -496,8 +497,6 @@ int main(int argc, char *argv[])
> > > > - }
> > > > -
> > > > - if (opts.loopback) {
> > > > -- unsigned int mcr;
> > > > --
> > > > - ret = ioctl(fd, TIOCMGET, &mcr);
> > > > - if (ret < 0)
> > > > - die("mcr get failed: %m\n");
> > > > -@@ -535,6 +534,12 @@ int main(int argc, char *argv[])
> > > > - ret = tcsetattr(fd, TCSAFLUSH, &old_term);
> > > > - if (ret)
> > > > - printf("tcsetattr() of old ones failed: %m\n");
> > > > -+ if (opts.loopback) {
> > > > -+ mcr &= ~(TIOCM_LOOP);
> > > > -+ ret = ioctl(fd, TIOCMSET, &mcr);
> > > > -+ }
> > > > -+ if (ret)
> > > > -+ printf("disabling loopback failed: %m\n");
> > > > -
> > > > - close(fd);
> > > > - return status;
> > > > ---
> > > > -1.9.1
> > > > diff --git a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
> > > > index cd5e0a4..0ec96ab 100644
> > > > --- a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
> > > > +++ b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
> > > > @@ -1,30 +1,27 @@
> > > > SUMMARY = "Application to verify operation of serial ports"
> > > > -HOMEPAGE = "http://git.breakpoint.cc/cgit/bigeasy/serialcheck.git/"
> > > > +HOMEPAGE = "https://github.com/nsekhar/serialcheck"
> > > > LICENSE = "GPLv2"
> > > > LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> > > >
> > > > -SRC_URI = "git://git.breakpoint.cc/bigeasy/serialcheck.git \
> > > > - file://0001-Add-option-to-enable-internal-loopback.patch \
> > > > - file://0002-Restore-original-loopback-config.patch \
> > > > - file://0001-Makefile-Change-order-of-link-flags.patch \
> > > > - "
> > > > +SRC_URI = " \
> > > > + git://github.com/nsekhar/serialcheck.git \
> > > > +"
> > > >
> > > > -SRCREV = "63854a2d0c0129efab132ec328a75279e013fb84"
> > > > +SRCREV = "45eb2ffa5378396e85432872833890b0a1cba872"
> > > >
> > > > S = "${WORKDIR}/git"
> > > >
> > > > -DEPENDS_append_libc-musl = " argp-standalone"
> > > > -EXTRA_OEMAKE = "-e MAKEFLAGS="
> > > > +inherit autotools
> > > >
> > > > -CFLAGS_prepend = "-Wall -Wextra -Wno-sign-compare -Wno-pointer-sign "
> > > > -LDFLAGS_append_libc-musl = " -largp"
> > > > +DEPENDS_append_libc-musl = " argp-standalone"
> > > > +EXTRA_OEMAKE_append_libc-musl = " LIBS='-largp'"
> > > >
> > > > do_install() {
> > > > install -d ${D}${bindir}
> > > > - install ${S}/serialcheck ${D}${bindir}
> > > > + install ${B}/serialcheck ${D}${bindir}
> > > > + install ${B}/serialstats ${D}${bindir}
> > >
> > > should this be packaged into a package of its own ?
> >
> > I don't see why - do you have any specific reason in mind?
>
> for size reasons, we have seen that size with upgrades grow and if we
> can keep a check
> on while it happens will help end users. So this sounded like an
> additional binary which perhaps
> could live on its own.
ARMv7 builds:
glibc sizes - serialcheck is 10 KB, serialstats is 5 KB
musl sizes - serialcheck is 26 KB, serialstats is 22 KB
musl is larger because of static argp library
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe] [PATCH] serialcheck: switch to a fork and update to the latest
2020-06-12 1:30 ` Denys Dmytriyenko
@ 2020-06-12 4:38 ` Khem Raj
0 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2020-06-12 4:38 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: openembeded-devel
[-- Attachment #1: Type: text/plain, Size: 12660 bytes --]
On Thu, Jun 11, 2020 at 6:30 PM Denys Dmytriyenko <denis@denix.org> wrote:
> On Thu, Jun 11, 2020 at 04:26:51PM -0700, Khem Raj wrote:
> > On Thu, Jun 11, 2020 at 4:21 PM Denys Dmytriyenko <denis@denix.org>
> wrote:
> > >
> > > On Thu, Jun 11, 2020 at 04:14:19PM -0700, Khem Raj wrote:
> > > > On Thu, Jun 11, 2020 at 3:41 PM Denys Dmytriyenko <denis@denix.org>
> wrote:
> > > > >
> > > > > From: Denys Dmytriyenko <denys@ti.com>
> > > > >
> > > > > Original serialcheck at
> https://git.breakpoint.cc/cgit/bigeasy/serialcheck.git/
> > > > > hasn't been updated since early 2015 and has been forked and
> continued at
> > > > > https://github.com/nsekhar/serialcheck
> > > > >
> > > > > Switch to the fork and update to the latest, while dropping merged
> and unneeded
> > > > > patches.
> > > > >
> > > > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > > > > ---
> > > > > ...01-Add-option-to-enable-internal-loopback.patch | 81
> ----------------------
> > > > > .../0001-Makefile-Change-order-of-link-flags.patch | 34 ---------
> > > > > .../0002-Restore-original-loopback-config.patch | 49
> -------------
> > > > > .../serialcheck/serialcheck_1.0.0.bb | 25 +++----
> > > > > 4 files changed, 11 insertions(+), 178 deletions(-)
> > > > > delete mode 100644
> meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> > > > > delete mode 100644
> meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> > > > > delete mode 100644
> meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
> > > > >
> > > > > diff --git
> a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> b/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> > > > > deleted file mode 100644
> > > > > index f69254a..0000000
> > > > > ---
> a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
> > > > > +++ /dev/null
> > > > > @@ -1,81 +0,0 @@
> > > > > -From 059d5512e840fe68e2bb37add6c9208fa9c34d15 Mon Sep 17 00:00:00
> 2001
> > > > > -From: Sekhar Nori <nsekhar@ti.com>
> > > > > -Date: Tue, 24 Feb 2015 22:16:37 +0530
> > > > > -Subject: [PATCH 1/2] Add option to enable internal loopback
> > > > > -
> > > > > -Upstream-status: Pending
> > > > > ----
> > > > > - serialcheck.c | 23 +++++++++++++++++++++++
> > > > > - 1 file changed, 23 insertions(+)
> > > > > -
> > > > > -diff --git a/serialcheck.c b/serialcheck.c
> > > > > -index 4f5b747..4100c37 100644
> > > > > ---- a/serialcheck.c
> > > > > -+++ b/serialcheck.c
> > > > > -@@ -12,6 +12,8 @@
> > > > > - #include <sys/ioctl.h>
> > > > > - #include <linux/serial.h>
> > > > > -
> > > > > -+#define TIOCM_LOOP 0x8000
> > > > > -+
> > > > > - #define __same_type(a, b)
> __builtin_types_compatible_p(typeof(a), typeof(b))
> > > > > - #define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
> > > > > - #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a),
> &(a)[0]))
> > > > > -@@ -40,6 +42,7 @@ struct g_opt {
> > > > > - unsigned char hflow;
> > > > > - unsigned char do_termios;
> > > > > - unsigned char *cmp_buff;
> > > > > -+ unsigned char loopback;
> > > > > - };
> > > > > -
> > > > > - /* name, key, arg, flags, doc, group */
> > > > > -@@ -51,6 +54,7 @@ static struct argp_option options[] = {
> > > > > - {"mode", 'm', "M", 0, "transfer mode (d =
> duplex, t = send r = receive)", 0},
> > > > > - {"loops", 'l', "NUM", 0, "loops to perform (0 =>
> wait fot CTRL-C", 0},
> > > > > - {"no-termios", 'n', NULL, 0, "No termios change (baud
> rate etc. remains unchanged)", 0},
> > > > > -+ {"loopback", 'k', NULL, 0, "loopback mode", 0},
> > > > > - {NULL, 0, NULL, 0, NULL, 0}
> > > > > - };
> > > > > -
> > > > > -@@ -67,6 +71,7 @@ static error_t parse_opt(int key, char *arg,
> struct argp_state *state)
> > > > > - go->baudrate = 115200;
> > > > > - go->loops = UINT_MAX;
> > > > > - go->do_termios = 1;
> > > > > -+ go->loopback = 0;
> > > > > - break;
> > > > > - case ARGP_KEY_ARG:
> > > > > - ret = ARGP_ERR_UNKNOWN;
> > > > > -@@ -113,6 +118,9 @@ static error_t parse_opt(int key, char *arg,
> struct argp_state *state)
> > > > > - } else
> > > > > - go->loops = num;
> > > > > - break;
> > > > > -+ case 'k':
> > > > > -+ go->loopback = 1;
> > > > > -+ break;
> > > > > - default:
> > > > > - ret = ARGP_ERR_UNKNOWN;
> > > > > - }
> > > > > -@@ -487,6 +495,21 @@ int main(int argc, char *argv[])
> > > > > - die("tcflush failed: %m\n");
> > > > > - }
> > > > > -
> > > > > -+ if (opts.loopback) {
> > > > > -+ unsigned int mcr;
> > > > > -+
> > > > > -+ ret = ioctl(fd, TIOCMGET, &mcr);
> > > > > -+ if (ret < 0)
> > > > > -+ die("mcr get failed: %m\n");
> > > > > -+
> > > > > -+ mcr |= TIOCM_LOOP;
> > > > > -+
> > > > > -+ ret = ioctl(fd, TIOCMSET, &mcr);
> > > > > -+ if (ret < 0)
> > > > > -+ die ("mcr set failed: %m\n");
> > > > > -+
> > > > > -+ }
> > > > > -+
> > > > > - ret = fcntl(fd, F_SETFL, 0);
> > > > > - if (ret)
> > > > > - printf("Failed to remove nonblock mode\n");
> > > > > ---
> > > > > -1.9.1
> > > > > diff --git
> a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> b/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> > > > > deleted file mode 100644
> > > > > index 2ab4834..0000000
> > > > > ---
> a/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
> > > > > +++ /dev/null
> > > > > @@ -1,34 +0,0 @@
> > > > > -From efc8a4e717ba919c869c2da1c7de2d08bc976926 Mon Sep 17 00:00:00
> 2001
> > > > > -From: Khem Raj <raj.khem@gmail.com>
> > > > > -Date: Wed, 24 Feb 2016 18:48:07 +0000
> > > > > -Subject: [PATCH] Makefile: Change order of link flags
> > > > > -
> > > > > -This helps in injectcting LDFLAGS from env to take effect
> > > > > -as it appears last on cmdline now
> > > > > -
> > > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > > > ----
> > > > > -Upstream-Status: Pending
> > > > > -
> > > > > - Makefile | 10 ++++++++--
> > > > > - 1 file changed, 8 insertions(+), 2 deletions(-)
> > > > > -
> > > > > -diff --git a/Makefile b/Makefile
> > > > > -index ba2bfbb..6d13e68 100644
> > > > > ---- a/Makefile
> > > > > -+++ b/Makefile
> > > > > -@@ -1,3 +1,9 @@
> > > > > --CFLAGS=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign
> > > > > --CC=gcc
> > > > > -+CFLAGS?=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign
> > > > > -+CC?=gcc
> > > > > - all: serialcheck
> > > > > -+serialcheck : serialcheck.o
> > > > > -+ $(CC) -o serialcheck serialcheck.o $(CFLAGS) $(LDFLAGS)
> > > > > -+
> > > > > -+%.o : %.c
> > > > > -+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
> > > > > -+
> > > > > ---
> > > > > -1.9.1
> > > > > -
> > > > > diff --git
> a/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
> b/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
> > > > > deleted file mode 100644
> > > > > index 1b8c95b..0000000
> > > > > ---
> a/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
> > > > > +++ /dev/null
> > > > > @@ -1,49 +0,0 @@
> > > > > -From a6e5813d2f8402bf3a311c8bcda02623bfb76882 Mon Sep 17 00:00:00
> 2001
> > > > > -From: Carlos Hernandez <ceh@ti.com>
> > > > > -Date: Tue, 24 Feb 2015 16:00:34 -0500
> > > > > -Subject: [PATCH 2/2] Restore original loopback config
> > > > > -
> > > > > -If loopback option is enabled, disable it at the end of the test.
> > > > > -
> > > > > -Signed-off-by: Carlos Hernandez <ceh@ti.com>
> > > > > -Upstream-status: Pending
> > > > > ----
> > > > > - serialcheck.c | 9 +++++++--
> > > > > - 1 file changed, 7 insertions(+), 2 deletions(-)
> > > > > -
> > > > > -diff --git a/serialcheck.c b/serialcheck.c
> > > > > -index 4100c37..06470f7 100644
> > > > > ---- a/serialcheck.c
> > > > > -+++ b/serialcheck.c
> > > > > -@@ -427,6 +427,7 @@ int main(int argc, char *argv[])
> > > > > - unsigned char *data;
> > > > > - unsigned int open_mode;
> > > > > - off_t data_len;
> > > > > -+ unsigned int mcr;
> > > > > -
> > > > > - argp_parse(&argp, argc, argv, 0, NULL, &opts);
> > > > > - if (!opts.file_trans)
> > > > > -@@ -496,8 +497,6 @@ int main(int argc, char *argv[])
> > > > > - }
> > > > > -
> > > > > - if (opts.loopback) {
> > > > > -- unsigned int mcr;
> > > > > --
> > > > > - ret = ioctl(fd, TIOCMGET, &mcr);
> > > > > - if (ret < 0)
> > > > > - die("mcr get failed: %m\n");
> > > > > -@@ -535,6 +534,12 @@ int main(int argc, char *argv[])
> > > > > - ret = tcsetattr(fd, TCSAFLUSH, &old_term);
> > > > > - if (ret)
> > > > > - printf("tcsetattr() of old ones failed: %m\n");
> > > > > -+ if (opts.loopback) {
> > > > > -+ mcr &= ~(TIOCM_LOOP);
> > > > > -+ ret = ioctl(fd, TIOCMSET, &mcr);
> > > > > -+ }
> > > > > -+ if (ret)
> > > > > -+ printf("disabling loopback failed: %m\n");
> > > > > -
> > > > > - close(fd);
> > > > > - return status;
> > > > > ---
> > > > > -1.9.1
> > > > > diff --git a/meta-oe/recipes-devtools/serialcheck/
> serialcheck_1.0.0.bb b/meta-oe/recipes-devtools/serialcheck/
> serialcheck_1.0.0.bb
> > > > > index cd5e0a4..0ec96ab 100644
> > > > > --- a/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
> > > > > +++ b/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
> > > > > @@ -1,30 +1,27 @@
> > > > > SUMMARY = "Application to verify operation of serial ports"
> > > > > -HOMEPAGE = "
> http://git.breakpoint.cc/cgit/bigeasy/serialcheck.git/"
> > > > > +HOMEPAGE = "https://github.com/nsekhar/serialcheck"
> > > > > LICENSE = "GPLv2"
> > > > > LIC_FILES_CHKSUM =
> "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> > > > >
> > > > > -SRC_URI = "git://git.breakpoint.cc/bigeasy/serialcheck.git \
> > > > > -
> file://0001-Add-option-to-enable-internal-loopback.patch \
> > > > > - file://0002-Restore-original-loopback-config.patch \
> > > > > - file://0001-Makefile-Change-order-of-link-flags.patch \
> > > > > - "
> > > > > +SRC_URI = " \
> > > > > + git://github.com/nsekhar/serialcheck.git \
> > > > > +"
> > > > >
> > > > > -SRCREV = "63854a2d0c0129efab132ec328a75279e013fb84"
> > > > > +SRCREV = "45eb2ffa5378396e85432872833890b0a1cba872"
> > > > >
> > > > > S = "${WORKDIR}/git"
> > > > >
> > > > > -DEPENDS_append_libc-musl = " argp-standalone"
> > > > > -EXTRA_OEMAKE = "-e MAKEFLAGS="
> > > > > +inherit autotools
> > > > >
> > > > > -CFLAGS_prepend = "-Wall -Wextra -Wno-sign-compare
> -Wno-pointer-sign "
> > > > > -LDFLAGS_append_libc-musl = " -largp"
> > > > > +DEPENDS_append_libc-musl = " argp-standalone"
> > > > > +EXTRA_OEMAKE_append_libc-musl = " LIBS='-largp'"
> > > > >
> > > > > do_install() {
> > > > > install -d ${D}${bindir}
> > > > > - install ${S}/serialcheck ${D}${bindir}
> > > > > + install ${B}/serialcheck ${D}${bindir}
> > > > > + install ${B}/serialstats ${D}${bindir}
> > > >
> > > > should this be packaged into a package of its own ?
> > >
> > > I don't see why - do you have any specific reason in mind?
> >
> > for size reasons, we have seen that size with upgrades grow and if we
> > can keep a check
> > on while it happens will help end users. So this sounded like an
> > additional binary which perhaps
> > could live on its own.
>
> ARMv7 builds:
> glibc sizes - serialcheck is 10 KB, serialstats is 5 KB
> musl sizes - serialcheck is 26 KB, serialstats is 22 KB
>
> musl is larger because of static argp library
Perhaps it’s small enough to be ignored I see
>
>
[-- Attachment #2: Type: text/html, Size: 18987 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-06-12 4:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-11 22:41 [PATCH] serialcheck: switch to a fork and update to the latest Denys Dmytriyenko
2020-06-11 23:14 ` [oe] " Khem Raj
2020-06-11 23:21 ` Denys Dmytriyenko
2020-06-11 23:26 ` Khem Raj
2020-06-12 1:30 ` Denys Dmytriyenko
2020-06-12 4:38 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.