Skip to contentSkip to conversation

libiio: backports from master

PATCH In review Martin Siegumfeldt 2 participants 11 messages Nov 5, 2019 – Nov 7, 2019

lore
Share & tools
lore
#0 lore raw

cover libiio: backports from master

Backport libiio patches from master bumping libiio to v0.18 and allows building python3 bindings

Khem Raj (1):
libiio: Inherit distutils3-base for packaging python files

Martin Siegumfeldt (4):
Revert "libiio: fix build of python bindins"
libiio: allow python3 bindings to be built
libiio: bump to version 0.18+
libiio: add python3 packageconfig

Nicholas Pillitteri (1):
Bump libiio version to 0.15

 meta-oe/recipes-support/libiio/libiio_git.bb | 23 +++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/6 Bump libiio version to 0.15

From: Nicholas Pillitteri <[email protected]>

---
 meta-oe/recipes-support/libiio/libiio_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-support/libiio/libiio_git.bb +2 -2
index fa6f4c2ca..cc0efccf9 100644
@@ -4,8 +4,8 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c"
 
-SRCREV = "fa82974d8bd1fded78e630ab71a7ded1b11d0e33"
-PV = "0.14+git${SRCPV}"
+SRCREV = "6ecff5d46e1b12c2859f0b63a73282940e3402bb"
+PV = "0.15+git${SRCPV}"
 
 SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https"
 
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/6 Revert "libiio: fix build of python bindins"

In reply to Martin Siegumfeldt

This reverts commit b0caf1fb82b90a6b123ba4463a8405568eda0389.

* bindings are build through the variant 'libiio-python' and is not intended installed as part of just 'libiio'

---
 meta-oe/recipes-support/libiio/libiio_git.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta-oe/recipes-support/libiio/libiio_git.bb +1 -2
index cc0efccf9..5d422520b 100644
@@ -24,11 +24,10 @@ EXTRA_OECMAKE = " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \
 "
 
-PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND PYTHON_BINDINGS"
+PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND"
 
 PACKAGECONFIG[USB_BACKEND] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2"
 PACKAGECONFIG[NETWORK_BACKEND] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2"
-PACKAGECONFIG[PYTHON_BINDINGS] = ",,python"
 
 PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-python"
 
Signature · 1 line
2.17.1
#3 lore raw

PATCH 3/6 libiio: allow python3 bindings to be built

In reply to Martin Siegumfeldt
---
 meta-oe/recipes-support/libiio/libiio_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta-oe/recipes-support/libiio/libiio_git.bb +4 -4
index 5d422520b..4282355f8 100644
@@ -11,7 +11,7 @@ SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https"
 
 S = "${WORKDIR}/git"
 
-inherit cmake pythonnative systemd
+inherit cmake python3native systemd
 
 DEPENDS = " \
     flex-native bison-native libaio \
@@ -29,16 +29,16 @@ PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND"
 PACKAGECONFIG[USB_BACKEND] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2"
 PACKAGECONFIG[NETWORK_BACKEND] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2"
 
-PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-python"
+PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}"
 
-RDEPENDS_${PN}-python = "${PN} python-ctypes python-stringold"
+RDEPENDS_${PN}-${PYTHON_PN} = "${PN} ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold"
 
 FILES_${PN}-iiod = " \
     ${sbindir}/iiod \
     ${systemd_system_unitdir}/iiod.service \
 "
 FILES_${PN}-tests = "${bindir}"
-FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
+FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}"
 
 SYSTEMD_PACKAGES = "${PN}-iiod"
 SYSTEMD_SERVICE_${PN}-iiod = "iiod.service"
Signature · 1 line
2.17.1
#4 lore raw

PATCH 4/6 libiio: bump to version 0.18+

In reply to Martin Siegumfeldt

Move a few commits ahead of 0.18 in order to resolve build issue related to static only library installation.

---
 meta-oe/recipes-support/libiio/libiio_git.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta-oe/recipes-support/libiio/libiio_git.bb +3 -2
index 4282355f8..4e57d5b77 100644
@@ -4,8 +4,9 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c"
 
-SRCREV = "6ecff5d46e1b12c2859f0b63a73282940e3402bb"
-PV = "0.15+git${SRCPV}"
+# v0.18 + a single commit fixing the build
+SRCREV = "5090603d01779bb1717fb0c50953330e8770550f"
+PV = "0.18+git${SRCPV}"
 
 SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https"
 
Signature · 1 line
2.17.1
#5 lore raw
In reply to Martin Siegumfeldt

Unfortunately, our mailserver rejected the second half of the series - please disregard, I'll resend when the issues are resolved.

Thanks,
Martin

________________________________________
From: [email protected] <[email protected]> on behalf of Martin Siegumfeldt <[email protected]>
Sent: Tuesday, November 5, 2019 1:00 PM
To: [email protected]
Subject: [oe] [meta-oe,thud][PATCH 0/6] libiio: backports from master

Backport libiio patches from master bumping libiio to v0.18 and allows building python3 bindings

Khem Raj (1):
libiio: Inherit distutils3-base for packaging python files

Martin Siegumfeldt (4):
Revert "libiio: fix build of python bindins"
libiio: allow python3 bindings to be built
libiio: bump to version 0.18+
libiio: add python3 packageconfig

Nicholas Pillitteri (1):
Bump libiio version to 0.15

 meta-oe/recipes-support/libiio/libiio_git.bb | 23 +++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

--
2.17.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#6 lore raw
In reply to Martin Siegumfeldt
Quoted 1 line · Martin Siegumfeldt

