pool/biosdevname
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
f278df9945
biosdevname/udev-rule-path.patch

72 lines
3.1 KiB
Diff
Raw Normal View History

Accepting request 1154678 from home:trenn:branches:Base:System - Binary is in /usr/sbin not /sbin (cmp with install to /usr below) (bsc#1220125) M udev-rule-path.patch OBS-URL: https://build.opensuse.org/request/show/1154678 OBS-URL: https://build.opensuse.org/package/show/Base:System/biosdevname?expand=0&rev=85
2024-03-04 14:08:38 +01:00
Index: biosdevname-0.7.3.7.g495ab76/configure.ac
Accepting request 172844 from home:namtrac:branches:Base:System - Use correct directory for udev rules OBS-URL: https://build.opensuse.org/request/show/172844 OBS-URL: https://build.opensuse.org/package/show/Base:System/biosdevname?expand=0&rev=15
2013-04-22 16:11:36 +02:00
===================================================================
Accepting request 1154678 from home:trenn:branches:Base:System - Binary is in /usr/sbin not /sbin (cmp with install to /usr below) (bsc#1220125) M udev-rule-path.patch OBS-URL: https://build.opensuse.org/request/show/1154678 OBS-URL: https://build.opensuse.org/package/show/Base:System/biosdevname?expand=0&rev=85
2024-03-04 14:08:38 +01:00
--- biosdevname-0.7.3.7.g495ab76.orig/configure.ac
+++ biosdevname-0.7.3.7.g495ab76/configure.ac
@@ -66,27 +66,18 @@ AC_FUNC_STAT
- Update to version 0.6.1 - 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
2015-01-22 15:13:09 +01:00
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([dup2 gettimeofday memset munmap select socket strcasecmp strchr strdup strerror strncasecmp strpbrk strrchr strstr strtol strtoul])
Accepting request 172844 from home:namtrac:branches:Base:System - Use correct directory for udev rules OBS-URL: https://build.opensuse.org/request/show/172844 OBS-URL: https://build.opensuse.org/package/show/Base:System/biosdevname?expand=0&rev=15
2013-04-22 16:11:36 +02:00
- Update to version 0.6.1 - 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
2015-01-22 15:13:09 +01:00
-# 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
-
Accepting request 172844 from home:namtrac:branches:Base:System - Use correct directory for udev rules OBS-URL: https://build.opensuse.org/request/show/172844 OBS-URL: https://build.opensuse.org/package/show/Base:System/biosdevname?expand=0&rev=15
2013-04-22 16:11:36 +02:00
-if [[ -e /etc/udev/rules.d/60-net.rules ]]; then
- Update to version 0.6.1 - 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
2015-01-22 15:13:09 +01:00
- # 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
Accepting request 1154678 from home:trenn:branches:Base:System - Binary is in /usr/sbin not /sbin (cmp with install to /usr below) (bsc#1220125) M udev-rule-path.patch OBS-URL: https://build.opensuse.org/request/show/1154678 OBS-URL: https://build.opensuse.org/package/show/Base:System/biosdevname?expand=0&rev=85
2024-03-04 14:08:38 +01:00
+SBINDIR=@@BIOSDEVNAME_SBINDIR@@
- Update to version 0.6.1 - 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
2015-01-22 15:13:09 +01:00
+RULEDEST=@@BIOSDEVNAME_RULEDEST@@
RULEDIR=$(dirname $RULEDEST)
AC_SUBST(RULEDEST, $RULEDEST)
AC_SUBST(RULEDIR, $RULEDIR)
Accepting request 1154678 from home:trenn:branches:Base:System - Binary is in /usr/sbin not /sbin (cmp with install to /usr below) (bsc#1220125) M udev-rule-path.patch OBS-URL: https://build.opensuse.org/request/show/1154678 OBS-URL: https://build.opensuse.org/package/show/Base:System/biosdevname?expand=0&rev=85
2024-03-04 14:08:38 +01:00
+AC_SUBST(SBINDIR, $SBINDIR)
echo "PACKAGE_NAME='$PACKAGE_NAME'" > version
echo "PACKAGE_VERSION='$PACKAGE_VERSION'" >> version
echo "PACKAGE_STRING='$PACKAGE_STRING'" >> version
-AC_CONFIG_FILES([Makefile biosdevname.spec.fedora biosdevname.spec.suse src/bios_dev_name.h])
+AC_CONFIG_FILES([Makefile biosdevname.spec.fedora biosdevname.spec.suse src/bios_dev_name.h biosdevname.rules])
AC_OUTPUT
Index: biosdevname-0.7.3.7.g495ab76/biosdevname.rules.in
===================================================================
--- biosdevname-0.7.3.7.g495ab76.orig/biosdevname.rules.in
+++ biosdevname-0.7.3.7.g495ab76/biosdevname.rules.in
@@ -22,6 +22,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.
-SUBSYSTEMS=="pci", PROGRAM="/sbin/biosdevname --policy physical --smbios 2.6 --nopirq -i %k", NAME="%c", OPTIONS+="string_escape=replace"
+SUBSYSTEMS=="pci", PROGRAM="@SBINDIR@/biosdevname --policy physical --smbios 2.6 --nopirq -i %k", NAME="%c", OPTIONS+="string_escape=replace"
LABEL="netdevicename_end"
Index: biosdevname-0.7.3.7.g495ab76/Makefile.am
===================================================================
--- biosdevname-0.7.3.7.g495ab76.orig/Makefile.am
+++ biosdevname-0.7.3.7.g495ab76/Makefile.am
@@ -2,14 +2,14 @@ AUTOMAKE_OPTIONS = subdir-objects
SUBDIRS =
EXTRA_DIST =
-dist_noinst_DATA = biosdevname.rules.in biosdevname.spec.fedora biosdevname.spec.suse biosdevname.1
+dist_noinst_DATA = biosdevname.rules biosdevname.spec.fedora biosdevname.spec.suse biosdevname.1
CLEANFILES = version src/bios_dev_name.h
install-data-local:
mkdir -p $(DESTDIR)@RULEDIR@
- $(INSTALL_DATA) $(top_srcdir)/biosdevname.rules.in $(DESTDIR)@RULEDEST@
+ $(INSTALL_DATA) $(top_srcdir)/biosdevname.rules $(DESTDIR)@RULEDEST@
uninstall-local:
rm -f $(DESTDIR)@RULEDEST@
Reference in New Issue Copy Permalink