| 1 |
commit: 1dc1195271f1723ea1708dd29133106a57c11258 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 4 03:20:36 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 4 03:21:54 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc11952 |
| 7 |
|
| 8 |
sys-fs/udev: eliminate pointless backslashes |
| 9 |
|
| 10 |
Overuse of backslash escapes led to a weird directory named ' ' being |
| 11 |
installed in the root directory. |
| 12 |
|
| 13 |
Thanks to Coacher for spotting the weird directory. |
| 14 |
|
| 15 |
Bug: https://bugs.gentoo.org/584256 |
| 16 |
|
| 17 |
Package-Manager: portage-2.3.0_rc1_p14 |
| 18 |
|
| 19 |
sys-fs/udev/{udev-225.ebuild => udev-225-r1.ebuild} | 19 ++++++++----------- |
| 20 |
sys-fs/udev/{udev-230.ebuild => udev-230-r1.ebuild} | 19 ++++++++----------- |
| 21 |
sys-fs/udev/udev-9999.ebuild | 19 ++++++++----------- |
| 22 |
3 files changed, 24 insertions(+), 33 deletions(-) |
| 23 |
|
| 24 |
diff --git a/sys-fs/udev/udev-225.ebuild b/sys-fs/udev/udev-225-r1.ebuild |
| 25 |
similarity index 96% |
| 26 |
rename from sys-fs/udev/udev-225.ebuild |
| 27 |
rename to sys-fs/udev/udev-225-r1.ebuild |
| 28 |
index 3a1d0ba..18bfd8c 100644 |
| 29 |
--- a/sys-fs/udev/udev-225.ebuild |
| 30 |
+++ b/sys-fs/udev/udev-225-r1.ebuild |
| 31 |
@@ -250,8 +250,8 @@ multilib_src_compile() { |
| 32 |
|
| 33 |
multilib_src_install() { |
| 34 |
if multilib_is_native_abi; then |
| 35 |
- local lib_LTLIBRARIES="libudev.la" \ |
| 36 |
- pkgconfiglib_DATA="src/libudev/libudev.pc" |
| 37 |
+ local lib_LTLIBRARIES="libudev.la" |
| 38 |
+ local pkgconfiglib_DATA="src/libudev/libudev.pc" |
| 39 |
|
| 40 |
local targets=( |
| 41 |
install-libLTLIBRARIES |
| 42 |
@@ -277,18 +277,16 @@ multilib_src_install() { |
| 43 |
lib_LTLIBRARIES="${lib_LTLIBRARIES}" |
| 44 |
pkgconfiglib_DATA="${pkgconfiglib_DATA}" |
| 45 |
pkgconfigdata_DATA="src/udev/udev.pc" |
| 46 |
- INSTALL_DIRS='$(sysconfdir)/udev/rules.d \ |
| 47 |
- $(sysconfdir)/udev/hwdb.d \ |
| 48 |
- $(sysconfdir)/systemd/network' |
| 49 |
+ INSTALL_DIRS='$(sysconfdir)/udev/rules.d $(sysconfdir)/udev/hwdb.d $(sysconfdir)/systemd/network' |
| 50 |
dist_bashcompletion_DATA="shell-completion/bash/udevadm" |
| 51 |
dist_network_DATA="network/99-default.link" |
| 52 |
) |
| 53 |
emake -j1 DESTDIR="${D}" "${targets[@]}" |
| 54 |
doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8} |
| 55 |
else |
| 56 |
- local lib_LTLIBRARIES="libudev.la" \ |
| 57 |
- pkgconfiglib_DATA="src/libudev/libudev.pc" \ |
| 58 |
- include_HEADERS="src/libudev/libudev.h" |
| 59 |
+ local lib_LTLIBRARIES="libudev.la" |
| 60 |
+ local pkgconfiglib_DATA="src/libudev/libudev.pc" |
| 61 |
+ local include_HEADERS="src/libudev/libudev.h" |
| 62 |
|
| 63 |
local targets=( |
| 64 |
install-libLTLIBRARIES |
| 65 |
@@ -309,9 +307,8 @@ multilib_src_install_all() { |
| 66 |
dodoc TODO |
| 67 |
|
| 68 |
prune_libtool_files --all |
| 69 |
- rm -f \ |
| 70 |
- "${D}"/lib/udev/rules.d/99-systemd.rules \ |
| 71 |
- "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} |
| 72 |
+ rm -f "${D}"/lib/udev/rules.d/99-systemd.rules |
| 73 |
+ rm -f "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} |
| 74 |
|
| 75 |
# see src_prepare() for content of 40-gentoo.rules |
| 76 |
insinto /lib/udev/rules.d |
| 77 |
|
| 78 |
diff --git a/sys-fs/udev/udev-230.ebuild b/sys-fs/udev/udev-230-r1.ebuild |
| 79 |
similarity index 96% |
| 80 |
rename from sys-fs/udev/udev-230.ebuild |
| 81 |
rename to sys-fs/udev/udev-230-r1.ebuild |
| 82 |
index 08f87f6..ef0b093 100644 |
| 83 |
--- a/sys-fs/udev/udev-230.ebuild |
| 84 |
+++ b/sys-fs/udev/udev-230-r1.ebuild |
| 85 |
@@ -251,8 +251,8 @@ multilib_src_compile() { |
| 86 |
|
| 87 |
multilib_src_install() { |
| 88 |
if multilib_is_native_abi; then |
| 89 |
- local lib_LTLIBRARIES="libudev.la" \ |
| 90 |
- pkgconfiglib_DATA="src/libudev/libudev.pc" |
| 91 |
+ local lib_LTLIBRARIES="libudev.la" |
| 92 |
+ local pkgconfiglib_DATA="src/libudev/libudev.pc" |
| 93 |
|
| 94 |
local targets=( |
| 95 |
install-libLTLIBRARIES |
| 96 |
@@ -278,18 +278,16 @@ multilib_src_install() { |
| 97 |
lib_LTLIBRARIES="${lib_LTLIBRARIES}" |
| 98 |
pkgconfiglib_DATA="${pkgconfiglib_DATA}" |
| 99 |
pkgconfigdata_DATA="src/udev/udev.pc" |
| 100 |
- INSTALL_DIRS='$(sysconfdir)/udev/rules.d \ |
| 101 |
- $(sysconfdir)/udev/hwdb.d \ |
| 102 |
- $(sysconfdir)/systemd/network' |
| 103 |
+ INSTALL_DIRS='$(sysconfdir)/udev/rules.d $(sysconfdir)/udev/hwdb.d $(sysconfdir)/systemd/network' |
| 104 |
dist_bashcompletion_DATA="shell-completion/bash/udevadm" |
| 105 |
dist_network_DATA="network/99-default.link" |
| 106 |
) |
| 107 |
emake -j1 DESTDIR="${D}" "${targets[@]}" |
| 108 |
doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8} |
| 109 |
else |
| 110 |
- local lib_LTLIBRARIES="libudev.la" \ |
| 111 |
- pkgconfiglib_DATA="src/libudev/libudev.pc" \ |
| 112 |
- include_HEADERS="src/libudev/libudev.h" |
| 113 |
+ local lib_LTLIBRARIES="libudev.la" |
| 114 |
+ local pkgconfiglib_DATA="src/libudev/libudev.pc" |
| 115 |
+ local include_HEADERS="src/libudev/libudev.h" |
| 116 |
|
| 117 |
local targets=( |
| 118 |
install-libLTLIBRARIES |
| 119 |
@@ -310,9 +308,8 @@ multilib_src_install_all() { |
| 120 |
dodoc TODO |
| 121 |
|
| 122 |
prune_libtool_files --all |
| 123 |
- rm -f \ |
| 124 |
- "${D}"/lib/udev/rules.d/99-systemd.rules \ |
| 125 |
- "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} |
| 126 |
+ rm -f "${D}"/lib/udev/rules.d/99-systemd.rules |
| 127 |
+ rm -f "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} |
| 128 |
|
| 129 |
# see src_prepare() for content of 40-gentoo.rules |
| 130 |
insinto /lib/udev/rules.d |
| 131 |
|
| 132 |
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild |
| 133 |
index 8779e43..6f25076 100644 |
| 134 |
--- a/sys-fs/udev/udev-9999.ebuild |
| 135 |
+++ b/sys-fs/udev/udev-9999.ebuild |
| 136 |
@@ -251,8 +251,8 @@ multilib_src_compile() { |
| 137 |
|
| 138 |
multilib_src_install() { |
| 139 |
if multilib_is_native_abi; then |
| 140 |
- local lib_LTLIBRARIES="libudev.la" \ |
| 141 |
- pkgconfiglib_DATA="src/libudev/libudev.pc" |
| 142 |
+ local lib_LTLIBRARIES="libudev.la" |
| 143 |
+ local pkgconfiglib_DATA="src/libudev/libudev.pc" |
| 144 |
|
| 145 |
local targets=( |
| 146 |
install-libLTLIBRARIES |
| 147 |
@@ -278,18 +278,16 @@ multilib_src_install() { |
| 148 |
lib_LTLIBRARIES="${lib_LTLIBRARIES}" |
| 149 |
pkgconfiglib_DATA="${pkgconfiglib_DATA}" |
| 150 |
pkgconfigdata_DATA="src/udev/udev.pc" |
| 151 |
- INSTALL_DIRS='$(sysconfdir)/udev/rules.d \ |
| 152 |
- $(sysconfdir)/udev/hwdb.d \ |
| 153 |
- $(sysconfdir)/systemd/network' |
| 154 |
+ INSTALL_DIRS='$(sysconfdir)/udev/rules.d $(sysconfdir)/udev/hwdb.d $(sysconfdir)/systemd/network' |
| 155 |
dist_bashcompletion_DATA="shell-completion/bash/udevadm" |
| 156 |
dist_network_DATA="network/99-default.link" |
| 157 |
) |
| 158 |
emake -j1 DESTDIR="${D}" "${targets[@]}" |
| 159 |
doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8} |
| 160 |
else |
| 161 |
- local lib_LTLIBRARIES="libudev.la" \ |
| 162 |
- pkgconfiglib_DATA="src/libudev/libudev.pc" \ |
| 163 |
- include_HEADERS="src/libudev/libudev.h" |
| 164 |
+ local lib_LTLIBRARIES="libudev.la" |
| 165 |
+ local pkgconfiglib_DATA="src/libudev/libudev.pc" |
| 166 |
+ local include_HEADERS="src/libudev/libudev.h" |
| 167 |
|
| 168 |
local targets=( |
| 169 |
install-libLTLIBRARIES |
| 170 |
@@ -310,9 +308,8 @@ multilib_src_install_all() { |
| 171 |
dodoc TODO |
| 172 |
|
| 173 |
prune_libtool_files --all |
| 174 |
- rm -f \ |
| 175 |
- "${D}"/lib/udev/rules.d/99-systemd.rules \ |
| 176 |
- "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} |
| 177 |
+ rm -f "${D}"/lib/udev/rules.d/99-systemd.rules |
| 178 |
+ rm -f "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} |
| 179 |
|
| 180 |
# see src_prepare() for content of 40-gentoo.rules |
| 181 |
insinto /lib/udev/rules.d |
Archives