| 1 |
commit: 2941efa8517fb2069fea74ef568632962f8087b6 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 2 11:00:11 2012 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 2 11:00:11 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=2941efa8 |
| 7 |
|
| 8 |
sys-apps/systemd: Sync. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.0_alpha144 |
| 11 |
|
| 12 |
--- |
| 13 |
...0.patch => 197-0001-Disable-udev-targets.patch} | 69 ++++++++++++-------- |
| 14 |
sys-apps/systemd/systemd-9999.ebuild | 24 ++++--- |
| 15 |
2 files changed, 56 insertions(+), 37 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/systemd/files/191-0001-Disable-udev-targets-for-udev-190.patch b/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch |
| 18 |
similarity index 84% |
| 19 |
rename from sys-apps/systemd/files/191-0001-Disable-udev-targets-for-udev-190.patch |
| 20 |
rename to sys-apps/systemd/files/197-0001-Disable-udev-targets.patch |
| 21 |
index fb70b80..ab37916 100644 |
| 22 |
--- a/sys-apps/systemd/files/191-0001-Disable-udev-targets-for-udev-190.patch |
| 23 |
+++ b/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch |
| 24 |
@@ -1,17 +1,17 @@ |
| 25 |
-From 202a70158973fee73432816d2b7612161824cc29 Mon Sep 17 00:00:00 2001 |
| 26 |
+From 4ee2bb842f9ed3cacab607bce3b0d229dfd88946 Mon Sep 17 00:00:00 2001 |
| 27 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 28 |
Date: Wed, 15 Aug 2012 14:02:07 +0200 |
| 29 |
-Subject: [PATCH] Disable udev targets, for udev-190. |
| 30 |
+Subject: [PATCH] Disable udev targets. |
| 31 |
|
| 32 |
--- |
| 33 |
- Makefile.am | 190 +----------------------------------------------------------- |
| 34 |
- 1 file changed, 1 insertion(+), 189 deletions(-) |
| 35 |
+ Makefile.am | 203 +----------------------------------------------------------- |
| 36 |
+ 1 file changed, 1 insertion(+), 202 deletions(-) |
| 37 |
|
| 38 |
diff --git a/Makefile.am b/Makefile.am |
| 39 |
-index 64dfe81..a378007 100644 |
| 40 |
+index e253aa2..cb60abb 100644 |
| 41 |
--- a/Makefile.am |
| 42 |
+++ b/Makefile.am |
| 43 |
-@@ -309,8 +309,6 @@ dist_systemunit_DATA = \ |
| 44 |
+@@ -317,8 +317,6 @@ dist_systemunit_DATA = \ |
| 45 |
units/systemd-ask-password-wall.path \ |
| 46 |
units/systemd-ask-password-console.path \ |
| 47 |
units/syslog.target \ |
| 48 |
@@ -20,7 +20,7 @@ index 64dfe81..a378007 100644 |
| 49 |
units/system-update.target |
| 50 |
|
| 51 |
nodist_systemunit_DATA = \ |
| 52 |
-@@ -340,9 +338,6 @@ nodist_systemunit_DATA = \ |
| 53 |
+@@ -348,9 +346,6 @@ nodist_systemunit_DATA = \ |
| 54 |
units/systemd-kexec.service \ |
| 55 |
units/systemd-fsck@.service \ |
| 56 |
units/systemd-fsck-root.service \ |
| 57 |
@@ -29,8 +29,8 @@ index 64dfe81..a378007 100644 |
| 58 |
- units/systemd-udev-settle.service \ |
| 59 |
units/debug-shell.service |
| 60 |
|
| 61 |
- dist_userunit_DATA = \ |
| 62 |
-@@ -1643,12 +1638,6 @@ SUBDIRS += \ |
| 63 |
+ if HAVE_KMOD |
| 64 |
+@@ -1781,12 +1776,6 @@ SUBDIRS += \ |
| 65 |
docs/libudev |
| 66 |
endif |
| 67 |
|
| 68 |
@@ -43,7 +43,7 @@ index 64dfe81..a378007 100644 |
| 69 |
libudev_la_SOURCES =\ |
| 70 |
src/libudev/libudev-private.h \ |
| 71 |
src/libudev/libudev.c \ |
| 72 |
-@@ -1671,9 +1660,6 @@ libudev_la_LDFLAGS = \ |
| 73 |
+@@ -1811,9 +1800,6 @@ libudev_la_LDFLAGS = \ |
| 74 |
libudev_la_LIBADD = \ |
| 75 |
libsystemd-shared.la |
| 76 |
|
| 77 |
@@ -53,7 +53,7 @@ index 64dfe81..a378007 100644 |
| 78 |
EXTRA_DIST += \ |
| 79 |
src/libudev/libudev.pc.in \ |
| 80 |
src/libudev/libudev.sym |
| 81 |
-@@ -1694,12 +1680,7 @@ libudev-install-move-hook: |
| 82 |
+@@ -1834,12 +1820,7 @@ libudev-install-move-hook: |
| 83 |
libudev-uninstall-move-hook: |
| 84 |
rm -f $(DESTDIR)$(rootlibdir)/libudev.so* |
| 85 |
|
| 86 |
@@ -66,7 +66,7 @@ index 64dfe81..a378007 100644 |
| 87 |
|
| 88 |
libudev_private_la_SOURCES =\ |
| 89 |
$(libudev_la_SOURCES) \ |
| 90 |
-@@ -1714,15 +1695,6 @@ libudev_private_la_LIBADD = \ |
| 91 |
+@@ -1854,15 +1835,6 @@ libudev_private_la_LIBADD = \ |
| 92 |
libsystemd-shared.la |
| 93 |
|
| 94 |
# ------------------------------------------------------------------------------ |
| 95 |
@@ -82,7 +82,7 @@ index 64dfe81..a378007 100644 |
| 96 |
|
| 97 |
man/systemd-udevd.8: man/systemd-udevd.service.8 |
| 98 |
man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8 |
| 99 |
-@@ -1734,28 +1706,7 @@ udev-confdirs: |
| 100 |
+@@ -1875,40 +1847,7 @@ udev-confdirs: |
| 101 |
INSTALL_DATA_HOOKS += udev-confdirs |
| 102 |
|
| 103 |
dist_udevrules_DATA += \ |
| 104 |
@@ -98,9 +98,21 @@ index 64dfe81..a378007 100644 |
| 105 |
- rules/75-net-description.rules \ |
| 106 |
- rules/75-tty-description.rules \ |
| 107 |
- rules/78-sound-card.rules \ |
| 108 |
-- rules/80-drivers.rules \ |
| 109 |
- rules/95-udev-late.rules |
| 110 |
- |
| 111 |
+-if HAVE_KMOD |
| 112 |
+-dist_udevrules_DATA += \ |
| 113 |
+- rules/80-drivers.rules |
| 114 |
+-endif |
| 115 |
+- |
| 116 |
+-dist_udevhwdb_DATA = \ |
| 117 |
+- hwdb/20-pci-vendor-product.hwdb \ |
| 118 |
+- hwdb/20-pci-classes.hwdb \ |
| 119 |
+- hwdb/20-usb-vendor-product.hwdb \ |
| 120 |
+- hwdb/20-usb-classes.hwdb \ |
| 121 |
+- hwdb/20-acpi-vendor.hwdb \ |
| 122 |
+- hwdb/20-OUI.hwdb |
| 123 |
+- |
| 124 |
-udevconfdir = $(sysconfdir)/udev |
| 125 |
-dist_udevconf_DATA = \ |
| 126 |
- src/udev/udev.conf |
| 127 |
@@ -112,7 +124,7 @@ index 64dfe81..a378007 100644 |
| 128 |
|
| 129 |
EXTRA_DIST += \ |
| 130 |
rules/99-systemd.rules.in \ |
| 131 |
-@@ -1783,17 +1734,6 @@ systemd-install-hook: |
| 132 |
+@@ -1936,17 +1875,6 @@ systemd-install-hook: |
| 133 |
ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service |
| 134 |
ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service |
| 135 |
|
| 136 |
@@ -130,8 +142,8 @@ index 64dfe81..a378007 100644 |
| 137 |
libudev_core_la_SOURCES = \ |
| 138 |
src/udev/udev.h \ |
| 139 |
src/udev/udev-event.c \ |
| 140 |
-@@ -1860,14 +1800,6 @@ udevadm_LDADD = \ |
| 141 |
- libsystemd-shared.la |
| 142 |
+@@ -2033,14 +1961,6 @@ hwdb-remove-hook: |
| 143 |
+ -test -n "$(DESTDIR)" || rm -f $(HWDB_BIN) |
| 144 |
|
| 145 |
# ------------------------------------------------------------------------------ |
| 146 |
-TESTS += \ |
| 147 |
@@ -145,7 +157,7 @@ index 64dfe81..a378007 100644 |
| 148 |
test_libudev_SOURCES = \ |
| 149 |
src/test/test-libudev.c |
| 150 |
|
| 151 |
-@@ -1917,8 +1849,6 @@ ata_id_LDADD = \ |
| 152 |
+@@ -2090,8 +2010,6 @@ ata_id_LDADD = \ |
| 153 |
libudev-private.la \ |
| 154 |
libsystemd-shared.la |
| 155 |
|
| 156 |
@@ -154,7 +166,7 @@ index 64dfe81..a378007 100644 |
| 157 |
|
| 158 |
# ------------------------------------------------------------------------------ |
| 159 |
cdrom_id_SOURCES = \ |
| 160 |
-@@ -1928,12 +1858,6 @@ cdrom_id_LDADD = \ |
| 161 |
+@@ -2101,12 +2019,6 @@ cdrom_id_LDADD = \ |
| 162 |
-ludev \ |
| 163 |
libsystemd-shared.la |
| 164 |
|
| 165 |
@@ -167,7 +179,7 @@ index 64dfe81..a378007 100644 |
| 166 |
# ------------------------------------------------------------------------------ |
| 167 |
collect_SOURCES = \ |
| 168 |
src/udev/collect/collect.c |
| 169 |
-@@ -1941,9 +1865,6 @@ collect_SOURCES = \ |
| 170 |
+@@ -2114,9 +2026,6 @@ collect_SOURCES = \ |
| 171 |
collect_LDADD = \ |
| 172 |
libudev-private.la |
| 173 |
|
| 174 |
@@ -177,7 +189,7 @@ index 64dfe81..a378007 100644 |
| 175 |
# ------------------------------------------------------------------------------ |
| 176 |
scsi_id_SOURCES =\ |
| 177 |
src/udev/scsi_id/scsi_id.c \ |
| 178 |
-@@ -1955,9 +1876,6 @@ scsi_id_LDADD = \ |
| 179 |
+@@ -2128,9 +2037,6 @@ scsi_id_LDADD = \ |
| 180 |
libudev-private.la \ |
| 181 |
libsystemd-shared.la |
| 182 |
|
| 183 |
@@ -187,7 +199,7 @@ index 64dfe81..a378007 100644 |
| 184 |
EXTRA_DIST += \ |
| 185 |
src/udev/scsi_id/README |
| 186 |
|
| 187 |
-@@ -1968,12 +1886,6 @@ v4l_id_SOURCES = \ |
| 188 |
+@@ -2141,12 +2047,6 @@ v4l_id_SOURCES = \ |
| 189 |
v4l_id_LDADD = \ |
| 190 |
-ludev |
| 191 |
|
| 192 |
@@ -200,7 +212,7 @@ index 64dfe81..a378007 100644 |
| 193 |
# ------------------------------------------------------------------------------ |
| 194 |
accelerometer_SOURCES = \ |
| 195 |
src/udev/accelerometer/accelerometer.c |
| 196 |
-@@ -1982,12 +1894,6 @@ accelerometer_LDADD = \ |
| 197 |
+@@ -2155,12 +2055,6 @@ accelerometer_LDADD = \ |
| 198 |
-ludev -lm \ |
| 199 |
libsystemd-shared.la |
| 200 |
|
| 201 |
@@ -213,7 +225,7 @@ index 64dfe81..a378007 100644 |
| 202 |
# ------------------------------------------------------------------------------ |
| 203 |
if ENABLE_GUDEV |
| 204 |
if ENABLE_GTK_DOC |
| 205 |
-@@ -2168,99 +2074,11 @@ nodist_keymap_SOURCES = \ |
| 206 |
+@@ -2341,100 +2235,11 @@ nodist_keymap_SOURCES = \ |
| 207 |
BUILT_SOURCES += \ |
| 208 |
$(nodist_keymap_SOURCES) |
| 209 |
|
| 210 |
@@ -267,6 +279,7 @@ index 64dfe81..a378007 100644 |
| 211 |
- keymaps/hewlett-packard-presario-2100 \ |
| 212 |
- keymaps/hewlett-packard-tablet \ |
| 213 |
- keymaps/hewlett-packard-tx2 \ |
| 214 |
+- keymaps/hewlett-packard_elitebook-8440p \ |
| 215 |
- keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ |
| 216 |
- keymaps/inventec-symphony_6.0_7.0 \ |
| 217 |
- keymaps/lenovo-3000 \ |
| 218 |
@@ -293,7 +306,7 @@ index 64dfe81..a378007 100644 |
| 219 |
- keymaps/onkyo \ |
| 220 |
- keymaps/oqo-model2 \ |
| 221 |
- keymaps/samsung-other \ |
| 222 |
-- keymaps/samsung-90x3a \ |
| 223 |
+- keymaps/samsung-series-9 \ |
| 224 |
- keymaps/samsung-sq1us \ |
| 225 |
- keymaps/samsung-sx20s \ |
| 226 |
- keymaps/toshiba-satellite_a100 \ |
| 227 |
@@ -307,13 +320,13 @@ index 64dfe81..a378007 100644 |
| 228 |
- keymaps-force-release/dell-xps \ |
| 229 |
- keymaps-force-release/hp-other \ |
| 230 |
- keymaps-force-release/samsung-other \ |
| 231 |
-- keymaps-force-release/samsung-90x3a \ |
| 232 |
+- keymaps-force-release/samsung-series-9 \ |
| 233 |
- keymaps-force-release/common-volume-keys |
| 234 |
- |
| 235 |
src/udev/keymap/keys.txt: Makefile |
| 236 |
$(AM_V_at)$(MKDIR_P) $(dir $@) |
| 237 |
$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ |
| 238 |
-@@ -2288,12 +2106,6 @@ mtd_probe_SOURCES = \ |
| 239 |
+@@ -2462,12 +2267,6 @@ mtd_probe_SOURCES = \ |
| 240 |
mtd_probe_CPPFLAGS = \ |
| 241 |
$(AM_CPPFLAGS) |
| 242 |
|
| 243 |
@@ -327,5 +340,5 @@ index 64dfe81..a378007 100644 |
| 244 |
libsystemd_id128_la_SOURCES = \ |
| 245 |
src/libsystemd-id128/sd-id128.c |
| 246 |
-- |
| 247 |
-1.7.12 |
| 248 |
+1.8.0 |
| 249 |
|
| 250 |
|
| 251 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 252 |
index b5c23b5..b58d0b3 100644 |
| 253 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 254 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 255 |
@@ -12,7 +12,9 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN} |
| 256 |
inherit git-2 |
| 257 |
#endif |
| 258 |
|
| 259 |
-inherit autotools-utils bash-completion-r1 linux-info pam systemd user |
| 260 |
+PYTHON_COMPAT=( python2_7 ) |
| 261 |
+inherit autotools-utils bash-completion-r1 linux-info pam \ |
| 262 |
+ python-single-r1 systemd user |
| 263 |
|
| 264 |
DESCRIPTION="System and service manager for Linux" |
| 265 |
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" |
| 266 |
@@ -21,8 +23,8 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" |
| 267 |
LICENSE="GPL-2 LGPL-2.1 MIT" |
| 268 |
SLOT="0" |
| 269 |
KEYWORDS="~amd64 ~arm ~x86" |
| 270 |
-IUSE="acl audit cryptsetup gcrypt http lzma pam qrcode selinux tcpd |
| 271 |
- vanilla xattr" |
| 272 |
+IUSE="acl audit cryptsetup gcrypt http lzma pam python qrcode selinux |
| 273 |
+ tcpd vanilla xattr" |
| 274 |
|
| 275 |
MINKV="2.6.39" |
| 276 |
|
| 277 |
@@ -38,6 +40,7 @@ COMMON_DEPEND=">=sys-apps/dbus-1.4.10 |
| 278 |
http? ( net-libs/libmicrohttpd ) |
| 279 |
lzma? ( app-arch/xz-utils ) |
| 280 |
pam? ( virtual/pam ) |
| 281 |
+ python? ( ${PYTHON_DEPS} ) |
| 282 |
qrcode? ( media-gfx/qrencode ) |
| 283 |
selinux? ( sys-libs/libselinux ) |
| 284 |
tcpd? ( sys-apps/tcp-wrappers ) |
| 285 |
@@ -75,6 +78,8 @@ AUTOTOOLS_IN_SOURCE_BUILD=1 |
| 286 |
pkg_setup() { |
| 287 |
enewgroup lock # used by var-lock.mount |
| 288 |
enewgroup tty 5 # used by mount-setup for /dev/pts |
| 289 |
+ |
| 290 |
+ use python && python-single-r1_pkg_setup |
| 291 |
} |
| 292 |
|
| 293 |
src_prepare() { |
| 294 |
@@ -85,7 +90,7 @@ src_prepare() { |
| 295 |
sed -i -e 's:libudev\.la:-ludev:' Makefile.am |
| 296 |
|
| 297 |
local PATCHES=( |
| 298 |
- "${FILESDIR}"/191-0001-Disable-udev-targets-for-udev-190.patch |
| 299 |
+ "${FILESDIR}"/197-0001-Disable-udev-targets.patch |
| 300 |
) |
| 301 |
|
| 302 |
#if LIVE |
| 303 |
@@ -107,11 +112,6 @@ src_configure() { |
| 304 |
--with-rootlibdir=/usr/$(get_libdir) |
| 305 |
# but pam modules have to lie in /lib* |
| 306 |
--with-pamlibdir=/$(get_libdir)/security |
| 307 |
- # this avoids dep on pciutils & usbutils |
| 308 |
- --with-pci-ids-path=/usr/share/misc/pci.ids |
| 309 |
- --with-usb-ids-path=/usr/share/misc/usb.ids |
| 310 |
- # disable python for now |
| 311 |
- --without-python |
| 312 |
# make sure we get /bin:/sbin in $PATH |
| 313 |
--enable-split-usr |
| 314 |
# udev parts |
| 315 |
@@ -125,6 +125,8 @@ src_configure() { |
| 316 |
$(use_enable http microhttpd) |
| 317 |
$(use_enable lzma xz) |
| 318 |
$(use_enable pam) |
| 319 |
+ $(use_with python) |
| 320 |
+ $(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python}) |
| 321 |
$(use_enable qrcode qrencode) |
| 322 |
$(use_enable selinux) |
| 323 |
$(use_enable tcpd tcpwrap) |
| 324 |
@@ -166,6 +168,10 @@ src_install() { |
| 325 |
systemd_enable_service sysinit.target var-run.mount |
| 326 |
fi |
| 327 |
|
| 328 |
+ # Disable storing coredumps in journald, bug #433457 |
| 329 |
+ mv "${D}"/usr/lib/sysctl.d/coredump.conf \ |
| 330 |
+ "${D}"/etc/sysctl.d/coredump.conf.disabled || die |
| 331 |
+ |
| 332 |
# Preserve empty dirs in /etc & /var, bug #437008 |
| 333 |
keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ |
| 334 |
/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd |
Archives