pool/biosdevname
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 508814 from home:fschnizlein:branches:Base:System

Browse Source 
- Update to latest HEAD to 02811d5165c2eeecf8797fe9b5088d6e78bd25db
  * Changed source to github
  * Ignore naming of non-Ethernet network interfaces
  * Prevent reading of VPD-DCM strings for SRIOV-vfs
  - removed patch v0.7.2_to_HEAD_66eab208.patch

OBS-URL: https://build.opensuse.org/request/show/508814
OBS-URL: https://build.opensuse.org/package/show/Base:System/biosdevname?expand=0&rev=67
This commit is contained in:
Thomas Renninger 2017-07-10 15:40:42 +00:00 committed by Git OBS Bridge
parent abc80c5025
commit bbccb5f092
8 changed files with 35 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
_service Normal file
View File

@ -0,0 +1,15 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/dell/biosdevname.git</param>
<param name="subdir"></param>
<param name="filename">biosdevname</param>
<param name="versionformat">0.7.2</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">biosdevname*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/dell/biosdevname.git</param>
<param name="changesrevision">02811d5165c2eeecf8797fe9b5088d6e78bd25db</param></service></servicedata>

3
biosdevname-0.7.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:954575f482ff5de2d49c335b563990859a3eb3506e8fa976f6915eba870d71f6
size 193926

3
biosdevname-0.7.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cfd7295af780ec212bedbebef34652fb1186796135917dc0ed86e57e568ed2df
size 81868

9
biosdevname.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Jun 9 16:27:56 UTC 2017 - fschnizlein@suse.com
- Update to latest HEAD to 02811d5165c2eeecf8797fe9b5088d6e78bd25db
* Changed source to github
* Ignore naming of non-Ethernet network interfaces
* Prevent reading of VPD-DCM strings for SRIOV-vfs
- removed patch v0.7.2_to_HEAD_66eab208.patch
-------------------------------------------------------------------
Thu Jan 19 17:44:56 UTC 2017 - felix.gerling@suse.com

10
biosdevname.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package biosdevname
#
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -23,14 +23,13 @@ Release: 0
Summary: Udev helper for naming devices per BIOS names
License: GPL-2.0
Group: System/Base
Url: http://linux.dell.com/files/biosdevname/
Source0: http://linux.dell.com/files/biosdevname/biosdevname-%{version}/%{name}-%{version}.tar.gz
Url: https://github.com/dell/%{name}
Source0: %{name}-%{version}.tar.xz
Patch1: ignore-broken-BIOSes
Patch2: whitelist-dell
Patch3: udev-rule-path.patch
Patch4: biosdevname-pic.patch
Patch5: biosdevname-dom0.patch
Patch6: v0.7.2_to_HEAD_66eab208.patch
BuildRequires: automake
# to figure out how to name/location of the rules file
BuildRequires: libudev-devel
@ -70,7 +69,6 @@ You can enable/disable usage of biosdevname with boot option
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
sed -i -e 's#@@BIOSDEVNAME_RULEDEST@@#'%{_udevrulesdir}'/71-biosdevname.rules#' configure.ac
@ -90,7 +88,7 @@ rm %{buildroot}/sbin/%{name}S || :
%defattr(-,root,root,-)
%doc COPYING README
/sbin/%{name}
%{_udevrulesdir}/*%{name}.rules
%{_udevrulesdir}/71-biosdevname.rules
%{_mandir}/man1/*

24
udev-rule-path.patch
View File

@ -26,27 +26,3 @@ Index: biosdevname-0.7.1/configure.ac
RULEDIR=$(dirname $RULEDEST)
AC_SUBST(RULEDEST, $RULEDEST)
AC_SUBST(RULEDIR, $RULEDIR)
Index: biosdevname-0.7.1/configure
===================================================================
--- biosdevname-0.7.1.orig/configure
+++ biosdevname-0.7.1/configure
@@ -10560,18 +10560,7 @@ done
# this is ugly, but accounts for SLES 10, Red Hat/Fedora, and Ubuntu
# handles default udev rules as of udev 114 or thereabouts
-RULEDEST=/lib/udev/rules.d/71-biosdevname.rules
-
-if [ -e /etc/udev/rules.d/60-net.rules ]; then
- # RHEL 5 / Fedora
- RULEDEST=/etc/udev/rules.d/60-biosdevname.rules
-elif [ -e /etc/udev/rules.d/31-network.rules ]; then
- # SLES 10
- RULEDEST=/etc/udev/rules.d/31-biosdevname.rules
-elif [ -e /etc/udev/rules.d/25-iftab.rules ]; then
- # older Ubuntu
- RULEDEST=/etc/udev/rules.d/25-biosdevname.rules
-fi
+RULEDEST=@@BIOSDEVNAME_RULEDEST@@
RULEDIR=$(dirname $RULEDEST)
RULEDEST=$RULEDEST

33
v0.7.2_to_HEAD_66eab208.patch
View File

@ -1,33 +0,0 @@
commit 66eab208d3c2abe947ba0a793094ee856e8fb3ee
Merge: 2527399 d1d6296
Author: Mario Limonciello <superm1@gmail.com>
Date: Tue Oct 18 11:57:41 2016 -0500
Merge pull request #1 from msekletar/use-after-free
Fix use-after-free of fd
commit d1d62966032784f292e6875ba4373b18149a5754
Author: Michal Sekletar <msekleta@redhat.com>
Date: Tue Dec 22 10:34:16 2015 +0100
Fix use-after-free of fd
This bug got introduced in 51219cac581b5eaced5b172dbbb4586889cb27e1. I
overlooked that we are already properly closing fd on non-error code
path and I added redundant call to close.
Closing already closed fd is harmless though. Function returns EBADF and
fails silently.
diff --git a/src/dmidecode/util.c b/src/dmidecode/util.c
index 3340e1f..ea06663 100644
--- a/src/dmidecode/util.c
+++ b/src/dmidecode/util.c
@@ -162,6 +162,5 @@ void *mem_chunk(size_t base, size_t len, const char *devmem)
if(close(fd)==-1)
perror(devmem);
- close(fd);
return p;
}