public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/
Date: Wed, 15 Aug 2012 16:04:35 +0000 (UTC)	[thread overview]
Message-ID: <1345046722.fa953f3de2e51ac17845891577f8738ebeac95af.mgorny@gentoo> (raw)

commit:     fa953f3de2e51ac17845891577f8738ebeac95af
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 16:05:22 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 16:05:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=fa953f3d

sys-apps/systemd: Sync the udev-188 changes.

(Portage version: 2.2.0_alpha120_p33/git/Linux x86_64, unsigned Manifest commit)

---
 ...> 0001-Disable-udev-targets-for-udev-188.patch} |   82 +++++++++++---------
 sys-apps/systemd/systemd-9999.ebuild               |    7 +-
 2 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/sys-apps/systemd/files/0001-Disable-udev-targets.patch b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-188.patch
similarity index 79%
rename from sys-apps/systemd/files/0001-Disable-udev-targets.patch
rename to sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-188.patch
index 8e1f0e9..e6819ee 100644
--- a/sys-apps/systemd/files/0001-Disable-udev-targets.patch
+++ b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-188.patch
@@ -1,17 +1,36 @@
-From 86f115fa46ed6af9717899e1e2251b68abd96d5b Mon Sep 17 00:00:00 2001
+From d8f51d193f93c442795b8c91d750f1e3ffdad544 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 11 Aug 2012 01:38:23 +0200
-Subject: [PATCH] Disable udev targets.
+Date: Wed, 15 Aug 2012 14:02:07 +0200
+Subject: [PATCH] Disable udev targets, for udev-188.
 
 ---
- Makefile.am | 189 +-----------------------------------------------------------
- 1 file changed, 1 insertion(+), 188 deletions(-)
+ Makefile.am | 188 +-----------------------------------------------------------
+ 1 file changed, 1 insertion(+), 187 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 39afb62..de22af7 100644
+index 39afb62..4997902 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1588,12 +1588,6 @@ SUBDIRS += \
+@@ -307,8 +307,6 @@ dist_systemunit_DATA = \
+ 	units/systemd-ask-password-wall.path \
+ 	units/systemd-ask-password-console.path \
+ 	units/syslog.target \
+-	units/systemd-udevd-control.socket \
+-	units/systemd-udevd-kernel.socket \
+ 	units/system-update.target
+ 
+ nodist_systemunit_DATA = \
+@@ -338,9 +336,6 @@ nodist_systemunit_DATA = \
+ 	units/systemd-kexec.service \
+ 	units/systemd-fsck@.service \
+ 	units/systemd-fsck-root.service \
+-	units/systemd-udevd.service \
+-	units/systemd-udev-trigger.service \
+-	units/systemd-udev-settle.service \
+ 	units/debug-shell.service
+ 
+ dist_userunit_DATA = \
+@@ -1588,12 +1583,6 @@ SUBDIRS += \
  	docs/libudev
  endif
  
@@ -24,7 +43,7 @@ index 39afb62..de22af7 100644
  libudev_la_SOURCES =\
  	src/libudev/libudev-private.h \
  	src/libudev/libudev.c \
-@@ -1616,9 +1610,6 @@ libudev_la_LDFLAGS = \
+@@ -1616,9 +1605,6 @@ libudev_la_LDFLAGS = \
  libudev_la_LIBADD = \
  	libsystemd-shared.la
  
@@ -34,7 +53,7 @@ index 39afb62..de22af7 100644
  EXTRA_DIST += \
  	src/libudev/libudev.pc.in \
  	src/libudev/libudev.sym
-@@ -1639,12 +1630,7 @@ libudev-install-move-hook:
+@@ -1639,12 +1625,7 @@ libudev-install-move-hook:
  libudev-uninstall-move-hook:
  	rm -f $(DESTDIR)$(rootlibdir)/libudev.so*
  
