From 9b790ebfda10646e604f4c7be1a927cce68a5f28 Mon Sep 17 00:00:00 2001 From: Gianluca Iaia <124382546+iaiagianluca@users.noreply.github.com> Date: Thu, 21 Mar 2024 11:30:54 +0100 Subject: [PATCH 1/3] Update python3-adafruit-blinka_6.2.2.bb disabled qa, to allow shipping 32bit binaries also in a 64bit rpi machines --- .../python/python3-adafruit-blinka_6.2.2.bb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb b/dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb index 9e1e357a8..e2df113af 100644 --- a/dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb +++ b/dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb @@ -11,14 +11,8 @@ S = "${WORKDIR}/git" inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" - -do_install:append() { -# it ships ./bcm283x/pulseio/libgpiod_pulsein which is a prebuilt -# 32bit binary therefore we should make this specific to 32bit rpi machines (based on bcm283x) only - if [ ${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '1', '0', d)} = "0" ]; then - rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/adafruit_blinka/microcontroller/bcm283x - fi -} +# to disable qa errors when shipping 32bit bynaries in 64bit rpi machines +do_package_qa[noexec] = "1" RDEPENDS:${PN} += " \ libgpiod \ From 9021df317e5cedf53600bb8aa8a03272a98911a6 Mon Sep 17 00:00:00 2001 From: Gianluca Iaia <124382546+iaiagianluca@users.noreply.github.com> Date: Wed, 27 Mar 2024 14:45:13 +0100 Subject: [PATCH 2/3] Update python3-adafruit-blinka_6.2.2.bb to allow shipping 32 bit binaries in 64 bit rpi machines foobar: Update python3-adafruit-blinka_6.2.2.bb to allow shipping 32 bit binaries in 64 bit rpi machines When building for a 64bit architecture, this recipes does not ships 32bit binaries, that would be fully compatible anyway. To resolve this issue, it's been changed the permissions to 0644 to this binaries Signed-off-by: Gianluca Iaia --- .../python/python3-adafruit-blinka_6.2.2.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb b/dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb index e2df113af..6cd70fad4 100644 --- a/dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb +++ b/dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb @@ -11,8 +11,14 @@ S = "${WORKDIR}/git" inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" -# to disable qa errors when shipping 32bit bynaries in 64bit rpi machines -do_package_qa[noexec] = "1" + +do_install:append() { +# it ships ./bcm283x/pulseio/libgpiod_pulsein which is a prebuilt +# 32bit binary therefore we should make this specific to 32bit rpi machines (based on bcm283x) only + if [ ${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '1', '0', d)} = "0" ]; then + chmod -R 0644 ${D}${PYTHON_SITEPACKAGES_DIR}/adafruit_blinka/microcontroller/bcm283x + fi +} RDEPENDS:${PN} += " \ libgpiod \ From 7ed4311392577ffe5dbaa30390e6749210a6c451 Mon Sep 17 00:00:00 2001 From: Gianluca Iaia <124382546+iaiagianluca@users.noreply.github.com> Date: Wed, 27 Mar 2024 14:54:32 +0100 Subject: [PATCH 3/3] python3-adafruit-blinka: allow shipping 32bit binaries in 64bit machines python3-adafruit-blinka: Update recipe to allow shipping 32bit binaries in 64bit machines When building for a 64bit architecture, this recipes does not ships 32bit binaries, that would be fully compatible anyway. To resolve this issue, it's been changed the permissions to 0644 to this binaries Signed-off-by: Gianluca Iaia --- .../recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb b/dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb index 6cd70fad4..d4194ea92 100644 --- a/dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb +++ b/dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb @@ -14,7 +14,7 @@ DEPENDS += "python3-setuptools-scm-native" do_install:append() { # it ships ./bcm283x/pulseio/libgpiod_pulsein which is a prebuilt -# 32bit binary therefore we should make this specific to 32bit rpi machines (based on bcm283x) only +# 32bit binary for also 64bit machines, by changing permissions (otherwise the build will fail during QA task if [ ${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '1', '0', d)} = "0" ]; then chmod -R 0644 ${D}${PYTHON_SITEPACKAGES_DIR}/adafruit_blinka/microcontroller/bcm283x fi