Backport libiio patches from master bumping libiio to v0.18 and

Upgrading on an upstream stable branch can be OK, especially when this is the lowest risk way to fix CVEs.

But upgrading to new releases on the master branch is usually not worth the regression risk - the default is to avoid changes in OE stable branches.

Quoted 2 lines

allows building python3 bindings
...

No new features in OE stable branches.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#7 lore raw
Quoted 6 lines · Adrian Bunk
Quoted 1 line · Martin Siegumfeldt

Backport libiio patches from master bumping libiio to v0.18 and

Upgrading on an upstream stable branch can be OK, especially when this is the lowest risk way to fix CVEs.

Quoted 7 lines

But upgrading to new releases on the master branch is usually not worth the regression risk - the default is to avoid changes in OE stable branches.

Quoted 2 lines

allows building python3 bindings
...

No new features in OE stable branches.

And even more important:
No removal of features users might be using.

Like the Python2 bindings in this case.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#8 lore raw
Quoted 6 lines · Adrian Bunk
Quoted 1 line · Martin Siegumfeldt

Backport libiio patches from master bumping libiio to v0.18 and

Upgrading on an upstream stable branch can be OK, especially when this is the lowest risk way to fix CVEs.

Quoted 7 lines

But upgrading to new releases on the master branch is usually not worth the regression risk - the default is to avoid changes in OE stable branches.

Quoted 2 lines

allows building python3 bindings
...

No new features in OE stable branches.

And even more important:
No removal of features users might be using.

Like the Python2 bindings in this case.

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

Hi Adrian,

I see - can you please confirm that this constraint applies to Zeus and Warrior (which is also stable according to https://wiki.yoctoproject.org/wiki/Releases)

What I am trying to achieve (from the thud baseline) is to get libiio python3 bindings built. Now, most of the variables from libiio_git.bb can be overridden in an append file, except for the 'inherit pythonnative' statement that dictates python2 bindings to be packaged. AFAICS, this leaves me with the only option of, not appending, but to define my own (.bb) recipe in my layer taking precedence over the one from meta-openembedded - a suboptimal solution I guess.

Anything I am missing?

Thanks,
Martin

#9 lore raw
Quoted 1 line · Martin Siegumfeldt

Hi Adrian,

Hi Martin,

Quoted 1 line

I see - can you please confirm that this constraint applies to Zeus and Warrior (which is also stable according to https://wiki.yoctoproject.org/wiki/Releases)

I do not have any special authority on that, but [1] applies to all stable branches (including warrior and zeus).

Quoted 3 lines

What I am trying to achieve (from the thud baseline) is to get libiio python3 bindings built. Now, most of the variables from libiio_git.bb can be overridden in an append file, except for the 'inherit pythonnative' statement that dictates python2 bindings to be packaged. AFAICS, this leaves me with the only option of, not appending, but to define my own (.bb) recipe in my layer taking precedence over the one from meta-openembedded - a suboptimal solution I guess.

Anything I am missing?

One main purpose of a stable branch is that a user upgrading on a stable branch should get bugfixes and especially security fixes, but no regressions.

When you create your distribution or upgrade to a different Yocto stable branch you might get breaking changes and things you are using might break, but this is not supposed to happen on a stable branch.

If you need to backport functionality from more recent series you can always backport this into your layer. I usually have a recipes-backport/ in my layer that contains functionality backported from more recent series, in this case I would have a recipes-backport/libiio/libiio_git.bb with the recipe copied from the current master. Once you upgrade your layer to Yocto >= 3.1 you will be able to drop this backport.

This might sound like a suboptimal solution to you, but it avoids the risk of breaking anything for the many other users of this stable series.

Quoted 2 lines

Thanks,
Martin

cu
Adrian

[1] https://wiki.yoctoproject.org/wiki/Stable_branch_maintenance#Policies

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#10 lore raw
Quoted 1 line · Martin Siegumfeldt

Hi Adrian,

Hi Martin,

Quoted 1 line

I see - can you please confirm that this constraint applies to Zeus and Warrior (which is also stable according to https://wiki.yoctoproject.org/wiki/Releases)

I do not have any special authority on that, but [1] applies to all stable branches (including warrior and zeus).

Quoted 3 lines

What I am trying to achieve (from the thud baseline) is to get libiio python3 bindings built. Now, most of the variables from libiio_git.bb can be overridden in an append file, except for the 'inherit pythonnative' statement that dictates python2 bindings to be packaged. AFAICS, this leaves me with the only option of, not appending, but to define my own (.bb) recipe in my layer taking precedence over the one from meta-openembedded - a suboptimal solution I guess.

Anything I am missing?

One main purpose of a stable branch is that a user upgrading on a stable branch should get bugfixes and especially security fixes, but no regressions.

When you create your distribution or upgrade to a different Yocto stable branch you might get breaking changes and things you are using might break, but this is not supposed to happen on a stable branch.

If you need to backport functionality from more recent series you can always backport this into your layer. I usually have a recipes-backport/ in my layer that contains functionality backported from more recent series, in this case I would have a recipes-backport/libiio/libiio_git.bb with the recipe copied from the current master. Once you upgrade your layer to Yocto >= 3.1 you will be able to drop this backport.

This might sound like a suboptimal solution to you, but it avoids the risk of breaking anything for the many other users of this stable series.

Quoted 2 lines

Thanks,
Martin

cu
Adrian

[1] https://wiki.yoctoproject.org/wiki/Stable_branch_maintenance#Policies

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

Hi Adrian,

I understand - I'll probably go for the 'recipes-backport' approach.

Thanks,
Martin