[meta-oe][PATCH 1/6] python3-apt: Point PYPA_WHEEL to custom location

[meta-oe][PATCH 1/6] python3-apt: Point PYPA_WHEEL to custom location

[Khem Raj]

Standard deduction logic does not work so help the system a bit

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-devtools/python/python3-apt_2.3.0.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-devtools/python/python3-apt_2.3.0.bb b/meta-oe/recipes-devtools/python/python3-apt_2.3.0.bb
index 6463f49bb5..183836f406 100644
--- a/meta-oe/recipes-devtools/python/python3-apt_2.3.0.bb
+++ b/meta-oe/recipes-devtools/python/python3-apt_2.3.0.bb
@@ -10,6 +10,8 @@ SRCREV = "6145b6484d220685edfd922d364afbf065127efe"
 S = "${WORKDIR}/git"
 
 inherit setuptools3
+PIP_INSTALL_PACKAGE = "python_apt"
+PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-0.0.0-*.whl"
 
 DEPENDS += "apt"
 RDEPENDS:${PN} += "apt python3-core"
-- 
2.35.1

[meta-oe][PATCH 2/6] cxxtest: Define PIP_INSTALL_DIST_PATH

[Khem Raj]

Helps to find the wheel file

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb b/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb
index 65b54ed548..b87972f413 100644
--- a/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb
+++ b/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb
@@ -10,6 +10,8 @@ SRC_URI[sha256sum] = "1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f489
 
 inherit setuptools3
 