@@ -47,7 +66,7 @@ index 39afb62..de22af7 100644
  
  libudev_private_la_SOURCES =\
  	$(libudev_la_SOURCES) \
-@@ -1659,15 +1645,6 @@ libudev_private_la_LIBADD = \
+@@ -1659,15 +1640,6 @@ libudev_private_la_LIBADD = \
  	libsystemd-shared.la
  
  # ------------------------------------------------------------------------------
@@ -63,7 +82,7 @@ index 39afb62..de22af7 100644
  
  man/systemd-udevd.8: man/systemd-udevd.service.8
  man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
-@@ -1679,27 +1656,7 @@ udev-confdirs:
+@@ -1679,27 +1651,7 @@ udev-confdirs:
  INSTALL_DATA_HOOKS += udev-confdirs
  
  dist_udevrules_DATA += \
@@ -92,10 +111,12 @@ index 39afb62..de22af7 100644
  
  EXTRA_DIST += \
  	rules/99-systemd.rules.in \
-@@ -1729,15 +1686,6 @@ systemd-install-hook:
- 
- INSTALL_DATA_HOOKS += systemd-install-hook
+@@ -1727,17 +1679,6 @@ systemd-install-hook:
+ 	ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service
+ 	ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
  
+-INSTALL_DATA_HOOKS += systemd-install-hook
+-
 -bin_PROGRAMS += \
 -	udevadm
 -
@@ -108,7 +129,7 @@ index 39afb62..de22af7 100644
  libudev_core_la_SOURCES = \
  	src/udev/udev.h \
  	src/udev/udev-event.c \
-@@ -1803,14 +1751,6 @@ udevadm_LDADD = \
+@@ -1803,14 +1744,6 @@ udevadm_LDADD = \
  	libsystemd-shared.la
  
  # ------------------------------------------------------------------------------
@@ -123,7 +144,7 @@ index 39afb62..de22af7 100644
  test_libudev_SOURCES = \
  	src/test/test-libudev.c
  
-@@ -1860,8 +1800,6 @@ ata_id_LDADD = \
+@@ -1860,8 +1793,6 @@ ata_id_LDADD = \
  	libudev-private.la \
  	libsystemd-shared.la
  
@@ -132,7 +153,7 @@ index 39afb62..de22af7 100644
  
  # ------------------------------------------------------------------------------
  cdrom_id_SOURCES = \
-@@ -1871,12 +1809,6 @@ cdrom_id_LDADD = \
+@@ -1871,12 +1802,6 @@ cdrom_id_LDADD = \
  	-ludev \
  	libsystemd-shared.la
  
@@ -145,7 +166,7 @@ index 39afb62..de22af7 100644
  # ------------------------------------------------------------------------------
  collect_SOURCES = \
  	src/udev/collect/collect.c
-@@ -1884,9 +1816,6 @@ collect_SOURCES = \
+@@ -1884,9 +1809,6 @@ collect_SOURCES = \
  collect_LDADD = \
  	libudev-private.la
  
@@ -155,7 +176,7 @@ index 39afb62..de22af7 100644
  # ------------------------------------------------------------------------------
  scsi_id_SOURCES =\
  	src/udev/scsi_id/scsi_id.c \
-@@ -1898,9 +1827,6 @@ scsi_id_LDADD = \
+@@ -1898,9 +1820,6 @@ scsi_id_LDADD = \
  	libudev-private.la \
  	libsystemd-shared.la
  
@@ -165,7 +186,7 @@ index 39afb62..de22af7 100644
  EXTRA_DIST += \
  	src/udev/scsi_id/README
  
-@@ -1911,12 +1837,6 @@ v4l_id_SOURCES = \
+@@ -1911,12 +1830,6 @@ v4l_id_SOURCES = \
  v4l_id_LDADD = \
  	-ludev
  
@@ -178,7 +199,7 @@ index 39afb62..de22af7 100644
  # ------------------------------------------------------------------------------
  accelerometer_SOURCES = \
  	src/udev/accelerometer/accelerometer.c
