diff options
author | Michał Górny <mgorny@gentoo.org> | 2012-12-15 13:05:57 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2012-12-15 13:05:57 +0000 |
commit | 09954a202b8076690b1d9e0a19bd08c816513bb8 (patch) | |
tree | f0e9f67784f1b57c7599cf5f0ee1ad0c5fdfbf63 /sys-apps | |
parent | Revision bump. Add ruby19. (diff) | |
download | gentoo-2-09954a202b8076690b1d9e0a19bd08c816513bb8.tar.gz gentoo-2-09954a202b8076690b1d9e0a19bd08c816513bb8.tar.bz2 gentoo-2-09954a202b8076690b1d9e0a19bd08c816513bb8.zip |
Import the live ebuild.
(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/systemd/ChangeLog | 8 | ||||
-rw-r--r-- | sys-apps/systemd/files/197-0001-Disable-udev-targets.patch | 344 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 232 |
3 files changed, 583 insertions, 1 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index 87232c316aa8..710fdf5f6fb4 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.63 2012/12/05 21:30:27 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.64 2012/12/15 13:05:57 mgorny Exp $ + +*systemd-9999 (15 Dec 2012) + + 15 Dec 2012; Michał Górny <mgorny@gentoo.org> + +files/197-0001-Disable-udev-targets.patch, +systemd-9999.ebuild: + Import the live ebuild. 05 Dec 2012; Michał Górny <mgorny@gentoo.org> metadata.xml, systemd-196.ebuild: diff --git a/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch b/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch new file mode 100644 index 000000000000..ab37916ffd13 --- /dev/null +++ b/sys-apps/systemd/files/197-0001-Disable-udev-targets.patch @@ -0,0 +1,344 @@ +From 4ee2bb842f9ed3cacab607bce3b0d229dfd88946 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Wed, 15 Aug 2012 14:02:07 +0200 +Subject: [PATCH] Disable udev targets. + +--- + Makefile.am | 203 +----------------------------------------------------------- + 1 file changed, 1 insertion(+), 202 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index e253aa2..cb60abb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -317,8 +317,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 = \ +@@ -348,9 +346,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 + + if HAVE_KMOD +@@ -1781,12 +1776,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 \ +@@ -1811,9 +1800,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 +@@ -1834,12 +1820,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) \ +@@ -1854,15 +1835,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 +@@ -1875,40 +1847,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/64-btrfs.rules \ +- rules/75-net-description.rules \ +- rules/75-tty-description.rules \ +- rules/78-sound-card.rules \ +- rules/95-udev-late.rules +- +-if HAVE_KMOD +-dist_udevrules_DATA += \ +- rules/80-drivers.rules +-endif +- +-dist_udevhwdb_DATA = \ +- hwdb/20-pci-vendor-product.hwdb \ +- hwdb/20-pci-classes.hwdb \ +- hwdb/20-usb-vendor-product.hwdb \ +- hwdb/20-usb-classes.hwdb \ +- hwdb/20-acpi-vendor.hwdb \ +- hwdb/20-OUI.hwdb +- +-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 \ +@@ -1936,17 +1875,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 +- +-rootlibexec_PROGRAMS += \ +- systemd-udevd +- +-noinst_LTLIBRARIES += \ +- libudev-core.la +- + libudev_core_la_SOURCES = \ + src/udev/udev.h \ + src/udev/udev-event.c \ +@@ -2033,14 +1961,6 @@ hwdb-remove-hook: + -test -n "$(DESTDIR)" || rm -f $(HWDB_BIN) + + # ------------------------------------------------------------------------------ +-TESTS += \ +- test/udev-test.pl \ +- test/rules-test.sh +- +-noinst_PROGRAMS += \ +- test-libudev \ +- test-udev +- + test_libudev_SOURCES = \ + src/test/test-libudev.c + +@@ -2090,8 +2010,6 @@ ata_id_LDADD = \ + libudev-private.la \ + libsystemd-shared.la + +-udevlibexec_PROGRAMS += \ +- ata_id + + # ------------------------------------------------------------------------------ + cdrom_id_SOURCES = \ +@@ -2101,12 +2019,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 +@@ -2114,9 +2026,6 @@ collect_SOURCES = \ + collect_LDADD = \ + libudev-private.la + +-udevlibexec_PROGRAMS += \ +- collect +- + # ------------------------------------------------------------------------------ + scsi_id_SOURCES =\ + src/udev/scsi_id/scsi_id.c \ +@@ -2128,9 +2037,6 @@ scsi_id_LDADD = \ + libudev-private.la \ + libsystemd-shared.la + +-udevlibexec_PROGRAMS += \ +- scsi_id +- + EXTRA_DIST += \ + src/udev/scsi_id/README + +@@ -2141,12 +2047,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 +@@ -2155,12 +2055,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 +@@ -2341,100 +2235,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/hewlett-packard_elitebook-8440p \ +- 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/module-sony-vpc \ +- keymaps/olpc-xo \ +- keymaps/onkyo \ +- keymaps/oqo-model2 \ +- keymaps/samsung-other \ +- keymaps/samsung-series-9 \ +- 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-series-9 \ +- 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/' > $@ +@@ -2462,12 +2267,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 +-- +1.8.0 + diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild new file mode 100644 index 000000000000..b1d376b1785c --- /dev/null +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -0,0 +1,232 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.1 2012/12/15 13:05:57 mgorny Exp $ + +EAPI=4 + +#if LIVE +AUTOTOOLS_AUTORECONF=yes +EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN} + http://cgit.freedesktop.org/${PN}/${PN}/" + +inherit git-2 +#endif + +PYTHON_COMPAT=( python2_7 ) +inherit autotools-utils bash-completion-r1 linux-info pam \ + python-single-r1 systemd user + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" +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 gcrypt http +kmod lzma pam python qrcode + selinux tcpd vanilla xattr" + +MINKV="2.6.39" + +COMMON_DEPEND=">=sys-apps/dbus-1.4.10 + >=sys-apps/util-linux-2.20 + ~sys-fs/udev-${PV} + sys-libs/libcap + acl? ( sys-apps/acl ) + audit? ( >=sys-process/audit-2 ) + cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) + http? ( net-libs/libmicrohttpd ) + kmod? ( >=sys-apps/kmod-12 ) + lzma? ( app-arch/xz-utils ) + pam? ( virtual/pam ) + python? ( ${PYTHON_DEPS} ) + qrcode? ( media-gfx/qrencode ) + selinux? ( sys-libs/libselinux ) + tcpd? ( sys-apps/tcp-wrappers ) + xattr? ( sys-apps/attr )" + +RDEPEND="${COMMON_DEPEND} + sys-apps/hwids + || ( + >=sys-apps/util-linux-2.22 + <sys-apps/sysvinit-2.88-r4 + ) + !<sys-libs/glibc-2.10 + !~sys-fs/udev-187" + +# sys-fs/quota is necessary to store correct paths in unit files +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/gperf + dev-util/intltool + sys-fs/quota + >=sys-kernel/linux-headers-${MINKV}" + +#if LIVE +SRC_URI= +KEYWORDS= + +DEPEND="dev-libs/gobject-introspection + dev-util/gtk-doc" +#endif + +AUTOTOOLS_IN_SOURCE_BUILD=1 + +pkg_setup() { + enewgroup lock # used by var-lock.mount + enewgroup tty 5 # used by mount-setup for /dev/pts + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # systemd-analyze is for python2.7 only nowadays. + sed -i -e '1s/python/&2.7/' src/analyze/systemd-analyze + + # link against external udev. + sed -i -e 's:libudev\.la:-ludev:' Makefile.am + + local PATCHES=( + "${FILESDIR}"/197-0001-Disable-udev-targets.patch + ) + +#if LIVE + gtkdocize --docdir docs/ || die +#endif + + autotools-utils_src_prepare + + # XXX: support it within eclass + eautomake +} + +src_configure() { + local myeconfargs=( + --localstatedir=/var + --with-distro=$(use vanilla && echo other || echo gentoo) + # install everything to /usr + --with-rootprefix=/usr + --with-rootlibdir=/usr/$(get_libdir) + # but pam modules have to lie in /lib* + --with-pamlibdir=/$(get_libdir)/security + # make sure we get /bin:/sbin in $PATH + --enable-split-usr + # udev parts + --disable-introspection + --disable-gtk-doc + --disable-gudev + $(use_enable acl) + $(use_enable audit) + $(use_enable cryptsetup libcryptsetup) + $(use_enable gcrypt) + $(use_enable http microhttpd) + $(use_enable kmod) + $(use_enable lzma xz) + $(use_enable pam) + $(use_with python) + $(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python}) + $(use_enable qrcode qrencode) + $(use_enable selinux) + $(use_enable tcpd tcpwrap) + $(use_enable xattr) + ) + + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install \ + bashcompletiondir=/tmp + + # remove pam.d plugin .la-file + prune_libtool_files --modules + + # compat for init= use + dosym ../usr/lib/systemd/systemd /bin/systemd + dosym ../lib/systemd/systemd /usr/bin/systemd + # rsyslog.service depends on it... + dosym ../usr/bin/systemctl /bin/systemctl + + # move files as necessary + newbashcomp "${D}"/tmp/systemd-bash-completion.sh ${PN} + rm -r "${D}"/tmp || die + + # we just keep sysvinit tools, so no need for the mans + rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ + || die + rm "${D}"/usr/share/man/man1/init.1 || die + + if ! use vanilla; then + # Create /run/lock as required by new baselay/OpenRC compat. + systemd_dotmpfilesd "${FILESDIR}"/gentoo-run.conf + + # Add mount-rules for /var/lock and /var/run, bug #433607 + systemd_dounit "${FILESDIR}"/var-{lock,run}.mount + systemd_enable_service sysinit.target var-lock.mount + systemd_enable_service sysinit.target var-run.mount + fi + + # Disable storing coredumps in journald, bug #433457 + mv "${D}"/usr/lib/sysctl.d/coredump.conf \ + "${D}"/etc/sysctl.d/coredump.conf.disabled || die + + # Preserve empty dirs in /etc & /var, bug #437008 + keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ + /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd + + # 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.' +} + +pkg_preinst() { + local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS + ~FANOTIFY ~HOTPLUG ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS ~SIGNALFD + ~SYSFS ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" + kernel_is -ge ${MINKV//./ } || ewarn "Kernel version at least ${MINKV} required" + check_extra_config +} + +optfeature() { + local i desc=${1} text + shift + + text=" [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}" + shift + + for i; do + elog "${text}" + text="& [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}" + done + elog "${text} (${desc})" +} + +pkg_postinst() { + mkdir -p "${ROOT}"/run || ewarn "Unable to mkdir /run, this could mean trouble." + if [[ ! -L "${ROOT}"/etc/mtab ]]; then + ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts." + ewarn "It is known to cause users being unable to unmount user mounts. If you don't" + ewarn "require that specific feature, please call:" + ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" + ewarn + fi + + elog "To get additional features, a number of optional runtime dependencies may" + elog "be installed:" + optfeature 'for systemd-analyze' \ + 'dev-lang/python:2.7' 'dev-python/dbus-python' + optfeature 'for systemd-analyze plotting ability' \ + 'dev-python/pycairo[svg]' + optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \ + 'sys-apps/systemd-ui' + elog + + ewarn "Please note this is a work-in-progress and many packages in Gentoo" + ewarn "do not supply systemd unit files yet. You are testing it on your own" + ewarn "responsibility. Please remember than you can pass:" + ewarn " init=/sbin/init" + ewarn "to your kernel to boot using sysvinit / OpenRC." +} |