Message ID | 20230814064247.333044-1-paul@crapouillou.net |
---|---|
State | Superseded |
Headers | show |
Series | [1/1] package/libiio: bump to version v0.25 | expand |
Le lundi 14 août 2023 à 08:42 +0200, Paul Cercueil a écrit : > The changelog is available here: > https://github.com/analogdevicesinc/libiio/releases/tag/v0.25 > > Remove the 0001 patch as it is included in the v0.24 version. in the v0.25* version. -Paul > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > .../0001-iiod-serial.c-fix-sparc-build.patch | 76 ----------------- > -- > package/libiio/libiio.hash | 2 +- > package/libiio/libiio.mk | 2 +- > 3 files changed, 2 insertions(+), 78 deletions(-) > delete mode 100644 package/libiio/0001-iiod-serial.c-fix-sparc- > build.patch > > diff --git a/package/libiio/0001-iiod-serial.c-fix-sparc-build.patch > b/package/libiio/0001-iiod-serial.c-fix-sparc-build.patch > deleted file mode 100644 > index 1c2d606e63..0000000000 > --- a/package/libiio/0001-iiod-serial.c-fix-sparc-build.patch > +++ /dev/null > @@ -1,76 +0,0 @@ > -From 40ffc5d9b8f6e47866292bf1365ac3a5d22cf123 Mon Sep 17 00:00:00 > 2001 > -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -Date: Sun, 25 Sep 2022 11:19:18 +0200 > -Subject: [PATCH] iiod/serial.c: fix sparc build > - > -Fix the following sparc build failure raised since version 0.24 and > - > https://github.com/analogdevicesinc/libiio/commit/2d3cae005f364742b3a9 > e7234d15b2fd2cbac664: > - > -/home/buildroot/autobuild/instance-0/output-1/build/libiio- > 0.24/iiod/serial.c: In function 'serial_configure': > -/home/buildroot/autobuild/instance-0/output-1/build/libiio- > 0.24/iiod/serial.c:99:58: error: 'B2500000' undeclared (first use in > this function); did you mean 'B1500000'? > - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= > B##bps; break > - | ^ > -/home/buildroot/autobuild/instance-0/output-1/build/libiio- > 0.24/iiod/serial.c:127:9: note: in expansion of macro 'CASE_BPS' > - 127 | CASE_BPS(2500000, &tty_attrs); > - | ^~~~~~~~ > -/home/buildroot/autobuild/instance-0/output-1/build/libiio- > 0.24/iiod/serial.c:99:58: note: each undeclared identifier is > reported only once for each function it appears in > - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= > B##bps; break > - | ^ > -/home/buildroot/autobuild/instance-0/output-1/build/libiio- > 0.24/iiod/serial.c:127:9: note: in expansion of macro 'CASE_BPS' > - 127 | CASE_BPS(2500000, &tty_attrs); > - | ^~~~~~~~ > -/home/buildroot/autobuild/instance-0/output-1/build/libiio- > 0.24/iiod/serial.c:99:58: error: 'B3000000' undeclared (first use in > this function); did you mean 'B1000000'? > - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= > B##bps; break > - | ^ > -/home/buildroot/autobuild/instance-0/output-1/build/libiio- > 0.24/iiod/serial.c:128:9: note: in expansion of macro 'CASE_BPS' > - 128 | CASE_BPS(3000000, &tty_attrs); > - | ^~~~~~~~ > -/home/buildroot/autobuild/instance-0/output-1/build/libiio- > 0.24/iiod/serial.c:99:58: error: 'B3500000' undeclared (first use in > this function); did you mean 'B1500000'? > - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= > B##bps; break > - | ^ > -/home/buildroot/autobuild/instance-0/output-1/build/libiio- > 0.24/iiod/serial.c:129:9: note: in expansion of macro 'CASE_BPS' > - 129 | CASE_BPS(3500000, &tty_attrs); > - | ^~~~~~~~ > -/home/buildroot/autobuild/instance-0/output-1/build/libiio- > 0.24/iiod/serial.c:99:58: error: 'B4000000' undeclared (first use in > this function); did you mean 'B1000000'? > - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= > B##bps; break > - | ^ > -/home/buildroot/autobuild/instance-0/output-1/build/libiio- > 0.24/iiod/serial.c:130:9: note: in expansion of macro 'CASE_BPS' > - 130 | CASE_BPS(4000000, &tty_attrs); > - | ^~~~~~~~ > - > -Fixes: > - - > http://autobuild.buildroot.org/results/8a9902f6eddaab812ebce3506ed6de686f647e02 > - > -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -[yann.morin.1998@free.fr: actual backport now that upstream accepted > it] > -Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> > ---- > - iiod/serial.c | 8 ++++++++ > - 1 file changed, 8 insertions(+) > - > -diff --git a/iiod/serial.c b/iiod/serial.c > -index f829361d..b140d051 100644 > ---- a/iiod/serial.c > -+++ b/iiod/serial.c > -@@ -124,10 +124,18 @@ static int serial_configure(int fd, unsigned > int uart_bps, > - CASE_BPS(1152000, &tty_attrs); > - CASE_BPS(1500000, &tty_attrs); > - CASE_BPS(2000000, &tty_attrs); > -+#ifdef B2500000 /* Not available on all architectures, i.e. sparc > */ > - CASE_BPS(2500000, &tty_attrs); > -+#endif > -+#ifdef B3000000 /* Not available on all architectures, i.e. sparc > */ > - CASE_BPS(3000000, &tty_attrs); > -+#endif > -+#ifdef B3500000 /* Not available on all architectures, i.e. sparc > */ > - CASE_BPS(3500000, &tty_attrs); > -+#endif > -+#ifdef B4000000 /* Not available on all architectures, i.e. sparc > */ > - CASE_BPS(4000000, &tty_attrs); > -+#endif > - default: > - IIO_ERROR("Invalid baud rate\n"); > - return -EINVAL; > --- > -2.25.1 > - > diff --git a/package/libiio/libiio.hash b/package/libiio/libiio.hash > index f497756eac..0f024af78c 100644 > --- a/package/libiio/libiio.hash > +++ b/package/libiio/libiio.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 > a2b5d848531ea64fd9f95327dfd5a588bd227d9577281ec375e822702c6a52d5 > libiio-0.24.tar.gz > +sha256 > 21972599a3c143ab1f98002ad2b3f28f4aff927fde5f677478311cd4e517730c > libiio-0.25.tar.gz > sha256 > 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b > COPYING.txt > diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk > index 9e2cf454b5..733a0c90ed 100644 > --- a/package/libiio/libiio.mk > +++ b/package/libiio/libiio.mk > @@ -4,7 +4,7 @@ > # > #################################################################### > ############ > > -LIBIIO_VERSION = 0.24 > +LIBIIO_VERSION = 0.25 > LIBIIO_SITE = $(call > github,analogdevicesinc,libiio,v$(LIBIIO_VERSION)) > LIBIIO_INSTALL_STAGING = YES > LIBIIO_LICENSE = LGPL-2.1+
Hello, On Mon, 14 Aug 2023 08:42:47 +0200 Paul Cercueil <paul@crapouillou.net> wrote: > The changelog is available here: > https://github.com/analogdevicesinc/libiio/releases/tag/v0.25 > > Remove the 0001 patch as it is included in the v0.24 version. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > .../0001-iiod-serial.c-fix-sparc-build.patch | 76 ------------------- > package/libiio/libiio.hash | 2 +- > package/libiio/libiio.mk | 2 +- > 3 files changed, 2 insertions(+), 78 deletions(-) > delete mode 100644 package/libiio/0001-iiod-serial.c-fix-sparc-build.patch The .checkpackageignore file needs to be updated to remove the line related to 0001-iiod-serial.c-fix-sparc-build.patch. Best regards, Thomas
diff --git a/package/libiio/0001-iiod-serial.c-fix-sparc-build.patch b/package/libiio/0001-iiod-serial.c-fix-sparc-build.patch deleted file mode 100644 index 1c2d606e63..0000000000 --- a/package/libiio/0001-iiod-serial.c-fix-sparc-build.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 40ffc5d9b8f6e47866292bf1365ac3a5d22cf123 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Sun, 25 Sep 2022 11:19:18 +0200 -Subject: [PATCH] iiod/serial.c: fix sparc build - -Fix the following sparc build failure raised since version 0.24 and -https://github.com/analogdevicesinc/libiio/commit/2d3cae005f364742b3a9e7234d15b2fd2cbac664: - -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c: In function 'serial_configure': -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B2500000' undeclared (first use in this function); did you mean 'B1500000'? - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break - | ^ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:127:9: note: in expansion of macro 'CASE_BPS' - 127 | CASE_BPS(2500000, &tty_attrs); - | ^~~~~~~~ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: note: each undeclared identifier is reported only once for each function it appears in - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break - | ^ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:127:9: note: in expansion of macro 'CASE_BPS' - 127 | CASE_BPS(2500000, &tty_attrs); - | ^~~~~~~~ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B3000000' undeclared (first use in this function); did you mean 'B1000000'? - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break - | ^ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:128:9: note: in expansion of macro 'CASE_BPS' - 128 | CASE_BPS(3000000, &tty_attrs); - | ^~~~~~~~ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B3500000' undeclared (first use in this function); did you mean 'B1500000'? - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break - | ^ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:129:9: note: in expansion of macro 'CASE_BPS' - 129 | CASE_BPS(3500000, &tty_attrs); - | ^~~~~~~~ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B4000000' undeclared (first use in this function); did you mean 'B1000000'? - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break - | ^ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:130:9: note: in expansion of macro 'CASE_BPS' - 130 | CASE_BPS(4000000, &tty_attrs); - | ^~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/8a9902f6eddaab812ebce3506ed6de686f647e02 - -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> -[yann.morin.1998@free.fr: actual backport now that upstream accepted it] -Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> ---- - iiod/serial.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/iiod/serial.c b/iiod/serial.c -index f829361d..b140d051 100644 ---- a/iiod/serial.c -+++ b/iiod/serial.c -@@ -124,10 +124,18 @@ static int serial_configure(int fd, unsigned int uart_bps, - CASE_BPS(1152000, &tty_attrs); - CASE_BPS(1500000, &tty_attrs); - CASE_BPS(2000000, &tty_attrs); -+#ifdef B2500000 /* Not available on all architectures, i.e. sparc */ - CASE_BPS(2500000, &tty_attrs); -+#endif -+#ifdef B3000000 /* Not available on all architectures, i.e. sparc */ - CASE_BPS(3000000, &tty_attrs); -+#endif -+#ifdef B3500000 /* Not available on all architectures, i.e. sparc */ - CASE_BPS(3500000, &tty_attrs); -+#endif -+#ifdef B4000000 /* Not available on all architectures, i.e. sparc */ - CASE_BPS(4000000, &tty_attrs); -+#endif - default: - IIO_ERROR("Invalid baud rate\n"); - return -EINVAL; --- -2.25.1 - diff --git a/package/libiio/libiio.hash b/package/libiio/libiio.hash index f497756eac..0f024af78c 100644 --- a/package/libiio/libiio.hash +++ b/package/libiio/libiio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a2b5d848531ea64fd9f95327dfd5a588bd227d9577281ec375e822702c6a52d5 libiio-0.24.tar.gz +sha256 21972599a3c143ab1f98002ad2b3f28f4aff927fde5f677478311cd4e517730c libiio-0.25.tar.gz sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b COPYING.txt diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index 9e2cf454b5..733a0c90ed 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIIO_VERSION = 0.24 +LIBIIO_VERSION = 0.25 LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION)) LIBIIO_INSTALL_STAGING = YES LIBIIO_LICENSE = LGPL-2.1+
The changelog is available here: https://github.com/analogdevicesinc/libiio/releases/tag/v0.25 Remove the 0001 patch as it is included in the v0.24 version. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- .../0001-iiod-serial.c-fix-sparc-build.patch | 76 ------------------- package/libiio/libiio.hash | 2 +- package/libiio/libiio.mk | 2 +- 3 files changed, 2 insertions(+), 78 deletions(-) delete mode 100644 package/libiio/0001-iiod-serial.c-fix-sparc-build.patch