1 |
commit: 93a567b72bf6cac3f047798590908e94e607abf9 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 17 20:15:51 2017 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 17 20:15:51 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a567b7 |
7 |
|
8 |
sys-fs/udev: sync live ebuild |
9 |
|
10 |
Package-Manager: Portage-2.3.6_p16, Repoman-2.3.2_p84 |
11 |
|
12 |
sys-fs/udev/udev-9999.ebuild | 51 ++++++++------------------------------------ |
13 |
1 file changed, 9 insertions(+), 42 deletions(-) |
14 |
|
15 |
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild |
16 |
index 07e8edd8cd0..a0c39c43d08 100644 |
17 |
--- a/sys-fs/udev/udev-9999.ebuild |
18 |
+++ b/sys-fs/udev/udev-9999.ebuild |
19 |
@@ -3,7 +3,7 @@ |
20 |
|
21 |
EAPI=6 |
22 |
|
23 |
-inherit bash-completion-r1 linux-info multilib-minimal multiprocessing toolchain-funcs udev user versionator |
24 |
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user versionator |
25 |
|
26 |
if [[ ${PV} = 9999* ]]; then |
27 |
EGIT_REPO_URI="https://github.com/systemd/systemd.git" |
28 |
@@ -16,7 +16,7 @@ else |
29 |
https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz |
30 |
https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz" |
31 |
fi |
32 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
33 |
+ KEYWORDS="~amd64 ~x86" |
34 |
fi |
35 |
|
36 |
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" |
37 |
@@ -40,17 +40,15 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}] |
38 |
!<=app-emulation/emul-linux-x86-baselibs-20130224-r7 |
39 |
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
40 |
)" |
41 |
-# Force new make >= -r4 to skip some parallel build issues |
42 |
DEPEND="${COMMON_DEPEND} |
43 |
dev-util/gperf |
44 |
>=dev-util/intltool-0.50 |
45 |
>=dev-util/meson-0.40.0 |
46 |
dev-util/ninja |
47 |
- dev-util/patchelf |
48 |
+ >=dev-util/patchelf-0.9 |
49 |
>=sys-apps/coreutils-8.16 |
50 |
virtual/os-headers |
51 |
virtual/pkgconfig |
52 |
- >=sys-devel/make-3.82-r4 |
53 |
>=sys-kernel/linux-headers-3.9 |
54 |
app-text/docbook-xml-dtd:4.2 |
55 |
app-text/docbook-xml-dtd:4.5 |
56 |
@@ -65,19 +63,6 @@ PDEPEND=">=sys-apps/hwids-20140304[udev] |
57 |
S=${WORKDIR}/systemd-${PV} |
58 |
EGIT_CHECKOUT_DIR=${S} |
59 |
|
60 |
-check_default_rules() { |
61 |
- # Make sure there are no sudden changes to upstream rules file |
62 |
- # (more for my own needs than anything else ...) |
63 |
- local udev_rules_md5=c6ee9def75c5c082bf083a7248991935 |
64 |
- MD5=$(md5sum < "${S}"/rules/50-udev-default.rules) |
65 |
- MD5=${MD5/ -/} |
66 |
- if [[ ${MD5} != ${udev_rules_md5} ]]; then |
67 |
- eerror "50-udev-default.rules has been updated, please validate!" |
68 |
- eerror "md5sum: ${MD5}" |
69 |
- die "50-udev-default.rules has been updated, please validate!" |
70 |
- fi |
71 |
-} |
72 |
- |
73 |
pkg_setup() { |
74 |
if [[ ${MERGE_TYPE} != buildonly ]]; then |
75 |
CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX" |
76 |
@@ -102,7 +87,7 @@ pkg_setup() { |
77 |
src_prepare() { |
78 |
if ! [[ ${PV} = 9999* ]]; then |
79 |
# secure_getenv() disable for non-glibc systems wrt bug #443030 |
80 |
- if ! [[ $(grep -r secure_getenv * | wc -l) -eq 30 ]]; then |
81 |
+ if ! [[ $(grep -r secure_getenv * | wc -l) -eq 27 ]]; then |
82 |
eerror "The line count for secure_getenv() failed, see bug #443030" |
83 |
die |
84 |
fi |
85 |
@@ -125,10 +110,6 @@ src_prepare() { |
86 |
# apply user patches |
87 |
eapply_user |
88 |
|
89 |
- if ! [[ ${PV} = 9999* ]]; then |
90 |
- check_default_rules |
91 |
- fi |
92 |
- |
93 |
if ! use elibc_glibc; then #443030 |
94 |
echo '#define secure_getenv(x) NULL' >> config.h.in |
95 |
sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die |
96 |
@@ -144,21 +125,15 @@ meson_multilib_native_use() { |
97 |
} |
98 |
|
99 |
multilib_src_configure() { |
100 |
- local myconf=( |
101 |
- --buildtype=plain |
102 |
- --libdir="$(get_libdir)" |
103 |
- --localstatedir="${EPREFIX}/var" |
104 |
- --prefix="${EPREFIX}/usr" |
105 |
- --sysconfdir="${EPREFIX}/etc" |
106 |
+ local emesonargs=( |
107 |
-Dacl=$(meson_multilib_native_use acl) |
108 |
-Defi=false |
109 |
-Dkmod=$(meson_multilib_native_use kmod) |
110 |
-Dselinux=$(meson_multilib_native_use selinux) |
111 |
+ -Dlink-udev-shared=false |
112 |
-Dsplit-usr=true |
113 |
) |
114 |
- set -- meson "${myconf[@]}" "${S}" |
115 |
- echo "$@" |
116 |
- "$@" || die |
117 |
+ meson_src_configure |
118 |
} |
119 |
|
120 |
src_configure() { |
121 |
@@ -167,15 +142,6 @@ src_configure() { |
122 |
multilib-minimal_src_configure |
123 |
} |
124 |
|
125 |
-eninja() { |
126 |
- if [[ -z ${NINJAOPTS+set} ]]; then |
127 |
- NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)" |
128 |
- fi |
129 |
- set -- ninja -v ${NINJAOPTS} "$@" |
130 |
- echo "$@" |
131 |
- "$@" || die |
132 |
-} |
133 |
- |
134 |
multilib_src_compile() { |
135 |
# meson creates this link |
136 |
local libudev=$(readlink src/libudev/libudev.so.1) |
137 |
@@ -201,7 +167,7 @@ multilib_src_compile() { |
138 |
man/udevadm.8 |
139 |
) |
140 |
fi |
141 |
- eninja "${targets[@]}" || die |
142 |
+ eninja "${targets[@]}" |
143 |
} |
144 |
|
145 |
# meson uses an private python script for this |
146 |
@@ -260,6 +226,7 @@ multilib_src_install_all() { |
147 |
# see src_prepare() for content of 40-gentoo.rules |
148 |
insinto /lib/udev/rules.d |
149 |
doins "${T}"/40-gentoo.rules |
150 |
+ doins "${S}"/rules/*.rules |
151 |
|
152 |
dobashcomp shell-completion/bash/udevadm |