Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/
Date: Sat, 01 May 2021 07:36:32
Message-Id: 1619854495.bdabec831e0f72cbc4ebb083272ca0e1f2cc498e.asturm@gentoo
1 commit: bdabec831e0f72cbc4ebb083272ca0e1f2cc498e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 18 18:01:22 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat May 1 07:34:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdabec83
7
8 sys-fs/udev: Drop 243-r2
9
10 Bug: https://bugs.gentoo.org/736088
11 Package-Manager: Portage-3.0.18, Repoman-3.0.3
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 sys-fs/udev/Manifest | 1 -
15 sys-fs/udev/udev-243-r2.ebuild | 336 -----------------------------------------
16 2 files changed, 337 deletions(-)
17
18 diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
19 index 1060971a7b3..9467a06ba08 100644
20 --- a/sys-fs/udev/Manifest
21 +++ b/sys-fs/udev/Manifest
22 @@ -1,4 +1,3 @@
23 -DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
24 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
25 DIST systemd-248.tar.gz 10306883 BLAKE2B 3cb25d6101136a5f57e841d3f464f0d7649f6c1cb190b25e4dbf0a8f2be075d04a3cbe92e2fee5bb6a03b73bd8195d8c7b691661b39b7850547d512219cc40af SHA512 486f6ac6c2897a2aac97a59306091a03fd50768340407401e1f088ea5b21c67dae726bff4cbe53cec6b89a8f0ee72205b340165a4fe3a3c16cff6d176506c6e0
26 DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
27
28 diff --git a/sys-fs/udev/udev-243-r2.ebuild b/sys-fs/udev/udev-243-r2.ebuild
29 deleted file mode 100644
30 index 17bba8fefb4..00000000000
31 --- a/sys-fs/udev/udev-243-r2.ebuild
32 +++ /dev/null
33 @@ -1,336 +0,0 @@
34 -# Copyright 2003-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev usr-ldscript
40 -
41 -if [[ ${PV} = 9999* ]]; then
42 - EGIT_REPO_URI="https://github.com/systemd/systemd.git"
43 - inherit git-r3
44 -else
45 - MY_PV=${PV/_/-}
46 - MY_P=systemd-${MY_PV}
47 - S=${WORKDIR}/${MY_P}
48 - SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
49 - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
50 -fi
51 -
52 -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
53 -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
54 -
55 -LICENSE="LGPL-2.1 MIT GPL-2"
56 -SLOT="0"
57 -IUSE="acl +kmod selinux static-libs"
58 -
59 -RESTRICT="test"
60 -
61 -COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
62 - sys-libs/libcap[${MULTILIB_USEDEP}]
63 - acl? ( sys-apps/acl )
64 - kmod? ( >=sys-apps/kmod-16 )
65 - selinux? ( >=sys-libs/libselinux-2.1.9 )
66 - !<sys-libs/glibc-2.11
67 - !sys-apps/gentoo-systemd-integration
68 - !sys-apps/systemd"
69 -DEPEND="${COMMON_DEPEND}
70 - dev-util/gperf
71 - >=dev-util/intltool-0.50
72 - >=dev-util/meson-0.40.0
73 - dev-util/ninja
74 - >=sys-apps/coreutils-8.16
75 - virtual/os-headers
76 - virtual/pkgconfig
77 - >=sys-kernel/linux-headers-3.9
78 - app-text/docbook-xml-dtd:4.2
79 - app-text/docbook-xml-dtd:4.5
80 - app-text/docbook-xsl-stylesheets
81 - dev-libs/libxslt
82 - ${PYTHON_DEPS}"
83 -RDEPEND="${COMMON_DEPEND}
84 - acct-group/kmem
85 - acct-group/tty
86 - acct-group/audio
87 - acct-group/cdrom
88 - acct-group/dialout
89 - acct-group/disk
90 - acct-group/input
91 - acct-group/kvm
92 - acct-group/lp
93 - acct-group/render
94 - acct-group/tape
95 - acct-group/video
96 - !<sys-fs/lvm2-2.02.103
97 - !<sec-policy/selinux-base-2.20120725-r10"
98 -PDEPEND=">=sys-apps/hwids-20140304[udev]
99 - >=sys-fs/udev-init-scripts-26"
100 -
101 -pkg_setup() {
102 - if [[ ${MERGE_TYPE} != buildonly ]]; then
103 - CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
104 - linux-info_pkg_setup
105 -
106 - # CONFIG_FHANDLE was introduced by 2.6.39
107 - local MINKV=2.6.39
108 -
109 - if kernel_is -lt ${MINKV//./ }; then
110 - eerror "Your running kernel is too old to run this version of ${P}"
111 - eerror "You need to upgrade kernel at least to ${MINKV}"
112 - fi
113 -
114 - if kernel_is -lt 3 7; then
115 - ewarn "Your running kernel is too old to have firmware loader and"
116 - ewarn "this version of ${P} doesn't have userspace firmware loader"
117 - ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
118 - fi
119 - fi
120 -}
121 -
122 -src_prepare() {
123 - cat <<-EOF > "${T}"/40-gentoo.rules
124 - # Gentoo specific floppy and usb groups
125 - ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
126 - ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
127 - EOF
128 -
129 - if [[ -d "${WORKDIR}/patches" ]]; then
130 - eapply "${WORKDIR}/patches"
131 - fi
132 -
133 - default
134 -}
135 -
136 -meson_multilib_native_use() {
137 - if multilib_is_native_abi && use "$1"; then
138 - echo true
139 - else
140 - echo false
141 - fi
142 -}
143 -
144 -multilib_src_configure() {
145 - local emesonargs=(
146 - -Dacl=$(meson_multilib_native_use acl)
147 - -Defi=false
148 - -Dkmod=$(meson_multilib_native_use kmod)
149 - -Dselinux=$(meson_multilib_native_use selinux)
150 - -Dlink-udev-shared=false
151 - -Dsplit-usr=true
152 - -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
153 - -Dstatic-libudev=$(usex static-libs true false)
154 -
155 - # Prevent automagic deps
156 - -Dgcrypt=false
157 - -Dlibcryptsetup=false
158 - -Dlibidn=false
159 - -Dlibidn2=false
160 - -Dlibiptc=false
161 - -Dseccomp=false
162 - -Dlz4=false
163 - -Dxz=false
164 - )
165 - meson_src_configure
166 -}
167 -
168 -src_configure() {
169 - # Prevent conflicts with i686 cross toolchain, bug 559726
170 - tc-export AR CC NM OBJCOPY RANLIB
171 - multilib-minimal_src_configure
172 -}
173 -
174 -multilib_src_compile() {
175 - # meson creates this link
176 - local libudev=$(readlink src/udev/libudev.so.1)
177 -
178 - local targets=(
179 - src/udev/${libudev}
180 - )
181 - if use static-libs; then
182 - targets+=( src/udev/libudev.a )
183 - fi
184 - if multilib_is_native_abi; then
185 - targets+=(
186 - systemd-udevd
187 - udevadm
188 - src/udev/ata_id
189 - src/udev/cdrom_id
190 - src/udev/mtd_probe
191 - src/udev/scsi_id
192 - src/udev/v4l_id
193 - man/udev.conf.5
194 - man/systemd.link.5
195 - man/hwdb.7
196 - man/udev.7
197 - man/systemd-udevd.service.8
198 - man/udevadm.8
199 - )
200 - fi
201 - eninja "${targets[@]}"
202 -}
203 -
204 -multilib_src_install() {
205 - local libudev=$(readlink src/udev/libudev.so.1)
206 -
207 - dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
208 - gen_usr_ldscript -a udev
209 - use static-libs && dolib.a src/udev/libudev.a
210 -
211 - insinto "/usr/$(get_libdir)/pkgconfig"
212 - doins src/libudev/libudev.pc
213 -
214 - if multilib_is_native_abi; then
215 - into /
216 - dobin udevadm
217 -
218 - exeinto /lib/systemd
219 - doexe systemd-udevd
220 -
221 - exeinto /lib/udev
222 - doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id}
223 -
224 - rm rules/99-systemd.rules || die
225 - insinto /lib/udev/rules.d
226 - doins rules/*.rules
227 -
228 - insinto /usr/share/pkgconfig
229 - doins src/udev/udev.pc
230 -
231 - mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
232 - rm man/systemd-udevd-{control,kernel}.socket.8 || die
233 - doman man/*.[0-9]
234 - fi
235 -}
236 -
237 -multilib_src_install_all() {
238 - doheader src/libudev/libudev.h
239 -
240 - insinto /etc/udev
241 - doins src/udev/udev.conf
242 - keepdir /etc/udev/{hwdb.d,rules.d}
243 -
244 - insinto /lib/systemd/network
245 - doins network/99-default.link
246 -
247 - # see src_prepare() for content of 40-gentoo.rules
248 - insinto /lib/udev/rules.d
249 - doins "${T}"/40-gentoo.rules
250 - doins "${S}"/rules/*.rules
251 -
252 - dobashcomp shell-completion/bash/udevadm
253 -
254 - insinto /usr/share/zsh/site-functions
255 - doins shell-completion/zsh/_udevadm
256 -
257 - einstalldocs
258 -}
259 -
260 -pkg_postinst() {
261 - mkdir -p "${ROOT%/}"/run
262 -
263 - # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
264 - # So try to remove it here (will only work if empty).
265 - rmdir "${ROOT%/}"/dev/loop 2>/dev/null
266 - if [[ -d ${ROOT%/}/dev/loop ]]; then
267 - ewarn "Please make sure your remove /dev/loop,"
268 - ewarn "else losetup may be confused when looking for unused devices."
269 - fi
270 -
271 - local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
272 - while read -r dev path fstype rest; do
273 - if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
274 - ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
275 - ewarn "filesystem. Otherwise udev won't be able to boot."
276 - ewarn "See, https://bugs.gentoo.org/453186"
277 - fi
278 - done < "${fstab}"
279 -
280 - if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
281 - ewarn
282 - ewarn "Please re-emerge all packages on your system which install"
283 - ewarn "rules and helpers in /usr/lib/udev. They should now be in"
284 - ewarn "/lib/udev."
285 - ewarn
286 - ewarn "One way to do this is to run the following command:"
287 - ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
288 - ewarn "Note that qfile can be found in app-portage/portage-utils"
289 - fi
290 -
291 - local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
292 - local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
293 - for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
294 - if [[ -f ${old_rules} ]]; then
295 - ewarn
296 - ewarn "File ${old_rules} is from old udev installation but if you still use it,"
297 - ewarn "rename it to something else starting with 70- to silence this deprecation"
298 - ewarn "warning."
299 - fi
300 - done
301 -
302 - elog
303 - elog "Starting from version >= 197 the new predictable network interface names are"
304 - elog "used by default, see:"
305 - elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
306 - elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
307 - elog
308 - elog "Example command to get the information for the new interface name before booting"
309 - elog "(replace <ifname> with, for example, eth0):"
310 - elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
311 - elog
312 - elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
313 - elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
314 - elog "to disable the feature."
315 -
316 - if has_version 'sys-apps/biosdevname'; then
317 - ewarn
318 - ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
319 - ewarn "detected to be installed with the new predictable network interface names."
320 - fi
321 -
322 - ewarn
323 - ewarn "You need to restart udev as soon as possible to make the upgrade go"
324 - ewarn "into effect."
325 - ewarn "The method you use to do this depends on your init system."
326 - if has_version 'sys-apps/openrc'; then
327 - ewarn "For sys-apps/openrc users it is:"
328 - ewarn "# /etc/init.d/udev --nodeps restart"
329 - fi
330 -
331 - elog
332 - elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
333 - elog "fixing known issues visit:"
334 - elog "https://wiki.gentoo.org/wiki/Udev"
335 - elog "https://wiki.gentoo.org/wiki/Udev/upgrade"
336 -
337 - # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
338 - # do the same for 80-net-setup-link.rules to keep the old behavior
339 - local net_move=no
340 - local net_name_slot_sym=no
341 - local net_rules_path="${ROOT%/}"/etc/udev/rules.d
342 - local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
343 - local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
344 - if [[ ! -e ${net_setup_link} ]]; then
345 - [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
346 - if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
347 - net_move=yes
348 - net_name_slot_sym=yes
349 - fi
350 - fi
351 - if [[ ${net_move} == yes ]]; then
352 - ebegin "Copying ${net_name_slot} to ${net_setup_link}"
353 -
354 - if [[ ${net_name_slot_sym} == yes ]]; then
355 - ln -nfs /dev/null "${net_setup_link}"
356 - else
357 - cp "${net_name_slot}" "${net_setup_link}"
358 - fi
359 - eend $?
360 - fi
361 -
362 - # Update hwdb database in case the format is changed by udev version.
363 - if has_version 'sys-apps/hwids[udev]'; then
364 - udevadm hwdb --update --root="${ROOT%/}"
365 - # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
366 - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
367 - [[ -z ${REPLACING_VERSIONS} ]] && udev_reload
368 - fi
369 -}