mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
sys-fs/udev: 236 version bump
Package-Manager: Portage-2.3.13, Repoman-2.3.3
This commit is contained in:
William Hubbs
@@ -3,4 +3,5 @@ DIST systemd-225.tar.gz 3878442 BLAKE2B 24bf9f6bfdd7d7c585829c1b172f73e669e13702
|
||||
DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
|
||||
DIST systemd-234.tar.gz 4800186 BLAKE2B 398ed8869da98909d1374ef5e549ca3e26b02ece577d94dec53e98431de0c6441e50762a3bc2c93fa1c14c236a8f0dca8e3f4102fd276ec977dfb3e77a789165 SHA512 762336a7d96c6583cf71cad62efce95a0ed93cd0a0d7251f128d10dba8200c0c8df0e5a7d168179ababa5b221295a231e73b7e7ea2697cb3fb5c1b33538efa68
|
||||
DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
|
||||
DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
|
||||
DIST udev-216-patches-2.tar.xz 1264 BLAKE2B b1bbb6b1b7734edc3352b4352a45b4b5df4715b0fc92c4936798aa93fb078755b7795f475d7bc42392ad8ef57853e9ce2507c66cc9bfbd37e6fe22ada4c156cc SHA512 1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4
|
||||
|
||||
13
sys-fs/udev/files/236-uucp-group.patch
Normal file
13
sys-fs/udev/files/236-uucp-group.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/rules/50-udev-default.rules.in b/rules/50-udev-default.rules.in
|
||||
index 71e716913..f24c9e6ae 100644
|
||||
--- a/rules/50-udev-default.rules.in
|
||||
+++ b/rules/50-udev-default.rules.in
|
||||
@@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620"
|
||||
SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"
|
||||
SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"
|
||||
SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
|
||||
-KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
|
||||
+KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"
|
||||
|
||||
SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
|
||||
|
||||
329
sys-fs/udev/udev-236.ebuild
Normal file
329
sys-fs/udev/udev-236.ebuild
Normal file
@@ -0,0 +1,329 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user versionator
|
||||
|
||||
if [[ ${PV} = 9999* ]]; then
|
||||
EGIT_REPO_URI="https://github.com/systemd/systemd.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
|
||||
HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
|
||||
|
||||
LICENSE="LGPL-2.1 MIT GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="acl +kmod selinux"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
|
||||
sys-libs/libcap[${MULTILIB_USEDEP}]
|
||||
acl? ( sys-apps/acl )
|
||||
kmod? ( >=sys-apps/kmod-16 )
|
||||
selinux? ( >=sys-libs/libselinux-2.1.9 )
|
||||
!<sys-libs/glibc-2.11
|
||||
!sys-apps/gentoo-systemd-integration
|
||||
!sys-apps/systemd
|
||||
abi_x86_32? (
|
||||
!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
|
||||
)"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-util/gperf
|
||||
>=dev-util/intltool-0.50
|
||||
>=dev-util/meson-0.40.0
|
||||
dev-util/ninja
|
||||
>=sys-apps/coreutils-8.16
|
||||
virtual/os-headers
|
||||
virtual/pkgconfig
|
||||
>=sys-kernel/linux-headers-3.9
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xml-dtd:4.5
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!<sys-fs/lvm2-2.02.103
|
||||
!<sec-policy/selinux-base-2.20120725-r10"
|
||||
PDEPEND=">=sys-apps/hwids-20140304[udev]
|
||||
>=sys-fs/udev-init-scripts-26"
|
||||
|
||||
S=${WORKDIR}/systemd-${PV}
|
||||
EGIT_CHECKOUT_DIR=${S}
|
||||
|
||||
pkg_setup() {
|
||||
if [[ ${MERGE_TYPE} != buildonly ]]; then
|
||||
CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
|
||||
linux-info_pkg_setup
|
||||
|
||||
# CONFIG_FHANDLE was introduced by 2.6.39
|
||||
local MINKV=2.6.39
|
||||
|
||||
if kernel_is -lt ${MINKV//./ }; then
|
||||
eerror "Your running kernel is too old to run this version of ${P}"
|
||||
eerror "You need to upgrade kernel at least to ${MINKV}"
|
||||
fi
|
||||
|
||||
if kernel_is -lt 3 7; then
|
||||
ewarn "Your running kernel is too old to have firmware loader and"
|
||||
ewarn "this version of ${P} doesn't have userspace firmware loader"
|
||||
ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if ! [[ ${PV} = 9999* ]]; then
|
||||
# secure_getenv() disable for non-glibc systems wrt bug #443030
|
||||
if ! [[ $(grep -r secure_getenv * | wc -l) -eq 27 ]]; then
|
||||
eerror "The line count for secure_getenv() failed, see bug #443030"
|
||||
die
|
||||
fi
|
||||
fi
|
||||
|
||||
cat <<-EOF > "${T}"/40-gentoo.rules
|
||||
# Gentoo specific floppy and usb groups
|
||||
ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
|
||||
ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
|
||||
EOF
|
||||
|
||||
local PATCHES=(
|
||||
"${FILESDIR}/236-uucp-group.patch"
|
||||
)
|
||||
|
||||
default
|
||||
|
||||
if ! use elibc_glibc; then #443030
|
||||
echo '#define secure_getenv(x) NULL' >> config.h.in
|
||||
sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
|
||||
fi
|
||||
}
|
||||
|
||||
meson_multilib_native_use() {
|
||||
if multilib_is_native_abi && use "$1"; then
|
||||
echo true
|
||||
else
|
||||
echo false
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local emesonargs=(
|
||||
-Dacl=$(meson_multilib_native_use acl)
|
||||
-Defi=false
|
||||
-Dkmod=$(meson_multilib_native_use kmod)
|
||||
-Dselinux=$(meson_multilib_native_use selinux)
|
||||
-Dlink-udev-shared=false
|
||||
-Dsplit-usr=true
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Prevent conflicts with i686 cross toolchain, bug 559726
|
||||
tc-export AR CC NM OBJCOPY RANLIB
|
||||
multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
# meson creates this link
|
||||
local libudev=$(readlink src/libudev/libudev.so.1)
|
||||
|
||||
local targets=(
|
||||
src/libudev/${libudev}
|
||||
)
|
||||
if multilib_is_native_abi; then
|
||||
targets+=(
|
||||
systemd-udevd
|
||||
udevadm
|
||||
src/udev/ata_id
|
||||
src/udev/cdrom_id
|
||||
src/udev/collect
|
||||
src/udev/mtd_probe
|
||||
src/udev/scsi_id
|
||||
src/udev/v4l_id
|
||||
man/udev.conf.5
|
||||
man/systemd.link.5
|
||||
man/hwdb.7
|
||||
man/udev.7
|
||||
man/systemd-udevd.service.8
|
||||
man/udevadm.8
|
||||
)
|
||||
fi
|
||||
eninja "${targets[@]}"
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
local libudev=$(readlink src/libudev/libudev.so.1)
|
||||
|
||||
into /
|
||||
dolib.so src/libudev/{${libudev},libudev.so.1,libudev.so}
|
||||
|
||||
insinto "/usr/$(get_libdir)/pkgconfig"
|
||||
doins src/libudev/libudev.pc
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
into /
|
||||
dobin udevadm
|
||||
|
||||
exeinto /lib/systemd
|
||||
doexe systemd-udevd
|
||||
|
||||
exeinto /lib/udev
|
||||
doexe src/udev/{ata_id,cdrom_id,collect,mtd_probe,scsi_id,v4l_id}
|
||||
|
||||
rm rules/99-systemd.rules || die
|
||||
insinto /lib/udev/rules.d
|
||||
doins rules/*.rules
|
||||
|
||||
insinto /usr/share/pkgconfig
|
||||
doins src/udev/udev.pc
|
||||
|
||||
mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
|
||||
rm man/systemd-udevd-{control,kernel}.socket.8 || die
|
||||
doman man/*.[0-9]
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
doheader src/libudev/libudev.h
|
||||
|
||||
insinto /etc/udev
|
||||
doins src/udev/udev.conf
|
||||
|
||||
insinto /lib/systemd/network
|
||||
doins network/99-default.link
|
||||
|
||||
# see src_prepare() for content of 40-gentoo.rules
|
||||
insinto /lib/udev/rules.d
|
||||
doins "${T}"/40-gentoo.rules
|
||||
doins "${S}"/rules/*.rules
|
||||
|
||||
dobashcomp shell-completion/bash/udevadm
|
||||
|
||||
insinto /usr/share/zsh/site-functions
|
||||
doins shell-completion/zsh/_udevadm
|
||||
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
mkdir -p "${ROOT%/}"/run
|
||||
|
||||
# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
|
||||
# So try to remove it here (will only work if empty).
|
||||
rmdir "${ROOT%/}"/dev/loop 2>/dev/null
|
||||
if [[ -d ${ROOT%/}/dev/loop ]]; then
|
||||
ewarn "Please make sure your remove /dev/loop,"
|
||||
ewarn "else losetup may be confused when looking for unused devices."
|
||||
fi
|
||||
|
||||
local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
|
||||
while read -r dev path fstype rest; do
|
||||
if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
|
||||
ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
|
||||
ewarn "filesystem. Otherwise udev won't be able to boot."
|
||||
ewarn "See, https://bugs.gentoo.org/453186"
|
||||
fi
|
||||
done < "${fstab}"
|
||||
|
||||
if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
|
||||
ewarn
|
||||
ewarn "Please re-emerge all packages on your system which install"
|
||||
ewarn "rules and helpers in /usr/lib/udev. They should now be in"
|
||||
ewarn "/lib/udev."
|
||||
ewarn
|
||||
ewarn "One way to do this is to run the following command:"
|
||||
ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
|
||||
ewarn "Note that qfile can be found in app-portage/portage-utils"
|
||||
fi
|
||||
|
||||
local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
|
||||
local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
|
||||
for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
|
||||
if [[ -f ${old_rules} ]]; then
|
||||
ewarn
|
||||
ewarn "File ${old_rules} is from old udev installation but if you still use it,"
|
||||
ewarn "rename it to something else starting with 70- to silence this deprecation"
|
||||
ewarn "warning."
|
||||
fi
|
||||
done
|
||||
|
||||
elog
|
||||
elog "Starting from version >= 197 the new predictable network interface names are"
|
||||
elog "used by default, see:"
|
||||
elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
|
||||
elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
|
||||
elog
|
||||
elog "Example command to get the information for the new interface name before booting"
|
||||
elog "(replace <ifname> with, for example, eth0):"
|
||||
elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
|
||||
elog
|
||||
elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
|
||||
elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
|
||||
elog "to disable the feature."
|
||||
|
||||
if has_version 'sys-apps/biosdevname'; then
|
||||
ewarn
|
||||
ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
|
||||
ewarn "detected to be installed with the new predictable network interface names."
|
||||
fi
|
||||
|
||||
ewarn
|
||||
ewarn "You need to restart udev as soon as possible to make the upgrade go"
|
||||
ewarn "into effect."
|
||||
ewarn "The method you use to do this depends on your init system."
|
||||
if has_version 'sys-apps/openrc'; then
|
||||
ewarn "For sys-apps/openrc users it is:"
|
||||
ewarn "# /etc/init.d/udev --nodeps restart"
|
||||
fi
|
||||
|
||||
elog
|
||||
elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
|
||||
elog "fixing known issues visit:"
|
||||
elog "https://wiki.gentoo.org/wiki/Udev"
|
||||
elog "https://wiki.gentoo.org/wiki/Udev/upgrade"
|
||||
|
||||
# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
|
||||
# do the same for 80-net-setup-link.rules to keep the old behavior
|
||||
local net_move=no
|
||||
local net_name_slot_sym=no
|
||||
local net_rules_path="${ROOT%/}"/etc/udev/rules.d
|
||||
local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
|
||||
local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
|
||||
if [[ ! -e ${net_setup_link} ]]; then
|
||||
[[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
|
||||
if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
|
||||
net_move=yes
|
||||
net_name_slot_sym=yes
|
||||
fi
|
||||
fi
|
||||
if [[ ${net_move} == yes ]]; then
|
||||
ebegin "Copying ${net_name_slot} to ${net_setup_link}"
|
||||
|
||||
if [[ ${net_name_slot_sym} == yes ]]; then
|
||||
ln -nfs /dev/null "${net_setup_link}"
|
||||
else
|
||||
cp "${net_name_slot}" "${net_setup_link}"
|
||||
fi
|
||||
eend $?
|
||||
fi
|
||||
|
||||
# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
|
||||
# https://bugs.gentoo.org/246847
|
||||
# https://bugs.gentoo.org/514174
|
||||
enewgroup input
|
||||
|
||||
# Update hwdb database in case the format is changed by udev version.
|
||||
if has_version 'sys-apps/hwids[udev]'; then
|
||||
udevadm hwdb --update --root="${ROOT%/}"
|
||||
# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
|
||||
# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
|
||||
[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user