-@@ -1925,12 +1845,6 @@ accelerometer_LDADD = \
+@@ -1925,12 +1838,6 @@ accelerometer_LDADD = \
  	-ludev -lm \
  	libsystemd-shared.la
  
@@ -191,7 +212,7 @@ index 39afb62..de22af7 100644
  # ------------------------------------------------------------------------------
  if ENABLE_GUDEV
  if ENABLE_GTK_DOC
-@@ -2111,98 +2025,11 @@ nodist_keymap_SOURCES = \
+@@ -2111,98 +2018,11 @@ nodist_keymap_SOURCES = \
  BUILT_SOURCES += \
  	$(nodist_keymap_SOURCES)
  
@@ -290,7 +311,7 @@ index 39afb62..de22af7 100644
  src/udev/keymap/keys.txt: Makefile
  	$(AM_V_at)$(MKDIR_P) $(dir $@)
  	$(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/' > $@
-@@ -2230,12 +2057,6 @@ mtd_probe_SOURCES =  \
+@@ -2230,12 +2050,6 @@ mtd_probe_SOURCES =  \
  mtd_probe_CPPFLAGS = \
  	$(AM_CPPFLAGS)
  
@@ -303,21 +324,6 @@ index 39afb62..de22af7 100644
  # ------------------------------------------------------------------------------
  libsystemd_id128_la_SOURCES = \
  	src/libsystemd-id128/sd-id128.c
-@@ -3244,14 +3065,6 @@ systemd_multi_seat_x_LDADD = \
- rootlibexec_PROGRAMS += \
- 	systemd-multi-seat-x
- 
--dist_udevrules_DATA += \
--	src/login/70-uaccess.rules \
--	src/login/70-power-switch.rules
--
--nodist_udevrules_DATA += \
--	src/login/71-seat.rules \
--	src/login/73-seat-late.rules
--
- MANPAGES += \
- 	man/systemd-logind.service.8 \
- 	man/logind.conf.5 \
 -- 
 1.7.11.1
 

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 5b54737..50d787a 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -31,7 +31,7 @@ MINKV="2.6.39"
 COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 	>=sys-apps/kmod-5
 	>=sys-apps/util-linux-2.20
-	>=sys-fs/udev-187
+	~sys-fs/udev-188
 	sys-libs/libcap
 	acl? ( sys-apps/acl )
 	audit? ( >=sys-process/audit-2 )
@@ -45,7 +45,8 @@ COMMON_DEPEND=">=sys-apps/dbus-1.4.10
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/hwids
 	sys-apps/sysvinit
-	!<sys-libs/glibc-2.10"
+	!<sys-libs/glibc-2.10
+	!~sys-fs/udev-187"
 DEPEND="${COMMON_RDEPEND}
 	app-arch/xz-utils
 	app-text/docbook-xsl-stylesheets
@@ -77,7 +78,7 @@ src_prepare() {
 	sed -i -e 's:libudev\.la:-ludev:' Makefile.am
 
 	local PATCHES=(
-		"${FILESDIR}"/0001-Disable-udev-targets.patch
+		"${FILESDIR}"/0001-Disable-udev-targets-for-udev-188.patch
 	)
 
 #if LIVE


             reply	other threads:[~2012-08-15 16:04 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-15 16:04 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-12-02 11:00 [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/ Michał Górny
2012-09-26  5:51 Michał Górny
2012-09-21 21:32 Michał Górny
2012-09-03 21:31 Michał Górny
2012-08-24 17:20 Michał Górny
2012-08-11  7:37 Michał Górny
2012-08-11  7:37 Michał Górny
2012-07-09 22:03 Michał Górny
2012-01-06 10:17 Michał Górny
2011-12-12 12:09 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1345046722.fa953f3de2e51ac17845891577f8738ebeac95af.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox