gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-09 18:47:16 -08:00
Code Issues Projects Releases Wiki Activity

sys-fs/udev: replace uucp sed with a patch

Browse Source 
Bug: https://bugs.gentoo.org/625720
Package-Manager: Portage-2.3.6_p34, Repoman-2.3.3_p12
This commit is contained in:
Mike Gilbert
2017-08-13 19:07:59 -04:00
parent 3a1a0a2241
commit cc7faaaefd
3 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys-fs/udev/files/234-uucp-group.patch
+11
View File
@@ -0,0 +1,11 @@
--- a/rules/50-udev-default.rules.in
+++ b/rules/50-udev-default.rules.in
@@ -22,7 +22,7 @@
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]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
+KERNEL=="tty[A-Z]*[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"
sys-fs/udev/udev-234.ebuild → sys-fs/udev/udev-234-r1.ebuild
+4 -15
View File
@@ -9,13 +9,7 @@ if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/systemd/systemd.git"
inherit git-r3
else
patchset=
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
if [[ -n "${patchset}" ]]; then
SRC_URI+="
https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz
https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz"
fi
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
fi
@@ -92,22 +86,17 @@ src_prepare() {
fi
fi
# backport some patches
if [[ -n "${patchset}" ]]; then
eapply "${WORKDIR}"/patch
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
# change rules back to group uucp instead of dialout for now wrt #454556
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
local PATCHES=(
"${FILESDIR}/234-uucp-group.patch"
)
# apply user patches
eapply_user
default
if ! use elibc_glibc; then #443030
echo '#define secure_getenv(x) NULL' >> config.h.in
sys-fs/udev/udev-9999.ebuild
+5 -16
View File
@@ -9,14 +9,8 @@ if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/systemd/systemd.git"
inherit git-r3
else
patchset=
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
if [[ -n "${patchset}" ]]; then
SRC_URI+="
https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz
https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz"
fi
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -92,22 +86,17 @@ src_prepare() {
fi
fi
# backport some patches
if [[ -n "${patchset}" ]]; then
eapply "${WORKDIR}"/patch
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
# change rules back to group uucp instead of dialout for now wrt #454556
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
local PATCHES=(
"${FILESDIR}/234-uucp-group.patch"
)
# apply user patches
eapply_user
default
if ! use elibc_glibc; then #443030
echo '#define secure_getenv(x) NULL' >> config.h.in