|
Lines 106-111
Link Here
|
| 106 |
|
106 |
|
| 107 |
src_prepare() |
107 |
src_prepare() |
| 108 |
{ |
108 |
{ |
|
|
109 |
epatch "${FILESDIR}"/${PN}-186-revert-systemd-messup.patch |
| 110 |
|
| 109 |
# change rules back to group uucp instead of dialout for now |
111 |
# change rules back to group uucp instead of dialout for now |
| 110 |
sed -e 's/GROUP="dialout"/GROUP="uucp"/' \ |
112 |
sed -e 's/GROUP="dialout"/GROUP="uucp"/' \ |
| 111 |
-i rules/*.rules \ |
113 |
-i rules/*.rules \ |
|
Lines 121-126
Link Here
|
| 121 |
eautoreconf |
123 |
eautoreconf |
| 122 |
else |
124 |
else |
| 123 |
check_default_rules |
125 |
check_default_rules |
|
|
126 |
eautoreconf |
| 124 |
elibtoolize |
127 |
elibtoolize |
| 125 |
fi |
128 |
fi |
| 126 |
} |
129 |
} |
|
Lines 138-145
Link Here
|
| 138 |
local switches |
141 |
local switches |
| 139 |
|
142 |
|
| 140 |
switches=( |
143 |
switches=( |
|
|
144 |
--bindir=/bin |
| 145 |
--sbindir=/sbin |
| 141 |
--docdir=/usr/share/doc/${PF} |
146 |
--docdir=/usr/share/doc/${PF} |
| 142 |
--libdir=/usr/$(get_libdir) |
147 |
--libdir=/$(get_libdir) |
| 143 |
--with-distro=gentoo |
148 |
--with-distro=gentoo |
| 144 |
--with-html-dir=/usr/share/doc/${PF}/html |
149 |
--with-html-dir=/usr/share/doc/${PF}/html |
| 145 |
--with-pci-ids-path=/usr/share/misc/pci.ids |
150 |
--with-pci-ids-path=/usr/share/misc/pci.ids |
|
Lines 176-182
Link Here
|
| 176 |
echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra |
181 |
echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra |
| 177 |
emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES |
182 |
emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES |
| 178 |
local targets=( |
183 |
local targets=( |
| 179 |
systemd-udevd |
184 |
udevd |
| 180 |
udevadm |
185 |
udevadm |
| 181 |
libudev.la |
186 |
libudev.la |
| 182 |
ata_id |
187 |
ata_id |
|
Lines 188-195
Link Here
|
| 188 |
mtd_probe |
193 |
mtd_probe |
| 189 |
man/udev.7 |
194 |
man/udev.7 |
| 190 |
man/udevadm.8 |
195 |
man/udevadm.8 |
| 191 |
man/systemd-udevd.8 |
196 |
man/udevd.8 |
| 192 |
man/systemd-udevd.service.8 |
|
|
| 193 |
) |
197 |
) |
| 194 |
use keymap && targets+=( keymap ) |
198 |
use keymap && targets+=( keymap ) |
| 195 |
use gudev && targets+=( libgudev-1.0.la ) |
199 |
use gudev && targets+=( libgudev-1.0.la ) |
|
Lines 210-215
Link Here
|
| 210 |
install-libLTLIBRARIES |
214 |
install-libLTLIBRARIES |
| 211 |
install-includeHEADERS |
215 |
install-includeHEADERS |
| 212 |
install-libgudev_includeHEADERS |
216 |
install-libgudev_includeHEADERS |
|
|
217 |
install-sbinPROGRAMS |
| 213 |
install-binPROGRAMS |
218 |
install-binPROGRAMS |
| 214 |
install-rootlibexecPROGRAMS |
219 |
install-rootlibexecPROGRAMS |
| 215 |
install-udevlibexecPROGRAMS |
220 |
install-udevlibexecPROGRAMS |
|
Lines 239-248
Link Here
|
| 239 |
# add final values of variables: |
244 |
# add final values of variables: |
| 240 |
targets+=( |
245 |
targets+=( |
| 241 |
udevlibexecdir=/lib/udev |
246 |
udevlibexecdir=/lib/udev |
| 242 |
rootlibexec_PROGRAMS=systemd-udevd |
247 |
bin_PROGRAMS="" |
| 243 |
bin_PROGRAMS=udevadm |
248 |
sbin_PROGRAMS="udevd udevadm" |
|
|
249 |
rootlibexec_PROGRAMS="" |
| 244 |
lib_LTLIBRARIES="${lib_LTLIBRARIES}" |
250 |
lib_LTLIBRARIES="${lib_LTLIBRARIES}" |
| 245 |
MANPAGES="man/udev.7 man/udevadm.8 man/systemd-udevd.service.8" |
251 |
MANPAGES="man/udev.7 man/udevadm.8 man/udevd.8" |
| 246 |
MANPAGES_ALIAS="man/systemd-udevd.8" |
252 |
MANPAGES_ALIAS="man/systemd-udevd.8" |
| 247 |
dist_systemunit_DATA="units/systemd-udevd-control.socket \ |
253 |
dist_systemunit_DATA="units/systemd-udevd-control.socket \ |
| 248 |
units/systemd-udevd-kernel.socket" |
254 |
units/systemd-udevd-kernel.socket" |
|
Lines 267-275
Link Here
|
| 267 |
# remove rule that should be installed by systemd |
273 |
# remove rule that should be installed by systemd |
| 268 |
rm -f "${ED}"/lib/udev/rules.d/99-systemd.rules |
274 |
rm -f "${ED}"/lib/udev/rules.d/99-systemd.rules |
| 269 |
|
275 |
|
| 270 |
# udevadm is now in /usr/bin |
|
|
| 271 |
dosym ../usr/bin/udevadm /sbin/udevadm |
| 272 |
|
| 273 |
# Now install rules |
276 |
# Now install rules |
| 274 |
insinto /lib/udev/rules.d |
277 |
insinto /lib/udev/rules.d |
| 275 |
doins "${FILESDIR}"/40-gentoo.rules |
278 |
doins "${FILESDIR}"/40-gentoo.rules |
