sysfsutils: update 2.1.0 -> 2.1.1

Drop all patches, as issues are all fixed upstream.

License-Update: clarification that GPL applies to all executables
(not just test), formatting.

(From OE-Core rev: bb073380310332325bb02bcda0d8e3a9e31610d3)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2023-06-20 13:34:03 +01:00
committed by Richard Purdie
parent 81b14b4d85
commit cec6d2af49
4 changed files with 5 additions and 112 deletions

View File

@@ -1,15 +0,0 @@
Upstream-Status: Submitted [http://sourceforge.net/tracker/?func=detail&aid=3600345&group_id=44427&atid=439544]
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff -Nurd sysfsutils-2.1.0/configure.ac sysfsutils-2.1.0/configure.ac
--- sysfsutils-2.1.0/configure.ac 2006-08-07 08:08:00.000000000 +0300
+++ sysfsutils-2.1.0/configure.ac 2013-01-11 08:13:08.651550634 +0200
@@ -2,7 +2,7 @@
AC_INIT(sysfsutils, 2.1.0, linux-diag-devel@lists.sourceforge.net)
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([config.h.in])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
# Checks for KLIBC support (should be before AC_PROG_LIBTOOL and AC_PROG_CC)
AC_CHECK_KLIBC

View File

@@ -1,65 +0,0 @@
Upstream-Status: Pending
Fix out of tree build issues so ${B} != ${S} works.
RP 2013/03/18
Index: sysfsutils-2.1.0/cmd/Makefile.am
===================================================================
--- sysfsutils-2.1.0.orig/cmd/Makefile.am 2013-03-08 08:57:27.224556508 +0000
+++ sysfsutils-2.1.0/cmd/Makefile.am 2013-03-08 08:57:27.480556502 +0000
@@ -1,6 +1,6 @@
bin_PROGRAMS = systool
systool_SOURCES = systool.c names.c names.h
-INCLUDES = -I../include
+INCLUDES = -I$(srcdir)/../include
LDADD = ../lib/libsysfs.la
EXTRA_CFLAGS = @EXTRA_CFLAGS@
AM_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CFLAGS)
Index: sysfsutils-2.1.0/lib/Makefile.am
===================================================================
--- sysfsutils-2.1.0.orig/lib/Makefile.am 2013-03-08 08:57:27.224556508 +0000
+++ sysfsutils-2.1.0/lib/Makefile.am 2013-03-08 08:57:27.480556502 +0000
@@ -1,7 +1,7 @@
lib_LTLIBRARIES = libsysfs.la
libsysfs_la_SOURCES = sysfs_utils.c sysfs_attr.c sysfs_class.c dlist.c \
sysfs_device.c sysfs_driver.c sysfs_bus.c sysfs_module.c sysfs.h
-INCLUDES = -I../include
+INCLUDES = -I$(srcdir)/../include
libsysfs_la_LDFLAGS = -version-info 2:1:0
EXTRA_CFLAGS = @EXTRA_CLFAGS@
libsysfs_la_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CLFAGS)
Index: sysfsutils-2.1.0/test/Makefile.am
===================================================================
--- sysfsutils-2.1.0.orig/test/Makefile.am 2013-03-08 08:57:27.224556508 +0000
+++ sysfsutils-2.1.0/test/Makefile.am 2013-03-08 09:06:48.196543326 +0000
@@ -2,14 +2,14 @@
BUILT_SOURCES = test.h
CLEANFILES = test.h
test.h:
- ./create-test
+ $(srcdir)/create-test $(srcdir)/libsysfs.conf
get_device_SOURCES = get_device.c
get_driver_SOURCES = get_driver.c
get_module_SOURCES = get_module.c
testlibsysfs_SOURCES = test.c test_attr.c test_bus.c test_class.c \
test_device.c test_driver.c test_module.c test_utils.c \
testout.c test-defs.h libsysfs.conf create-test
-INCLUDES = -I../include
+INCLUDES = -I$(srcdir)/../include
LDADD = ../lib/libsysfs.la
EXTRA_CFLAGS = @EXTRA_CLFAGS@
AM_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CLFAGS)
Index: sysfsutils-2.1.0/test/create-test
===================================================================
--- sysfsutils-2.1.0.orig/test/create-test 2005-11-28 10:22:10.000000000 +0000
+++ sysfsutils-2.1.0/test/create-test 2013-03-08 09:07:03.372542838 +0000
@@ -2,7 +2,7 @@
rm -f test.h
-conf_file=./libsysfs.conf
+conf_file=$1
. $conf_file

View File

@@ -1,23 +0,0 @@
Upstream-Status: Backport [from fedora core 9]
This patch is from the Fedora Core 9 sysfsutils-2.1.0-3.fc9 package.
It fixes a problem in the upstream package where not all devices
will be returned by the function.
The package License indicates this is GPLv2 licensed.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
diff -puN lib/sysfs_class.c~sysfsutils_class_dup lib/sysfs_class.c
--- sysfsutils-2.1.0/lib/sysfs_class.c~sysfsutils_class_dup 2006-09-07 17:01:26.000000000 -0500
+++ sysfsutils-2.1.0-bjking1/lib/sysfs_class.c 2006-09-07 17:01:26.000000000 -0500
@@ -66,7 +66,7 @@ static int cdev_name_equal(void *a, void
return 0;
if (strncmp((char *)a, ((struct sysfs_class_device *)b)->name,
- strlen((char *)a)) == 0)
+ SYSFS_NAME_LEN) == 0)
return 1;
return 0;

View File

@@ -5,17 +5,13 @@ HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
LICENSE = "GPL-2.0-only & LGPL-2.1-only"
LICENSE:${PN} = "GPL-2.0-only"
LICENSE:libsysfs = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=3d06403ea54c7574a9e581c6478cc393 \
file://cmd/GPL;md5=d41d4e2e1e108554e0388ea4aecd8d27 \
file://lib/LGPL;md5=b75d069791103ffe1c0d6435deeff72e"
PR = "r5"
LIC_FILES_CHKSUM = "file://COPYING;md5=dcc19fa9307a50017fca61423a7d9754 \
file://cmd/GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://lib/LGPL;md5=4fbd65380cdd255951079008b364516c"
SRC_URI = "git://github.com/linux-ras/sysfsutils.git;protocol=https;branch=master \
file://sysfsutils-2.0.0-class-dup.patch \
file://obsolete_automake_macros.patch \
file://separatebuild.patch"
SRC_URI = "git://github.com/linux-ras/sysfsutils.git;protocol=https;branch=master"
SRCREV = "0d5456e1c9d969cdad6accef2ae2d4881d5db085"
SRCREV = "da2f1f8500c0af6663a56ce2bff07f67e60a92e0"
S = "${WORKDIR}/git"