Marcus Meissner
d0b3ecb44a
- Update to 0.7.1 * no upstream changelog provided OBS-URL: https://build.opensuse.org/request/show/354362 OBS-URL: https://build.opensuse.org/package/show/Base:System/biosdevname?expand=0&rev=60
53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
Index: biosdevname-0.7.1/configure.ac
|
|
===================================================================
|
|
--- biosdevname-0.7.1.orig/configure.ac
|
|
+++ biosdevname-0.7.1/configure.ac
|
|
@@ -66,20 +66,9 @@ AC_FUNC_STAT
|
|
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.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
|
|
|