mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-06-05 02:20:30 +00:00
Revert "CI: apply in-flight patches to fix lopper and python-dtc"
This reverts commit 628719c5a5.
This commit is contained in:
@@ -1,35 +0,0 @@
|
||||
From 1784be00b170308c56a3d467b22163a385985497 Mon Sep 17 00:00:00 2001
|
||||
From: Tim Orling <ticotimo@gmail.com>
|
||||
Date: Sun, 27 Feb 2022 15:28:18 -0800
|
||||
Subject: [PATCH] lopper: fix wheel build
|
||||
|
||||
The wheel that is built is:
|
||||
lopper-1.0-py3-none-any.whl
|
||||
|
||||
Set BASEVERSION to 1.0 and use this to set PV and the value for PYPA_WHEEL
|
||||
(the path to the wheel filename).
|
||||
|
||||
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
|
||||
---
|
||||
recipes-kernel/lopper/lopper_git.bb | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/recipes-kernel/lopper/lopper_git.bb b/recipes-kernel/lopper/lopper_git.bb
|
||||
index 606dab6..e96bac7 100644
|
||||
--- a/recipes-kernel/lopper/lopper_git.bb
|
||||
+++ b/recipes-kernel/lopper/lopper_git.bb
|
||||
@@ -7,7 +7,10 @@ SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=master;protocol=htt
|
||||
SRCREV = "3c81fcce08eeb64cbbde1535abd83572985a8689"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
-PV="v1.0+git${SRCPV}"
|
||||
+BASEVERSION = "1.0"
|
||||
+PV="v${BASEVERSION}+git${SRCPV}"
|
||||
+
|
||||
+PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${BPN}-${BASEVERSION}-*.whl"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8e5f5f691f01c9fdfa7a7f2d535be619"
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From ef0d9470c853ee8bbef33db4708d3657646ad8f8 Mon Sep 17 00:00:00 2001
|
||||
From: Tim Orling <ticotimo@gmail.com>
|
||||
Date: Sun, 27 Feb 2022 15:28:17 -0800
|
||||
Subject: [PATCH] python3-dtc: fix wheel build
|
||||
|
||||
The wheel that is built is ${S}/dist/libfdt-1.6.2.dev39+g4048aed.d20220103-cp310-cp310-linux_x86_64.whl
|
||||
Set PYPA_WHEEL to match this.
|
||||
|
||||
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
|
||||
---
|
||||
recipes-kernel/dtc/python3-dtc_1.6.1.bb | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/recipes-kernel/dtc/python3-dtc_1.6.1.bb b/recipes-kernel/dtc/python3-dtc_1.6.1.bb
|
||||
index 449d071..671d280 100644
|
||||
--- a/recipes-kernel/dtc/python3-dtc_1.6.1.bb
|
||||
+++ b/recipes-kernel/dtc/python3-dtc_1.6.1.bb
|
||||
@@ -19,6 +19,8 @@ SRCREV = "4048aed12b81c5a0154b9af438edc99ec7d2b6a1"
|
||||
PV = "1.6.1+git${SRCPV}"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
+PYPA_WHEEL = "${S}/dist/libfdt-1.6.2*.whl"
|
||||
+
|
||||
inherit setuptools3 pkgconfig
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -6,10 +6,3 @@ header:
|
||||
repos:
|
||||
meta-virtualization:
|
||||
url: git://git.yoctoproject.org/meta-virtualization
|
||||
patches:
|
||||
lopper:
|
||||
repo: meta-arm
|
||||
path: 0001-lopper-fix-wheel-build.patch
|
||||
dtc:
|
||||
repo: meta-arm
|
||||
path: 0001-python3-dtc-fix-wheel-build.patch
|
||||
|
||||
Reference in New Issue
Block a user