Compare commits
No commits in common. "c8s" and "imports/c9/i2c-tools-4.3-2.el9" have entirely different histories.
c8s
...
imports/c9
@ -1 +0,0 @@
|
|||||||
1
|
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,2 +1 @@
|
|||||||
SOURCES/i2c-tools-4.0.tar.xz
|
SOURCES/i2c-tools-4.3.tar.xz
|
||||||
/i2c-tools-4.0.tar.xz
|
|
||||||
|
1
.i2c-tools.metadata
Normal file
1
.i2c-tools.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
7b41de001dd3b98d98688477f81be844c42907e4 SOURCES/i2c-tools-4.3.tar.xz
|
@ -1,66 +0,0 @@
|
|||||||
From def2845efacab3a3973fb0218ac5077a162f8f1e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jean Delvare <jdelvare@suse.de>
|
|
||||||
Date: Thu, 2 Nov 2017 16:17:50 +0100
|
|
||||||
Subject: [PATCH 1/3] i2c-tools: i2cbusses: Avoid buffer overflows in sysfs
|
|
||||||
paths
|
|
||||||
|
|
||||||
sprintf isn't safe, use snprintf instead.
|
|
||||||
---
|
|
||||||
CHANGES | 3 +++
|
|
||||||
tools/i2cbusses.c | 10 +++++-----
|
|
||||||
2 files changed, 8 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/CHANGES b/CHANGES
|
|
||||||
index 15ff761..539adb0 100644
|
|
||||||
--- a/CHANGES
|
|
||||||
+++ b/CHANGES
|
|
||||||
@@ -1,6 +1,9 @@
|
|
||||||
i2c-tools CHANGES
|
|
||||||
-----------------
|
|
||||||
|
|
||||||
+master
|
|
||||||
+ tools: Fix potential buffer overflows in i2cbusses
|
|
||||||
+
|
|
||||||
4.0 (2017-10-30)
|
|
||||||
tools: Fix build with recent compilers (gcc 4.6+)
|
|
||||||
Add examples to the manual pages
|
|
||||||
diff --git a/tools/i2cbusses.c b/tools/i2cbusses.c
|
|
||||||
index dad22ea..cb78cc7 100644
|
|
||||||
--- a/tools/i2cbusses.c
|
|
||||||
+++ b/tools/i2cbusses.c
|
|
||||||
@@ -220,18 +220,18 @@ struct i2c_adap *gather_i2c_busses(void)
|
|
||||||
|
|
||||||
/* this should work for kernels 2.6.5 or higher and */
|
|
||||||
/* is preferred because is unambiguous */
|
|
||||||
- sprintf(n, "%s/%s/name", sysfs, de->d_name);
|
|
||||||
+ snprintf(n, NAME_MAX, "%s/%s/name", sysfs, de->d_name);
|
|
||||||
f = fopen(n, "r");
|
|
||||||
/* this seems to work for ISA */
|
|
||||||
if(f == NULL) {
|
|
||||||
- sprintf(n, "%s/%s/device/name", sysfs, de->d_name);
|
|
||||||
+ snprintf(n, NAME_MAX, "%s/%s/device/name", sysfs, de->d_name);
|
|
||||||
f = fopen(n, "r");
|
|
||||||
}
|
|
||||||
/* non-ISA is much harder */
|
|
||||||
/* and this won't find the correct bus name if a driver
|
|
||||||
has more than one bus */
|
|
||||||
if(f == NULL) {
|
|
||||||
- sprintf(n, "%s/%s/device", sysfs, de->d_name);
|
|
||||||
+ snprintf(n, NAME_MAX, "%s/%s/device", sysfs, de->d_name);
|
|
||||||
if(!(ddir = opendir(n)))
|
|
||||||
continue;
|
|
||||||
while ((dde = readdir(ddir)) != NULL) {
|
|
||||||
@@ -240,8 +240,8 @@ struct i2c_adap *gather_i2c_busses(void)
|
|
||||||
if (!strcmp(dde->d_name, ".."))
|
|
||||||
continue;
|
|
||||||
if ((!strncmp(dde->d_name, "i2c-", 4))) {
|
|
||||||
- sprintf(n, "%s/%s/device/%s/name",
|
|
||||||
- sysfs, de->d_name, dde->d_name);
|
|
||||||
+ snprintf(n, NAME_MAX, "%s/%s/device/%s/name",
|
|
||||||
+ sysfs, de->d_name, dde->d_name);
|
|
||||||
if((f = fopen(n, "r")))
|
|
||||||
goto found;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.14.3
|
|
||||||
|
|
@ -1,104 +0,0 @@
|
|||||||
From fbd988b4fa3d008c5fd210a66834d1305de41f6c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jean Delvare <jdelvare@suse.de>
|
|
||||||
Date: Fri, 3 Aug 2018 13:54:26 +0200
|
|
||||||
Subject: [PATCH] libi2c: Mention the correct license in source files
|
|
||||||
|
|
||||||
The libi2c library is released under the LGPL, not GPL, as explained
|
|
||||||
in the README file and documented in lib/Module.mk. Thanks to
|
|
||||||
Aurelien Jarno for pointing out the inconsistency.
|
|
||||||
|
|
||||||
A little bit of history:
|
|
||||||
|
|
||||||
The code started its life two decades ago as part of the lm-sensors
|
|
||||||
project, which was released as a whole under the GPL originally,
|
|
||||||
including the library part (libsensors).
|
|
||||||
|
|
||||||
In 2007, I decided to split the i2c tools, which are not specific
|
|
||||||
to sensor devices, to a separate package.
|
|
||||||
|
|
||||||
In 2009, as I was working on lm-sensors v3, I contacted all the
|
|
||||||
original authors to get their approval to release the upcoming and all
|
|
||||||
future versions of libsensors as LGPL instead, to allow wider
|
|
||||||
adoption. The proposal was accepted by all original authors.
|
|
||||||
|
|
||||||
In 2012, I decided to turn the inlined i2c_smbus_* helper functions
|
|
||||||
into a proper library, with the intent to release it under the LGPL,
|
|
||||||
as is the common practice for libraries. As the authors of this code
|
|
||||||
is a subset of the authors of libsensors, I assumed their agreement
|
|
||||||
for libsensors could be extended to libi2c as well. This is the
|
|
||||||
reason why LGPL is mentioned in README and lib/Module.mk.
|
|
||||||
|
|
||||||
Unfortunately, when working on the library code itself, I forgot to
|
|
||||||
update the comments in the source files. Let's fix them now.
|
|
||||||
|
|
||||||
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
|
||||||
---
|
|
||||||
include/i2c/smbus.h | 21 ++++++---------------
|
|
||||||
lib/smbus.c | 16 +++-------------
|
|
||||||
2 files changed, 9 insertions(+), 28 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/include/i2c/smbus.h b/include/i2c/smbus.h
|
|
||||||
index 18a5305..3003ed7 100644
|
|
||||||
--- a/include/i2c/smbus.h
|
|
||||||
+++ b/include/i2c/smbus.h
|
|
||||||
@@ -1,23 +1,14 @@
|
|
||||||
/*
|
|
||||||
smbus.h - SMBus level access helper functions
|
|
||||||
|
|
||||||
- Copyright (C) 1995-97 Simon G. Vogl
|
|
||||||
- Copyright (C) 1998-99 Frodo Looijaard <frodol@dds.nl>
|
|
||||||
+ Copyright (C) 1995-1997 Simon G. Vogl
|
|
||||||
+ Copyright (C) 1998-1999 Frodo Looijaard <frodol@dds.nl>
|
|
||||||
+ Copyright (C) 2012-2017 Jean Delvare <jdelvare@suse.de>
|
|
||||||
|
|
||||||
- This program is free software; you can redistribute it and/or modify
|
|
||||||
- it under the terms of the GNU General Public License as published by
|
|
||||||
- the Free Software Foundation; either version 2 of the License, or
|
|
||||||
+ This library is free software; you can redistribute it and/or modify
|
|
||||||
+ it under the terms of the GNU Lesser General Public License as published
|
|
||||||
+ by the Free Software Foundation; either version 2.1 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
-
|
|
||||||
- This program is distributed in the hope that it will be useful,
|
|
||||||
- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
- GNU General Public License for more details.
|
|
||||||
-
|
|
||||||
- You should have received a copy of the GNU General Public License
|
|
||||||
- along with this program; if not, write to the Free Software
|
|
||||||
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
|
||||||
- MA 02110-1301 USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef LIB_I2C_SMBUS_H
|
|
||||||
diff --git a/lib/smbus.c b/lib/smbus.c
|
|
||||||
index 3a2c45a..df5a5ad 100644
|
|
||||||
--- a/lib/smbus.c
|
|
||||||
+++ b/lib/smbus.c
|
|
||||||
@@ -5,20 +5,10 @@
|
|
||||||
Copyright (C) 1998-1999 Frodo Looijaard <frodol@dds.nl>
|
|
||||||
Copyright (C) 2012-2013 Jean Delvare <jdelvare@suse.de>
|
|
||||||
|
|
||||||
- This program is free software; you can redistribute it and/or modify
|
|
||||||
- it under the terms of the GNU General Public License as published by
|
|
||||||
- the Free Software Foundation; either version 2 of the License, or
|
|
||||||
+ This library is free software; you can redistribute it and/or modify
|
|
||||||
+ it under the terms of the GNU Lesser General Public License as published
|
|
||||||
+ by the Free Software Foundation; either version 2.1 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
-
|
|
||||||
- This program is distributed in the hope that it will be useful,
|
|
||||||
- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
- GNU General Public License for more details.
|
|
||||||
-
|
|
||||||
- You should have received a copy of the GNU General Public License
|
|
||||||
- along with this program; if not, write to the Free Software
|
|
||||||
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
|
||||||
- MA 02110-1301 USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
--
|
|
||||||
2.14.4
|
|
||||||
|
|
@ -1,87 +0,0 @@
|
|||||||
From d062793e7aebde3ffee796dfd4180716632ae444 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jean Delvare <jdelvare@suse.de>
|
|
||||||
Date: Wed, 8 Nov 2017 22:17:43 +0100
|
|
||||||
Subject: [PATCH 2/3] tools: i2cbusses: Check the return value of snprintf
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
It's very unlikely that these paths will ever be truncated, but
|
|
||||||
better safe than sorry.
|
|
||||||
|
|
||||||
Suggested by Uwe Kleine-König.
|
|
||||||
---
|
|
||||||
tools/i2cbusses.c | 34 ++++++++++++++++++++++++++++------
|
|
||||||
1 file changed, 28 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tools/i2cbusses.c b/tools/i2cbusses.c
|
|
||||||
index cb78cc7..41f5b6b 100644
|
|
||||||
--- a/tools/i2cbusses.c
|
|
||||||
+++ b/tools/i2cbusses.c
|
|
||||||
@@ -137,7 +137,7 @@ struct i2c_adap *gather_i2c_busses(void)
|
|
||||||
FILE *f;
|
|
||||||
char fstype[NAME_MAX], sysfs[NAME_MAX], n[NAME_MAX];
|
|
||||||
int foundsysfs = 0;
|
|
||||||
- int count=0;
|
|
||||||
+ int len, count = 0;
|
|
||||||
struct i2c_adap *adapters;
|
|
||||||
|
|
||||||
adapters = calloc(BUNCH, sizeof(struct i2c_adap));
|
|
||||||
@@ -220,18 +220,32 @@ struct i2c_adap *gather_i2c_busses(void)
|
|
||||||
|
|
||||||
/* this should work for kernels 2.6.5 or higher and */
|
|
||||||
/* is preferred because is unambiguous */
|
|
||||||
- snprintf(n, NAME_MAX, "%s/%s/name", sysfs, de->d_name);
|
|
||||||
+ len = snprintf(n, NAME_MAX, "%s/%s/name", sysfs, de->d_name);
|
|
||||||
+ if (len >= NAME_MAX) {
|
|
||||||
+ fprintf(stderr, "%s: path truncated\n", n);
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
f = fopen(n, "r");
|
|
||||||
/* this seems to work for ISA */
|
|
||||||
if(f == NULL) {
|
|
||||||
- snprintf(n, NAME_MAX, "%s/%s/device/name", sysfs, de->d_name);
|
|
||||||
+ len = snprintf(n, NAME_MAX, "%s/%s/device/name", sysfs,
|
|
||||||
+ de->d_name);
|
|
||||||
+ if (len >= NAME_MAX) {
|
|
||||||
+ fprintf(stderr, "%s: path truncated\n", n);
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
f = fopen(n, "r");
|
|
||||||
}
|
|
||||||
/* non-ISA is much harder */
|
|
||||||
/* and this won't find the correct bus name if a driver
|
|
||||||
has more than one bus */
|
|
||||||
if(f == NULL) {
|
|
||||||
- snprintf(n, NAME_MAX, "%s/%s/device", sysfs, de->d_name);
|
|
||||||
+ len = snprintf(n, NAME_MAX, "%s/%s/device", sysfs,
|
|
||||||
+ de->d_name);
|
|
||||||
+ if (len >= NAME_MAX) {
|
|
||||||
+ fprintf(stderr, "%s: path truncated\n", n);
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
if(!(ddir = opendir(n)))
|
|
||||||
continue;
|
|
||||||
while ((dde = readdir(ddir)) != NULL) {
|
|
||||||
@@ -240,8 +254,16 @@ struct i2c_adap *gather_i2c_busses(void)
|
|
||||||
if (!strcmp(dde->d_name, ".."))
|
|
||||||
continue;
|
|
||||||
if ((!strncmp(dde->d_name, "i2c-", 4))) {
|
|
||||||
- snprintf(n, NAME_MAX, "%s/%s/device/%s/name",
|
|
||||||
- sysfs, de->d_name, dde->d_name);
|
|
||||||
+ len = snprintf(n, NAME_MAX,
|
|
||||||
+ "%s/%s/device/%s/name",
|
|
||||||
+ sysfs, de->d_name,
|
|
||||||
+ dde->d_name);
|
|
||||||
+ if (len >= NAME_MAX) {
|
|
||||||
+ fprintf(stderr,
|
|
||||||
+ "%s: path truncated\n",
|
|
||||||
+ n);
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
if((f = fopen(n, "r")))
|
|
||||||
goto found;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.14.3
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
|||||||
From 066cc543547c7675a67f24b1281954619d300652 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
|
|
||||||
Date: Fri, 24 Nov 2017 10:40:01 +0100
|
|
||||||
Subject: [PATCH 3/3] py-smbus: Fix FSF address in smbusmodule.c
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
The Free Software Foundation address was outdated. Discovered by
|
|
||||||
Fedora's rpmlint. The current address can be found at:
|
|
||||||
https://www.gnu.org/licenses/old-licenses/gpl-2.0.html#SEC4
|
|
||||||
|
|
||||||
Signed-off-by: Ondřej Lysoněk <olysonek@redhat.com>
|
|
||||||
---
|
|
||||||
py-smbus/smbusmodule.c | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/py-smbus/smbusmodule.c b/py-smbus/smbusmodule.c
|
|
||||||
index 48a408b..b189106 100644
|
|
||||||
--- a/py-smbus/smbusmodule.c
|
|
||||||
+++ b/py-smbus/smbusmodule.c
|
|
||||||
@@ -13,7 +13,8 @@
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the Free Software
|
|
||||||
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
|
||||||
+ * MA 02110-1301, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <Python.h>
|
|
||||||
--
|
|
||||||
2.14.3
|
|
||||||
|
|
@ -4,38 +4,24 @@
|
|||||||
# This file and all modifications and additions to the pristine
|
# This file and all modifications and additions to the pristine
|
||||||
# package are under the same license as the package itself.
|
# package are under the same license as the package itself.
|
||||||
|
|
||||||
%if 0%{?rhel} > 7 || 0%{?fedora} > 28
|
|
||||||
%bcond_with python2
|
|
||||||
%else
|
|
||||||
%bcond_without python2
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Name: i2c-tools
|
Name: i2c-tools
|
||||||
Version: 4.0
|
Version: 4.3
|
||||||
Release: 12%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: A heterogeneous set of I2C tools for Linux
|
Summary: A heterogeneous set of I2C tools for Linux
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://i2c.wiki.kernel.org/index.php/I2C_Tools
|
URL: https://i2c.wiki.kernel.org/index.php/I2C_Tools
|
||||||
|
|
||||||
Source0: https://www.kernel.org/pub/software/utils/i2c-tools/%{name}-%{version}.tar.xz
|
Source0: https://www.kernel.org/pub/software/utils/i2c-tools/%{name}-%{version}.tar.xz
|
||||||
# Upstream patch
|
|
||||||
Patch0: 0001-i2c-tools-i2cbusses-Avoid-buffer-overflows-in-sysfs-.patch
|
|
||||||
# Upstream patch
|
|
||||||
Patch1: 0002-tools-i2cbusses-Check-the-return-value-of-snprintf.patch
|
|
||||||
# Upstream patch
|
|
||||||
Patch2: 0003-py-smbus-Fix-FSF-address-in-smbusmodule.c.patch
|
|
||||||
# Upstream patch fixing license headers of libi2c
|
|
||||||
Patch3: 0001-libi2c-Mention-the-correct-license-in-source-files.patch
|
|
||||||
|
|
||||||
# for /etc/udev/makedev.d resp /usr/lib/modprobe.d ownership
|
# for /etc/udev/makedev.d resp /usr/lib/modprobe.d ownership
|
||||||
Requires: udev module-init-tools
|
Requires: systemd-udev kmod
|
||||||
Requires: libi2c%{?_isa} = %{version}-%{release}
|
Requires: libi2c%{?_isa} = %{version}-%{release}
|
||||||
BuildRequires: perl-generators
|
|
||||||
%if %{with python2}
|
|
||||||
BuildRequires: python2-devel
|
|
||||||
%endif
|
|
||||||
BuildRequires: python3-devel
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: perl-generators
|
||||||
|
BuildRequires: python3-devel
|
||||||
ExcludeArch: s390 s390x
|
ExcludeArch: s390 s390x
|
||||||
|
Obsoletes: i2c-tools-eepromer < 4.2-2
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package contains a heterogeneous set of I2C tools for Linux: a bus
|
This package contains a heterogeneous set of I2C tools for Linux: a bus
|
||||||
@ -43,36 +29,9 @@ probing tool, a chip dumper, register-level access helpers, EEPROM
|
|||||||
decoding scripts, and more.
|
decoding scripts, and more.
|
||||||
|
|
||||||
|
|
||||||
%package eepromer
|
|
||||||
Summary: Programs for reading / writing i2c / smbus eeproms
|
|
||||||
Requires: libi2c%{?_isa} = %{version}-%{release}
|
|
||||||
# For the device nodes
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
# /usr/sbin/eeprom is Public Domain, the rest is GPLv2+
|
|
||||||
License: GPLv2+ and Public Domain
|
|
||||||
|
|
||||||
%description eepromer
|
|
||||||
Programs for reading / writing i2c / smbus eeproms. Notice that writing the
|
|
||||||
eeproms in your system is very dangerous and is likely to render your system
|
|
||||||
unusable. Do not install, let alone use this, unless you really, _really_ know
|
|
||||||
what you are doing.
|
|
||||||
|
|
||||||
%if %{with python2}
|
|
||||||
%package -n python2-i2c-tools
|
|
||||||
%{?python_provide:%python_provide python2-i2c-tools}
|
|
||||||
Requires: libi2c%{?_isa} = %{version}-%{release}
|
|
||||||
# Remove before F30
|
|
||||||
Provides: %{name}-python = %{version}-%{release}
|
|
||||||
Provides: %{name}-python%{?_isa} = %{version}-%{release}
|
|
||||||
Obsoletes: %{name}-python < 4.0-4
|
|
||||||
Summary: Python 2 bindings for Linux SMBus access through i2c-dev
|
|
||||||
License: GPLv2
|
|
||||||
|
|
||||||
%description -n python2-i2c-tools
|
|
||||||
Python 2 bindings for Linux SMBus access through i2c-dev
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%package -n python3-i2c-tools
|
%package -n python3-i2c-tools
|
||||||
|
Summary: Python 3 bindings for Linux SMBus access through i2c-dev
|
||||||
|
License: GPLv2
|
||||||
%{?python_provide:%python_provide python3-i2c-tools}
|
%{?python_provide:%python_provide python3-i2c-tools}
|
||||||
Requires: libi2c%{?_isa} = %{version}-%{release}
|
Requires: libi2c%{?_isa} = %{version}-%{release}
|
||||||
%if %{without python2}
|
%if %{without python2}
|
||||||
@ -81,8 +40,6 @@ Obsoletes: %{name}-python < 4.0-4
|
|||||||
# Remove before F31
|
# Remove before F31
|
||||||
Obsoletes: python2-i2c-tools < 4.0-5
|
Obsoletes: python2-i2c-tools < 4.0-5
|
||||||
%endif
|
%endif
|
||||||
Summary: Python 3 bindings for Linux SMBus access through i2c-dev
|
|
||||||
License: GPLv2
|
|
||||||
|
|
||||||
%description -n python3-i2c-tools
|
%description -n python3-i2c-tools
|
||||||
Python 3 bindings for Linux SMBus access through i2c-dev
|
Python 3 bindings for Linux SMBus access through i2c-dev
|
||||||
@ -114,45 +71,29 @@ Obsoletes: i2c-tools-devel < 4.0-1
|
|||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1
|
||||||
%patch0 -p1
|
|
||||||
%patch1 -p1
|
|
||||||
%patch2 -p1
|
|
||||||
%patch3 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" BUILD_STATIC_LIB=0 EXTRA=eeprog
|
make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" BUILD_STATIC_LIB=0 EXTRA=eeprog
|
||||||
pushd eepromer
|
|
||||||
make CFLAGS="$RPM_OPT_FLAGS -I../include" LDFLAGS="$RPM_LD_FLAGS"
|
|
||||||
popd
|
|
||||||
pushd py-smbus
|
pushd py-smbus
|
||||||
%if %{with python2}
|
|
||||||
CFLAGS="$RPM_OPT_FLAGS -I../include" LDFLAGS="$RPM_LD_FLAGS" \
|
|
||||||
%{__python2} setup.py build -b build-py2
|
|
||||||
%endif
|
|
||||||
CFLAGS="$RPM_OPT_FLAGS -I../include" LDFLAGS="$RPM_LD_FLAGS" \
|
CFLAGS="$RPM_OPT_FLAGS -I../include" LDFLAGS="$RPM_LD_FLAGS" \
|
||||||
%{__python3} setup.py build -b build-py3
|
%{__python3} setup.py build -b build-py3
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} BUILD_STATIC_LIB=0 \
|
make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} BUILD_STATIC_LIB=0 \
|
||||||
EXTRA=eeprog libdir=%{_libdir}
|
EXTRA=eeprog libdir=%{_libdir}
|
||||||
install -m 755 eepromer/{eepromer,eeprom} \
|
|
||||||
$RPM_BUILD_ROOT%{_sbindir}
|
|
||||||
install -m 644 eepromer/{eepromer,eeprom}.8 \
|
|
||||||
$RPM_BUILD_ROOT%{_mandir}/man8
|
|
||||||
pushd py-smbus
|
pushd py-smbus
|
||||||
%if %{with python2}
|
|
||||||
%{__python2} setup.py build -b build-py2 install --skip-build --root=$RPM_BUILD_ROOT
|
|
||||||
%endif
|
|
||||||
%{__python3} setup.py build -b build-py3 install --skip-build --root=$RPM_BUILD_ROOT
|
%{__python3} setup.py build -b build-py3 install --skip-build --root=$RPM_BUILD_ROOT
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# cleanup
|
# cleanup
|
||||||
rm -f $RPM_BUILD_ROOT%{_bindir}/decode-edid.pl
|
rm -f $RPM_BUILD_ROOT%{_bindir}/decode-edid.pl
|
||||||
# Remove unpleasant DDC tools. KMS already exposes the EDID block in sysfs,
|
# Remove unpleasant DDC tools. KMS already exposes the EDID block in sysfs,
|
||||||
# and edid-decode is a more complete tool than decode-edid.
|
# and edid-decode is a more complete tool than decode-edid.
|
||||||
rm -f $RPM_BUILD_ROOT%{_bindir}/{ddcmon,decode-edid}
|
rm -f $RPM_BUILD_ROOT%{_bindir}/{ddcmon,decode-edid}
|
||||||
|
|
||||||
# for i2c-dev ondemand loading through kmod
|
# for i2c-dev ondemand loading through kmod
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d
|
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d
|
||||||
echo "alias char-major-89-* i2c-dev" > \
|
echo "alias char-major-89-* i2c-dev" > \
|
||||||
@ -180,29 +121,18 @@ exit 0
|
|||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc CHANGES COPYING README
|
%license COPYING
|
||||||
|
%doc CHANGES README
|
||||||
%config(noreplace) %{_prefix}/lib/modprobe.d/i2c-dev.conf
|
%config(noreplace) %{_prefix}/lib/modprobe.d/i2c-dev.conf
|
||||||
%config(noreplace) %{_sysconfdir}/udev/makedev.d/99-i2c-dev.nodes
|
%config(noreplace) %{_sysconfdir}/udev/makedev.d/99-i2c-dev.nodes
|
||||||
%{_sbindir}/*
|
%{_sbindir}/i2c*
|
||||||
%exclude %{_sbindir}/eepro*
|
%{_sbindir}/eeprog
|
||||||
%exclude %{_sbindir}/i2c-stub*
|
%exclude %{_sbindir}/i2c-stub*
|
||||||
%{_mandir}/man8/*.8.gz
|
%{_mandir}/man8/i2c*.8.*
|
||||||
%exclude %{_mandir}/man8/eepro*
|
%{_mandir}/man8/eeprog.8.*
|
||||||
%exclude %{_mandir}/man8/i2c-stub-from-dump.8.gz
|
%exclude %{_mandir}/man8/i2c-stub-from-dump.8.*
|
||||||
%{_prefix}/lib/modules-load.d/%{name}.conf
|
%{_prefix}/lib/modules-load.d/%{name}.conf
|
||||||
|
|
||||||
%files eepromer
|
|
||||||
%doc eepromer/README*
|
|
||||||
%doc eeprog/README.eeprog
|
|
||||||
%{_sbindir}/eepro*
|
|
||||||
%{_mandir}/man8/eepro*.8.gz
|
|
||||||
|
|
||||||
%if %{with python2}
|
|
||||||
%files -n python2-i2c-tools
|
|
||||||
%doc py-smbus/README
|
|
||||||
%{python2_sitearch}/*
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files -n python3-i2c-tools
|
%files -n python3-i2c-tools
|
||||||
%doc py-smbus/README
|
%doc py-smbus/README
|
||||||
%{python3_sitearch}/*
|
%{python3_sitearch}/*
|
||||||
@ -211,27 +141,70 @@ exit 0
|
|||||||
%doc eeprom/README
|
%doc eeprom/README
|
||||||
%{_bindir}/decode-*
|
%{_bindir}/decode-*
|
||||||
%{_sbindir}/i2c-stub*
|
%{_sbindir}/i2c-stub*
|
||||||
%{_mandir}/man1/decode-*.1.gz
|
%{_mandir}/man1/decode-*.1.*
|
||||||
%{_mandir}/man8/i2c-stub-from-dump.8.gz
|
%{_mandir}/man8/i2c-stub-from-dump.8.*
|
||||||
|
|
||||||
%files -n libi2c
|
%files -n libi2c
|
||||||
%doc COPYING.LGPL
|
%license COPYING.LGPL
|
||||||
%{_libdir}/libi2c.so.*
|
%{_libdir}/libi2c.so.0*
|
||||||
|
|
||||||
%files -n libi2c-devel
|
%files -n libi2c-devel
|
||||||
%dir %{_includedir}/i2c
|
%dir %{_includedir}/i2c
|
||||||
%{_includedir}/i2c/smbus.h
|
%{_includedir}/i2c/smbus.h
|
||||||
%{_libdir}/libi2c.so
|
%{_libdir}/libi2c.so
|
||||||
|
%{_mandir}/man3/libi2c.3.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Dec 05 2018 Ondřej Lysoněk <olysonek@redhat.com> - 4.0-12
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.3-2
|
||||||
- Use versioned dependency on libi2c in subpackages
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
- Resolves: rhbz#1650317
|
Related: rhbz#1991688
|
||||||
|
|
||||||
* Thu Nov 15 2018 Ondřej Lysoněk <olysonek@redhat.com> - 4.0-11
|
* Tue Aug 03 2021 Artem Egorenkov <aegorenk@redhat.com> - 4.3-1
|
||||||
- Ship modprobe.d files in /usr/lib/modprobe.d
|
- Version 4.3
|
||||||
- Resolves: rhbz#1649735
|
- Resolves: rhbz#1989260
|
||||||
|
|
||||||
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.2-4
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jan 16 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 4.2-2
|
||||||
|
- Move eeprog to i2c-tools (shouldn't have been in eepromer sub package)
|
||||||
|
- Drop/obsolete eepromer subpackage, deprecated for 6 years
|
||||||
|
- Drop python2 conditionals
|
||||||
|
- Minor cleanups
|
||||||
|
|
||||||
|
* Thu Jan 07 2021 Artem Egorenkov <aegorenk@redhat.com> - 4.2-1
|
||||||
|
- Version 4.2
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 4.1-5
|
||||||
|
- Rebuilt for Python 3.9
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 4.1-3
|
||||||
|
- Rebuilt for Python 3.8
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Feb 4 2019 Peter Robinson <pbrobinson@fedoraproject.org> 4.1-1
|
||||||
|
- Version 4.1
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-13
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Nov 15 2018 Ondřej Lysoněk <olysonek@redhat.com> - 4.0-12
|
||||||
|
- Ship modprobe.d files in /usr/lib/modprobe.d (rhbz#1195285)
|
||||||
|
|
||||||
|
* Mon Aug 13 2018 Peter Robinson <pbrobinson@fedoraproject.org> 4.0-11
|
||||||
|
- Add requires on libi2c NVR
|
||||||
|
- Minor spec cleanups, use %%license
|
||||||
|
|
||||||
* Fri Aug 03 2018 Ondřej Lysoněk <olysonek@redhat.com> - 4.0-10
|
* Fri Aug 03 2018 Ondřej Lysoněk <olysonek@redhat.com> - 4.0-10
|
||||||
- Add upstream patch fixing libi2c license headers
|
- Add upstream patch fixing libi2c license headers
|
25
gating.yaml
25
gating.yaml
@ -1,25 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- fedora-*
|
|
||||||
decision_context: bodhi_update_push_testing
|
|
||||||
subject_type: koji_build
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
|
|
||||||
|
|
||||||
#Rawhide
|
|
||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- fedora-*
|
|
||||||
decision_context: bodhi_update_push_stable
|
|
||||||
subject_type: koji_build
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
|
|
||||||
|
|
||||||
#gating rhel
|
|
||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-*
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
|
|
||||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
|
|
36
plans.fmf
36
plans.fmf
@ -1,36 +0,0 @@
|
|||||||
/tier1-internal:
|
|
||||||
plan:
|
|
||||||
import:
|
|
||||||
url: https://src.fedoraproject.org/tests/i2c-tools.git
|
|
||||||
name: /plans/tier1/internal
|
|
||||||
|
|
||||||
/tier1-public:
|
|
||||||
plan:
|
|
||||||
import:
|
|
||||||
url: https://src.fedoraproject.org/tests/i2c-tools.git
|
|
||||||
name: /plans/tier1/public
|
|
||||||
|
|
||||||
/tier2-tier3-internal:
|
|
||||||
plan:
|
|
||||||
import:
|
|
||||||
url: https://src.fedoraproject.org/tests/i2c-tools.git
|
|
||||||
name: /plans/tier2-tier3/internal
|
|
||||||
|
|
||||||
/tier2-tier3-public:
|
|
||||||
plan:
|
|
||||||
import:
|
|
||||||
url: https://src.fedoraproject.org/tests/i2c-tools.git
|
|
||||||
name: /plans/tier2-tier3/public
|
|
||||||
|
|
||||||
/others-internal:
|
|
||||||
plan:
|
|
||||||
import:
|
|
||||||
url: https://src.fedoraproject.org/tests/i2c-tools.git
|
|
||||||
name: /plans/others/internal
|
|
||||||
|
|
||||||
/others-public:
|
|
||||||
plan:
|
|
||||||
import:
|
|
||||||
url: https://src.fedoraproject.org/tests/i2c-tools.git
|
|
||||||
name: /plans/others/public
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user