Rebase to 0.7.2
- cleanup in BuildRequires - we no longer depend on autotools during build - patches are now applied using %autosetup
This commit is contained in:
Michal Sekletar
parent
e685d4adfb
commit
b0f915a575
@ -1,8 +1,17 @@
|
||||
From db1371e4d22465c27b5ed8d851cea6e72f0176f7 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Wed, 21 Mar 2018 18:10:08 +0100
|
||||
Subject: [PATCH 1/2] Disable biosdevname by default
|
||||
|
||||
---
|
||||
biosdevname.rules.in | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/biosdevname.rules.in b/biosdevname.rules.in
|
||||
index 0a32aa5..52aaea5 100644
|
||||
index 0a32aa5..1dcca74 100644
|
||||
--- a/biosdevname.rules.in
|
||||
+++ b/biosdevname.rules.in
|
||||
@@ -12,13 +15,13 @@ ENV{biosdevname}=="?*", ENV{UDEV_BIOSDEVNAME}="$env{biosdevname}"
|
||||
@@ -12,13 +12,13 @@ ENV{biosdevname}=="?*", ENV{UDEV_BIOSDEVNAME}="$env{biosdevname}"
|
||||
ENV{UDEV_BIOSDEVNAME}=="0", GOTO="netdevicename_end"
|
||||
ENV{UDEV_BIOSDEVNAME}=="1", GOTO="netdevicename_start"
|
||||
|
||||
@ -19,3 +28,6 @@ index 0a32aa5..52aaea5 100644
|
||||
+SUBSYSTEMS=="pci", PROGRAM="/sbin/biosdevname --smbios 2.6 --nopirq --policy physical -i %k", NAME="%c" OPTIONS+="string_escape=replace"
|
||||
|
||||
LABEL="netdevicename_end"
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
From 0b23cc14838c3385fa84a1b07ea6d476954c09ac Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Wed, 21 Mar 2018 18:40:10 +0100
|
||||
Subject: [PATCH 2/2] Install udev rules file in
|
||||
/usr/lib/udev/rules.d/71-biosdevname.rules
|
||||
|
||||
---
|
||||
configure | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index bd8e5a3..161f732 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -10560,7 +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
|
||||
+RULEDEST=/usr/lib/udev/rules.d/71-biosdevname.rules
|
||||
|
||||
if [ -e /etc/udev/rules.d/60-net.rules ]; then
|
||||
# RHEL 5 / Fedora
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
diff -up biosdevname-0.5.0/biosdevname.rules.in.new biosdevname-0.5.0/biosdevname.rules.in
|
||||
--- biosdevname-0.5.0/biosdevname.rules.in.new 2013-03-12 13:26:06.000000000 +0100
|
||||
+++ biosdevname-0.5.0/biosdevname.rules.in 2013-09-02 19:07:01.953956219 +0200
|
||||
@@ -1,7 +1,8 @@
|
||||
SUBSYSTEM!="net", GOTO="netdevicename_end"
|
||||
-KERNEL!="eth*", GOTO="netdevicename_end"
|
||||
ACTION!="add", GOTO="netdevicename_end"
|
||||
NAME=="?*", GOTO="netdevicename_end"
|
||||
+ATTR{type}!="1", GOTO="netdevicename_end"
|
||||
+ENV{DEVTYPE}=="?*", GOTO="netdevicename_end"
|
||||
|
||||
# kernel command line "biosdevname={0|1}" can turn off/on biosdevname
|
||||
IMPORT{cmdline}="biosdevname"
|
||||
@@ -18,6 +19,6 @@ LABEL="netdevicename_start"
|
||||
|
||||
# using NAME= instead of setting INTERFACE_NAME, so that persistent
|
||||
# names aren't generated for these devices, they are "named" on each boot.
|
||||
-PROGRAM="/sbin/biosdevname --policy physical -i %k", NAME="%c", OPTIONS+="string_escape=replace"
|
||||
+SUBSYSTEMS=="pci", PROGRAM="/sbin/biosdevname --policy physical -i %k", NAME="%c", OPTIONS+="string_escape=replace"
|
||||
|
||||
LABEL="netdevicename_end"
|
||||
@ -1,28 +1,22 @@
|
||||
Name: biosdevname
|
||||
Version: 0.6.2
|
||||
Release: 6%{?dist}
|
||||
Version: 0.7.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Udev helper for naming devices per BIOS names
|
||||
|
||||
Group: System Environment/Base
|
||||
License: GPLv2
|
||||
URL: http://linux.dell.com/files/%{name}
|
||||
# SMBIOS only exists on these arches. It's also likely that other
|
||||
# arches don't expect the PCI bus to be sorted breadth-first, or of
|
||||
# so, there haven't been any comments about that on LKML.
|
||||
ExclusiveArch: %{ix86} x86_64 ia64
|
||||
ExclusiveArch: %{ix86} x86_64
|
||||
Source0: http://linux.dell.com/files/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: pciutils-devel, zlib-devel
|
||||
# to figure out how to name the rules file
|
||||
BuildRequires: systemd
|
||||
#To generate the configure script
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
# for ownership of /etc/udev/rules.d
|
||||
Requires: systemd
|
||||
BuildRequires: gcc
|
||||
BuildRequires: git
|
||||
|
||||
Patch0: 0001-Place-udev-rules-to-usr-lib.patch
|
||||
Patch1: biosdevname-0.6.1-rules.patch
|
||||
Patch1: 0001-Disable-biosdevname-by-default.patch
|
||||
Patch2: 0002-Install-udev-rules-file-in-usr-lib-udev-rules.d-71-b.patch
|
||||
|
||||
%description
|
||||
biosdevname in its simplest form takes a kernel device name as an
|
||||
@ -32,20 +26,12 @@ the chassis is "Gb1") doesn't map directly and obviously to the kernel
|
||||
name (e.g. eth0).
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%autosetup -S git_am
|
||||
|
||||
%build
|
||||
autoreconf -iv
|
||||
#If configure script doesn't exist generate it with autogen script
|
||||
[ -e ./configure ] || ./autogen.sh --no-configure
|
||||
|
||||
# this is a udev rule, so it needs to live in / rather than /usr
|
||||
%configure --disable-rpath --prefix=%{_prefix} --sbindir=%{_prefix}/sbin
|
||||
%configure --prefix=%{_prefix}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
make install install-data DESTDIR=%{buildroot}
|
||||
|
||||
@ -56,8 +42,10 @@ make install install-data DESTDIR=%{buildroot}
|
||||
%{_prefix}/lib/udev/rules.d/*.rules
|
||||
%{_mandir}/man1/%{name}.1*
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Mar 21 2018 Michal Sekletar <msekleta@redhat.com> - 0.7.2-1
|
||||
- rebase to biosdevname-0.7.2
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user