From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B414413800E for ; Sat, 11 Aug 2012 07:37:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF45CE0495; Sat, 11 Aug 2012 07:37:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6DC63E0495 for ; Sat, 11 Aug 2012 07:37:45 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 56C811B4149 for ; Sat, 11 Aug 2012 07:37:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id F1AC3E5441 for ; Sat, 11 Aug 2012 07:37:41 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1344670702.13aba75d76944cd45f7ea1a6e482bb86c31baff9.mgorny@gentoo> Subject: [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/ X-VCS-Repository: dev/mgorny X-VCS-Files: sys-apps/systemd/files/0001-Disable-udev-targets.patch sys-apps/systemd/files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch sys-apps/systemd/files/40-gentoo.rules sys-apps/systemd/metadata.xml sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ sys-apps/systemd/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 13aba75d76944cd45f7ea1a6e482bb86c31baff9 X-VCS-Branch: master Date: Sat, 11 Aug 2012 07:37:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 19205c58-1832-4c30-a7bd-1c4d9e6e42ed X-Archives-Hash: 93befbd7442b77d9e9f22d4ae550e816 commit: 13aba75d76944cd45f7ea1a6e482bb86c31baff9 Author: Michał Górny gentoo org> AuthorDate: Sat Aug 11 07:38:22 2012 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Aug 11 07:38:22 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=13aba75d sys-apps/systemd: Update the ebuild not to install udev. (Portage version: 2.2.0_alpha120_p6/git/Linux x86_64, unsigned Manifest commit) --- .../systemd/files/0001-Disable-udev-targets.patch | 323 ++++++++++++++++++++ ...add-lib-udev-rules.d-to-rules-directories.patch | 31 -- sys-apps/systemd/files/40-gentoo.rules | 14 - sys-apps/systemd/metadata.xml | 5 - sys-apps/systemd/systemd-9999.ebuild | 38 +-- 5 files changed, 337 insertions(+), 74 deletions(-) diff --git a/sys-apps/systemd/files/0001-Disable-udev-targets.patch b/sys-apps/systemd/files/0001-Disable-udev-targets.patch new file mode 100644 index 0000000..8e1f0e9 --- /dev/null +++ b/sys-apps/systemd/files/0001-Disable-udev-targets.patch @@ -0,0 +1,323 @@ +From 86f115fa46ed6af9717899e1e2251b68abd96d5b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Sat, 11 Aug 2012 01:38:23 +0200 +Subject: [PATCH] Disable udev targets. + +--- + Makefile.am | 189 +----------------------------------------------------------- + 1 file changed, 1 insertion(+), 188 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 39afb62..de22af7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1588,12 +1588,6 @@ SUBDIRS += \ + docs/libudev + endif + +-include_HEADERS += \ +- src/libudev/libudev.h +- +-lib_LTLIBRARIES += \ +- -ludev +- + libudev_la_SOURCES =\ + src/libudev/libudev-private.h \ + src/libudev/libudev.c \ +@@ -1616,9 +1610,6 @@ libudev_la_LDFLAGS = \ + libudev_la_LIBADD = \ + libsystemd-shared.la + +-pkgconfiglib_DATA += \ +- src/libudev/libudev.pc +- + EXTRA_DIST += \ + src/libudev/libudev.pc.in \ + src/libudev/libudev.sym +@@ -1639,12 +1630,7 @@ libudev-install-move-hook: + libudev-uninstall-move-hook: + rm -f $(DESTDIR)$(rootlibdir)/libudev.so* + +-INSTALL_EXEC_HOOKS += libudev-install-move-hook +-UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook +- + # ------------------------------------------------------------------------------ +-noinst_LTLIBRARIES += \ +- libudev-private.la + + libudev_private_la_SOURCES =\ + $(libudev_la_SOURCES) \ +@@ -1659,15 +1645,6 @@ libudev_private_la_LIBADD = \ + libsystemd-shared.la + + # ------------------------------------------------------------------------------ +-MANPAGES += \ +- man/udev.7 \ +- man/udevadm.8 \ +- man/systemd-udevd.service.8 +- +-MANPAGES_ALIAS += \ +- man/systemd-udevd.8 \ +- man/systemd-udevd-control.socket.8 \ +- man/systemd-udevd-kernel.socket.8 + + 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: + INSTALL_DATA_HOOKS += udev-confdirs + + dist_udevrules_DATA += \ +- rules/99-systemd.rules \ +- rules/42-usb-hid-pm.rules \ +- rules/50-udev-default.rules \ +- rules/60-persistent-storage-tape.rules \ +- rules/60-persistent-serial.rules \ +- rules/60-persistent-input.rules \ +- rules/60-persistent-alsa.rules \ +- rules/60-persistent-storage.rules \ +- rules/75-net-description.rules \ +- rules/75-tty-description.rules \ +- rules/78-sound-card.rules \ +- rules/80-drivers.rules \ +- rules/95-udev-late.rules +- +-udevconfdir = $(sysconfdir)/udev +-dist_udevconf_DATA = \ +- src/udev/udev.conf +- +-sharepkgconfigdir = $(datadir)/pkgconfig +-sharepkgconfig_DATA = \ +- src/udev/udev.pc ++ rules/99-systemd.rules + + EXTRA_DIST += \ + rules/99-systemd.rules.in \ +@@ -1729,15 +1686,6 @@ systemd-install-hook: + + INSTALL_DATA_HOOKS += systemd-install-hook + +-bin_PROGRAMS += \ +- udevadm +- +-rootlibexec_PROGRAMS += \ +- systemd-udevd +- +-noinst_LTLIBRARIES += \ +- libudev-core.la +- + libudev_core_la_SOURCES = \ + src/udev/udev.h \ + src/udev/udev-event.c \ +@@ -1803,14 +1751,6 @@ udevadm_LDADD = \ + libsystemd-shared.la + + # ------------------------------------------------------------------------------ +-TESTS += \ +- test/udev-test.pl \ +- test/rules-test.sh +- +-noinst_PROGRAMS += \ +- test-libudev \ +- test-udev +- + test_libudev_SOURCES = \ + src/test/test-libudev.c + +@@ -1860,8 +1800,6 @@ ata_id_LDADD = \ + libudev-private.la \ + libsystemd-shared.la + +-udevlibexec_PROGRAMS += \ +- ata_id + + # ------------------------------------------------------------------------------ + cdrom_id_SOURCES = \ +@@ -1871,12 +1809,6 @@ cdrom_id_LDADD = \ + -ludev \ + libsystemd-shared.la + +-udevlibexec_PROGRAMS += \ +- cdrom_id +- +-dist_udevrules_DATA += \ +- rules/60-cdrom_id.rules +- + # ------------------------------------------------------------------------------ + collect_SOURCES = \ + src/udev/collect/collect.c +@@ -1884,9 +1816,6 @@ collect_SOURCES = \ + collect_LDADD = \ + libudev-private.la + +-udevlibexec_PROGRAMS += \ +- collect +- + # ------------------------------------------------------------------------------ + scsi_id_SOURCES =\ + src/udev/scsi_id/scsi_id.c \ +@@ -1898,9 +1827,6 @@ scsi_id_LDADD = \ + libudev-private.la \ + libsystemd-shared.la + +-udevlibexec_PROGRAMS += \ +- scsi_id +- + EXTRA_DIST += \ + src/udev/scsi_id/README + +@@ -1911,12 +1837,6 @@ v4l_id_SOURCES = \ + v4l_id_LDADD = \ + -ludev + +-udevlibexec_PROGRAMS += \ +- v4l_id +- +-dist_udevrules_DATA += \ +- rules/60-persistent-v4l.rules +- + # ------------------------------------------------------------------------------ + accelerometer_SOURCES = \ + src/udev/accelerometer/accelerometer.c +@@ -1925,12 +1845,6 @@ accelerometer_LDADD = \ + -ludev -lm \ + libsystemd-shared.la + +-udevlibexec_PROGRAMS += \ +- accelerometer +- +-dist_udevrules_DATA += \ +- rules/61-accelerometer.rules +- + # ------------------------------------------------------------------------------ + if ENABLE_GUDEV + if ENABLE_GTK_DOC +@@ -2111,98 +2025,11 @@ nodist_keymap_SOURCES = \ + BUILT_SOURCES += \ + $(nodist_keymap_SOURCES) + +-udevlibexec_PROGRAMS += \ +- keymap +- +-dist_doc_DATA += \ +- src/udev/keymap/README.keymap.txt +- +-dist_udevrules_DATA += \ +- src/udev/keymap/95-keymap.rules \ +- src/udev/keymap/95-keyboard-force-release.rules +- +-dist_udevhome_SCRIPTS = \ +- src/udev/keymap/findkeyboards \ +- src/udev/keymap/keyboard-force-release.sh +- +-TESTS += \ +- src/udev/keymap/check-keymaps.sh +- + CLEANFILES += \ + src/udev/keymap/keys.txt \ + src/udev/keymap/keys-from-name.gperf \ + src/udev/keymap/keyboard-force-release.sh + +-udevkeymapdir = $(udevlibexecdir)/keymaps +-dist_udevkeymap_DATA = \ +- keymaps/acer \ +- keymaps/acer-aspire_5720 \ +- keymaps/acer-aspire_8930 \ +- keymaps/acer-aspire_5920g \ +- keymaps/acer-aspire_6920 \ +- keymaps/acer-travelmate_c300 \ +- keymaps/asus \ +- keymaps/compaq-e_evo \ +- keymaps/dell \ +- keymaps/dell-latitude-xt2 \ +- keymaps/everex-xt5000 \ +- keymaps/fujitsu-amilo_li_2732 \ +- keymaps/fujitsu-amilo_pa_2548 \ +- keymaps/fujitsu-amilo_pro_edition_v3505 \ +- keymaps/fujitsu-amilo_pro_v3205 \ +- keymaps/fujitsu-amilo_si_1520 \ +- keymaps/fujitsu-esprimo_mobile_v5 \ +- keymaps/fujitsu-esprimo_mobile_v6 \ +- keymaps/genius-slimstar-320 \ +- keymaps/hewlett-packard \ +- keymaps/hewlett-packard-2510p_2530p \ +- keymaps/hewlett-packard-compaq_elitebook \ +- keymaps/hewlett-packard-pavilion \ +- keymaps/hewlett-packard-presario-2100 \ +- keymaps/hewlett-packard-tablet \ +- keymaps/hewlett-packard-tx2 \ +- keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ +- keymaps/inventec-symphony_6.0_7.0 \ +- keymaps/lenovo-3000 \ +- keymaps/lenovo-ideapad \ +- keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ +- keymaps/lenovo-thinkpad_x6_tablet \ +- keymaps/lenovo-thinkpad_x200_tablet \ +- keymaps/lg-x110 \ +- keymaps/logitech-wave \ +- keymaps/logitech-wave-cordless \ +- keymaps/logitech-wave-pro-cordless \ +- keymaps/maxdata-pro_7000 \ +- keymaps/medion-fid2060 \ +- keymaps/medionnb-a555 \ +- keymaps/micro-star \ +- keymaps/module-asus-w3j \ +- keymaps/module-ibm \ +- keymaps/module-lenovo \ +- keymaps/module-sony \ +- keymaps/module-sony-old \ +- keymaps/module-sony-vgn \ +- keymaps/olpc-xo \ +- keymaps/onkyo \ +- keymaps/oqo-model2 \ +- keymaps/samsung-other \ +- keymaps/samsung-90x3a \ +- keymaps/samsung-sq1us \ +- keymaps/samsung-sx20s \ +- keymaps/toshiba-satellite_a100 \ +- keymaps/toshiba-satellite_a110 \ +- keymaps/toshiba-satellite_m30x \ +- keymaps/zepto-znote +- +-udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release +-dist_udevkeymapforcerel_DATA = \ +- keymaps-force-release/dell-touchpad \ +- keymaps-force-release/dell-xps \ +- keymaps-force-release/hp-other \ +- keymaps-force-release/samsung-other \ +- keymaps-force-release/samsung-90x3a \ +- keymaps-force-release/common-volume-keys +- + 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 = \ + mtd_probe_CPPFLAGS = \ + $(AM_CPPFLAGS) + +-dist_udevrules_DATA += \ +- rules/75-probe_mtd.rules +- +-udevlibexec_PROGRAMS += \ +- mtd_probe +- + # ------------------------------------------------------------------------------ + 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/files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch b/sys-apps/systemd/files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch deleted file mode 100644 index 318df1b..0000000 --- a/sys-apps/systemd/files/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d395d7616d089eae34c5b2a81e5cefa13c32acb1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Fri, 13 Jul 2012 16:15:14 +0200 -Subject: [PATCH] udev: add /lib/udev/rules.d to rules directories - -This adds /lib if split-usr is enabled -to the directories where udev searches for rules.d. - -This is needed if split-usr is enabled because some software still -installs rules in /lib/udev/rules.d. ---- - src/udev/udev-rules.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index d3b33e4..f30fa5a 100644 ---- a/src/udev/udev-rules.c -+++ b/src/udev/udev-rules.c -@@ -1760,6 +1760,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) - rules->dirs = strv_new(SYSCONFDIR "/udev/rules.d", - "/run/udev/rules.d", - UDEVLIBEXECDIR "/rules.d", -+#ifdef HAVE_SPLIT_USR -+ "/lib/udev/rules.d", -+#endif - NULL); - if (!rules->dirs) { - log_error("failed to build config directory array"); --- -1.7.8.6 - diff --git a/sys-apps/systemd/files/40-gentoo.rules b/sys-apps/systemd/files/40-gentoo.rules deleted file mode 100644 index fa99ba9..0000000 --- a/sys-apps/systemd/files/40-gentoo.rules +++ /dev/null @@ -1,14 +0,0 @@ -# do not edit this file, it will be overwritten on update - -# setting permissions -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" - -# dialout devices -KERNEL=="ippp*|isdn*|dcbri*|rfcomm*|ttyACM[0-9]*|pilot", GROUP="uucp" - -# sound devices (oss) -SUBSYSTEM=="snd", GROUP="audio" - -# Sony Vaio Jogdial sonypi device -KERNEL=="sonypi", MODE="0666" - diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml index 4a129bb..2c289e2 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -9,10 +9,5 @@ Enable support for sys-process/audit Use libcryptsetup - Build gtk-doc API docs - Enable libudev gobject interface - Use dev-libs/gobject-introspection - for introspection - Enable support for sys-boot/plymouth diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index e4a9dfb..509d4df 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -21,7 +21,7 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1 MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="acl audit cryptsetup doc gudev introspection lzma pam selinux tcpd" +IUSE="acl audit cryptsetup lzma pam selinux tcpd" # We need to depend on sysvinit for sulogin which is used in the rescue # mode. Bug #399615. @@ -31,25 +31,20 @@ 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-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 ) - gudev? ( dev-libs/glib:2 ) - introspection? ( dev-libs/gobject-introspection ) lzma? ( app-arch/xz-utils ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers )" # sysvinit for sulogin -# udev is bundled -# udev-init-scripts not to break systems running openrc RDEPEND="${COMMON_DEPEND} sys-apps/hwids sys-apps/sysvinit - >=sys-fs/udev-init-scripts-14 - !sys-fs/udev !=sys-kernel/linux-headers-${MINKV} - doc? ( dev-util/gtk-doc )" + >=sys-kernel/linux-headers-${MINKV}" #if LIVE SRC_URI= @@ -79,18 +73,21 @@ src_prepare() { # systemd-analyze is for python2.7 only nowadays. sed -i -e '1s/python/&2.7/' src/analyze/systemd-analyze - # change rules back to group uucp instead of dialout for now - sed -e '/GROUP=/s:dialout:uucp:' \ - -i rules/*.rules || die + # link against external udev. + sed -i -e 's:libudev\.la:-ludev:' Makefile.am local PATCHES=( - "${FILESDIR}"/0001-udev-add-lib-udev-rules.d-to-rules-directories.patch + "${FILESDIR}"/0001-Disable-udev-targets.patch ) -#if LIVE /* XXX: do something about it... */ +#if LIVE gtkdocize --docdir docs/ || die #endif + autotools-utils_src_prepare + + # XXX: support it within eclass + eautomake } src_configure() { @@ -105,16 +102,15 @@ src_configure() { # this avoids dep on pciutils & usbutils --with-pci-ids-path=/usr/share/misc/pci.ids --with-usb-ids-path=/usr/share/misc/usb.ids - # firmware search path - --with-firmware-path=/usr/lib/firmware/updates:/usr/lib/firmware:/lib/firmware/updates:/lib/firmware # make sure we get /bin:/sbin in $PATH --enable-split-usr + # udev parts + --disable-introspection + --disable-gudev $(use_enable acl) $(use_enable audit) $(use_enable cryptsetup libcryptsetup) $(use_enable doc gtk-doc) - $(use_enable gudev) - $(use_enable introspection) $(use_enable lzma xz) $(use_enable pam) $(use_enable selinux) @@ -147,15 +143,9 @@ src_install() { insinto /usr/lib/tmpfiles.d doins "${FILESDIR}"/gentoo-run.conf - # Gentoo rules for udev. - insinto /usr/lib/udev/rules.d - doins "${FILESDIR}"/40-gentoo.rules -#if LIVE - # Check whether we won't break user's system. [[ -x "${D}"/bin/systemd ]] || die '/bin/systemd symlink broken, aborting.' [[ -x "${D}"/usr/bin/systemd ]] || die '/usr/bin/systemd symlink broken, aborting.' -#endif } pkg_preinst() {