diff options
| author |   Ross Burton <ross@burtonini.com> | 2022-01-17 12:58:27 +0000 |
|---|---|---|
| committer |   Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-01-17 13:05:06 -0500 |
| commit | 34c2f32ec18f663c889aed9751711a4c6021357d (patch) | |
| tree | 6cbfeb6c82e42effb74c788e2c327fc321759e52 | |
| parent | 4667e968dfe9e3c2451242498a6746f7d21d6802 (diff) | |
| download | meta-virtualization-34c2f32ec18f663c889aed9751711a4c6021357d.tar.gz meta-virtualization-34c2f32ec18f663c889aed9751711a4c6021357d.tar.bz2 meta-virtualization-34c2f32ec18f663c889aed9751711a4c6021357d.zip | |
python3-dtc: fix packaging by using setuptools
Inheriting setuptools3-base doesn't actually define any tasks, so commit
1ef6050 to drop distutils3 had the side-effect of not building any code.
Backport a commit from upstream to switch to setuptools, inherit
setuptool3, and change DISTUTILS_SETUP_PATH to SETUPTOOLS_SETUP_PATH.
Signed-off-by: Ross Burton <ross.burton@arm.com>
| -rw-r--r-- | recipes-kernel/dtc/files/setuptools.patch | 34 | ||||
| -rw-r--r-- | recipes-kernel/dtc/python3-dtc_1.6.1.bb | 7 |
2 files changed, 38 insertions, 3 deletions
diff --git a/recipes-kernel/dtc/files/setuptools.patch b/recipes-kernel/dtc/files/setuptools.patch new file mode 100644 index 0000000..3d37ebd --- /dev/null +++ b/recipes-kernel/dtc/files/setuptools.patch @@ -0,0 +1,34 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From c691776ddb26acbd3674722caafacaf7b6e3e807 Mon Sep 17 00:00:00 2001 +From: Rob Herring <robh@kernel.org> +Date: Wed, 10 Nov 2021 19:11:32 -0600 +Subject: [PATCH] pylibfdt: Use setuptools instead of distutils + +The use of setuptools is favored over distutils. setuptools is needed to +support building Python 'wheels' and for pip support. + +Signed-off-by: Rob Herring <robh@kernel.org> +Message-Id: <20211111011135.2386773-2-robh@kernel.org> +Signed-off-by: David Gibson <david@gibson.dropbear.id.au> +--- + pylibfdt/setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pylibfdt/setup.py b/pylibfdt/setup.py +index ef40f15..f065a59 100755 +--- a/pylibfdt/setup.py ++++ b/pylibfdt/setup.py +@@ -10,7 +10,7 @@ Copyright (C) 2017 Google, Inc. + Written by Simon Glass <sjg@chromium.org> + """ + +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + import os + import re + import sys +-- +2.25.1 + diff --git a/recipes-kernel/dtc/python3-dtc_1.6.1.bb b/recipes-kernel/dtc/python3-dtc_1.6.1.bb index e9b8499..6e02db6 100644 --- a/recipes-kernel/dtc/python3-dtc_1.6.1.bb +++ b/recipes-kernel/dtc/python3-dtc_1.6.1.bb @@ -7,6 +7,7 @@ LICENSE = "GPLv2 | BSD-2-Clause" DEPENDS = "flex-native bison-native swig-native libyaml dtc" SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \ + file://setuptools.patch \ file://ssize.patch" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" @@ -17,13 +18,13 @@ SRCREV = "ecaeb97fec013973360e94888a7de645f084345c" S = "${WORKDIR}/git" -inherit setuptools3-base pkgconfig +inherit setuptools3 pkgconfig -DISTUTILS_SETUP_PATH = "${S}/pylibfdt" +SETUPTOOLS_SETUP_PATH = "${S}/pylibfdt" do_configure:prepend() { oe_runmake -C "${S}" version_gen.h - mv "${S}/version_gen.h" "${DISTUTILS_SETUP_PATH}/" + mv "${S}/version_gen.h" "${SETUPTOOLS_SETUP_PATH}/" } BBCLASSEXTEND = "native nativesdk" |