+PIP_INSTALL_DIST_PATH = "${B}/python/python3/dist"
+
 SETUPTOOLS_SETUP_PATH = "${S}/python"
 
 do_install:append() {
-- 
2.35.1

[meta-oe][PATCH 3/6] python3-pycups: Inherit setuptools_build_meta

[Khem Raj]

Gets the wheel dependencies sorted during build
Fixes
| error: invalid command 'bdist_wheel'

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb b/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb
index dd00f444ed..3866e60a12 100644
--- a/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb
+++ b/meta-oe/recipes-devtools/python/python3-pycups_2.0.1.bb
@@ -16,4 +16,4 @@ DEPENDS += "cups"
 # See https://pypi.org/project/pycups/ for data
 SRC_URI[sha256sum] = "57434ce5f62548eb12949ca8217f066f4eeb21a5d6ab8b13471dce350e380c90"
 
-inherit pypi setuptools3
\ No newline at end of file
+inherit pypi setuptools_build_meta
-- 
2.35.1

[meta-oe][PATCH 4/6] sanlock: Fix build with wheels on

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb
index 3c08c4e003..4bfd67e27b 100644
--- a/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb
+++ b/meta-oe/recipes-extended/sanlock/sanlock_3.8.4.bb
@@ -26,6 +26,9 @@ DEPENDS = "libaio util-linux"
 inherit setuptools3 useradd
 
 SETUPTOOLS_SETUP_PATH = "${S}/python"
+PIP_INSTALL_DIST_PATH = "${B}/python/dist"
+PIP_INSTALL_PACKAGE = "sanlock_python"
+PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-3.8.4-*.whl"
 
 do_compile:prepend () {
     oe_runmake -C ${S}/wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}"
-- 
2.35.1

[meta-oe][PATCH 5/6] guider: Set PYPA_WHEEL

[Khem Raj]

Fixes build with wheels

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-devtools/guider/guider_3.9.8.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-devtools/guider/guider_3.9.8.bb b/meta-oe/recipes-devtools/guider/guider_3.9.8.bb
index 47d872a400..3c3f069df2 100644
--- a/meta-oe/recipes-devtools/guider/guider_3.9.8.bb
+++ b/meta-oe/recipes-devtools/guider/guider_3.9.8.bb
@@ -14,6 +14,7 @@ SRCREV = "a502cd93b13235b7539557a91328de00b7c51bc3"
 S = "${WORKDIR}/git"
 
 inherit setuptools3
+PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-3.9.8-*.whl"
 
 RDEPENDS:${PN} = "python3 python3-core \
         python3-ctypes python3-shell python3-json"
-- 
2.35.1

[meta-oe][PATCH 6/6] unattended-upgrades: Migrate to use wheels

[Khem Raj]

It still fails with
| pip._internal.exceptions.InstallationError: For req: unattended-upgrades==0.1. Unknown scheme key used in /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/unattended-upgrades/2.6-r0/git/dist/unattended_upgrades-0.1-py3-none-any.whl: etc (for file 'unattended_upgrades-0.1.data/etc/kernel/postinst.d/unattended-upgrades'). .data directory contents should be in subdirectories named with a valid scheme key (data, headers, platlib, purelib, scripts)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../unattended-upgrades/unattended-upgrades_2.6.bb         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb b/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
index 629d2b43d1..85e5f59c7a 100644
--- a/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
+++ b/meta-oe/recipes-devtools/unattended-upgrades/unattended-upgrades_2.6.bb
@@ -13,13 +13,14 @@ SRCREV = "c6db6fad26a2b83ba301b52ff5dee98cef7558ca"
 
 S = "${WORKDIR}/git"
 
-inherit setuptools3
+inherit setuptools_build_meta
+PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-0.1-*.whl"
 
 DEPENDS += "apt intltool-native python3-distutils-extra-native"
 RDEPENDS:${PN} += "apt lsb-release python3-apt python3-core python3-datetime python3-email python3-fcntl python3-io python3-logging python3-stringold python3-syslog"
 
-do_install:prepend () {
-	cp -v ${S}/data/50unattended-upgrades.Debian ${S}/data/50unattended-upgrades
+do_configure:prepend () {
+	install -Dm 0644 ${S}/data/50unattended-upgrades.Debian ${S}/data/50unattended-upgrades
 }
 
 do_install:append () {
-- 
2.35.1

Re: [oe] [meta-oe][PATCH 5/6] guider: Set PYPA_WHEEL

[akuster808]

On 2/26/22 23:58, Khem Raj wrote:
> Fixes build with wheels
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>   meta-oe/recipes-devtools/guider/guider_3.9.8.bb | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/meta-oe/recipes-devtools/guider/guider_3.9.8.bb b/meta-oe/recipes-devtools/guider/guider_3.9.8.bb
> index 47d872a400..3c3f069df2 100644
> --- a/meta-oe/recipes-devtools/guider/guider_3.9.8.bb
> +++ b/meta-oe/recipes-devtools/guider/guider_3.9.8.bb
> @@ -14,6 +14,7 @@ SRCREV = "a502cd93b13235b7539557a91328de00b7c51bc3"
>   S = "${WORKDIR}/git"
>   
>   inherit setuptools3
> +PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-3.9.8-*.whl"
Any reason not to use PV here ?
>   
>   RDEPENDS:${PN} = "python3 python3-core \
>           python3-ctypes python3-shell python3-json"
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#95558): https://lists.openembedded.org/g/openembedded-devel/message/95558
> Mute This Topic: https://lists.openembedded.org/mt/89425252/3616698
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [akuster808@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [oe] [meta-oe][PATCH 5/6] guider: Set PYPA_WHEEL

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1466 bytes --]

On Sun, Feb 27, 2022 at 8:09 AM akuster808 <akuster808@gmail.com> wrote:

>
>
> On 2/26/22 23:58, Khem Raj wrote:
> > Fixes build with wheels
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >   meta-oe/recipes-devtools/guider/guider_3.9.8.bb | 1 +
> >   1 file changed, 1 insertion(+)
> >
> > diff --git a/meta-oe/recipes-devtools/guider/guider_3.9.8.bb
> b/meta-oe/recipes-devtools/guider/guider_3.9.8.bb
> > index 47d872a400..3c3f069df2 100644
> > --- a/meta-oe/recipes-devtools/guider/guider_3.9.8.bb
> > +++ b/meta-oe/recipes-devtools/guider/guider_3.9.8.bb
> > @@ -14,6 +14,7 @@ SRCREV = "a502cd93b13235b7539557a91328de00b7c51bc3"
> >   S = "${WORKDIR}/git"
> >
> >   inherit setuptools3
> > +PYPA_WHEEL =
> "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-3.9.8-*.whl"
> Any reason not to use PV here ?


PV is appended few lines above this code


PV = "3.9.8+git${SRCPV}"


> >
> >   RDEPENDS:${PN} = "python3 python3-core \
> >           python3-ctypes python3-shell python3-json"
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#95558):
> https://lists.openembedded.org/g/openembedded-devel/message/95558
> > Mute This Topic: https://lists.openembedded.org/mt/89425252/3616698
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> akuster808@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>

[-- Attachment #2: Type: text/html, Size: 5174 bytes --]