7735872d76
- Do not disable rule via perl script in .spec file, better use a patch
- Modify configure.ac via sed to make use of %{_udevruledir} from .spec file
- Remove already integrated patches in latest source code:
Delete biosdevname_v0.5.0_to_git_c140ce659a204d67e4cc.patch
Delete biosdevname_udevrule_rename_all_network_devices.patch
Delete fix_several_PCI_root_ports_in_one_bus.patch
Modify udev-rule-path.patch
Modify whitelist-dell
OBS-URL: https://build.opensuse.org/package/show/Base:System/biosdevname?expand=0&rev=37
53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
Index: biosdevname-0.6.1/configure.ac
|
|
===================================================================
|
|
--- biosdevname-0.6.1.orig/configure.ac 2014-12-01 16:05:47.000000000 +0100
|
|
+++ biosdevname-0.6.1/configure.ac 2015-01-22 13:24:22.231621837 +0100
|
|
@@ -66,20 +66,9 @@
|
|
AC_FUNC_VPRINTF
|
|
AC_CHECK_FUNCS([dup2 gettimeofday memset munmap select socket strcasecmp strchr strdup strerror strncasecmp strpbrk strrchr strstr strtol strtoul])
|
|
|
|
-# 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
|
|
+# Only way to make this robust: Replace for each distro with the correct path
|
|
+# /lib/udev/rules.d/71-biosdevname.rules
|
|
+RULEDEST=@@BIOSDEVNAME_RULEDEST@@
|
|
RULEDIR=$(dirname $RULEDEST)
|
|
AC_SUBST(RULEDEST, $RULEDEST)
|
|
AC_SUBST(RULEDIR, $RULEDIR)
|
|
Index: biosdevname-0.6.1/configure
|
|
===================================================================
|
|
--- biosdevname-0.6.1.orig/configure 2014-12-01 16:06:21.000000000 +0100
|
|
+++ biosdevname-0.6.1/configure 2015-01-22 13:48:51.915645203 +0100
|
|
@@ -7305,18 +7305,7 @@
|
|
|
|
# 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
|
|
|