Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
i2c-tools: change upstream and add python subpkg
Closes #36156
- Loading branch information
Showing
4 changed files
with
100 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
I had to add '--root' to the patch for it to not poison the masterdir. | ||
That part will still be needed as a patch when the next version gets released. | ||
-- 0x5c | ||
original message below | ||
|
||
From a4609318b6fa594f970673d77397f1ca74b4120a Mon Sep 17 00:00:00 2001 | ||
From: Morten Linderud <morten@linderud.pw> | ||
Date: Mon, 4 Oct 2021 20:01:53 +0200 | ||
Subject: py-smbus/Module.mk: Install with PREFIX defined | ||
|
||
If we are building to a defined destdir py-smbus is going to ignore this | ||
and try install to the actual root. This breaks packaging setups as the | ||
install section would fail. | ||
|
||
Signed-off-by: Morten Linderud <morten@linderud.pw> | ||
Signed-off-by: Jean Delvare <jdelvare@suse.de> | ||
--- | ||
py-smbus/Module.mk | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/py-smbus/Module.mk b/py-smbus/Module.mk | ||
index 04ceb64..1e2ded1 100644 | ||
--- a/py-smbus/Module.mk | ||
+++ b/py-smbus/Module.mk | ||
@@ -22,7 +22,7 @@ clean-python: | ||
rm -rf py-smbus/build | ||
|
||
install-python: | ||
- $(DISTUTILS) install | ||
+ $(DISTUTILS) install --prefix="$(PREFIX)" --root="$(DESTDIR)" | ||
|
||
all: all-python | ||
|
||
-- | ||
cgit 1.2.3-1.el7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
From cf3541b8a7ed50782edd05836020d31230fb86c6 Mon Sep 17 00:00:00 2001 | ||
From: Ross Burton <ross.burton@arm.com> | ||
Date: Wed, 19 Jan 2022 12:08:53 +0100 | ||
Subject: py-smbus: Use setuptools instead of distutils | ||
|
||
As per [1], distutils is deprecated in Python 3.10 and will be removed | ||
entirely in Python 3.12. | ||
|
||
As setuptools is essentially an enhanced version of distutils, it's | ||
trivial to port to that. | ||
|
||
[1] https://docs.python.org/3/whatsnew/3.10.html#distutils-deprecated | ||
|
||
Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
Signed-off-by: Jean Delvare <jdelvare@suse.de> | ||
--- | ||
py-smbus/setup.py | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/py-smbus/setup.py b/py-smbus/setup.py | ||
index 28a4500..26db33a 100644 | ||
--- a/py-smbus/setup.py | ||
+++ b/py-smbus/setup.py | ||
@@ -1,6 +1,6 @@ | ||
#!/usr/bin/env python | ||
|
||
-from distutils.core import setup, Extension | ||
+from setuptools import setup, Extension | ||
|
||
setup( name="smbus", | ||
version="1.1", | ||
-- | ||
cgit 1.2.3-1.el7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
i2c-tools |