[gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    13/07/01 17:32:10

  Modified:             ChangeLog udev-9999.ebuild
  Log:
  Improve the postinst message about networking wrt #474864 by "Coacher". Pass --disable-tmpfiles to follow upstream git. Separate building of the udev helpers to avoid more parallel make problems that aren't fixed by upgrading sys-devel/make to 3.82-r4.
  
  (Portage version: 2.2.0_alpha184/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.931                sys-fs/udev/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.931&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.931&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.930&r2=1.931

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.930
retrieving revision 1.931
diff -u -r1.930 -r1.931
--- ChangeLog	30 Jun 2013 18:05:43 -0000	1.930
+++ ChangeLog	1 Jul 2013 17:32:10 -0000	1.931
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.930 2013/06/30 18:05:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.931 2013/07/01 17:32:10 ssuominen Exp $
+
+  01 Jul 2013; Samuli Suominen <ssuominen@g.o> udev-9999.ebuild:
+  Improve the postinst message about networking wrt #474864 by "Coacher". Pass
+  --disable-tmpfiles to follow upstream git. Separate building of the udev
+  helpers to avoid more parallel make problems that aren't fixed by upgrading
+  sys-devel/make to 3.82-r4.
 
   30 Jun 2013; Agostino Sarubbo <ago@g.o> udev-204.ebuild:
   Stable for s390, wrt bug #470580



1.230                sys-fs/udev/udev-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.230&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.230&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.229&r2=1.230

Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- udev-9999.ebuild	7 Jun 2013 18:00:05 -0000	1.229
+++ udev-9999.ebuild	1 Jul 2013 17:32:10 -0000	1.230
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.229 2013/06/07 18:00:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.230 2013/07/01 17:32:10 ssuominen Exp $
 
 EAPI=5
 
@@ -147,6 +147,14 @@
 	SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666"
 	EOF
 
+	# Create link to systemd-udevd.8 here to avoid parallel build problem and
+	# while at it, create convinience link to `man 8 udevd` even if upstream
+	# doesn't do that anymore
+	local man
+	for man in udevd systemd-udevd; do
+		echo '.so systemd-udevd.service.8' > "${T}"/${man}.8
+	done
+
 	# Remove requirements for gettext and intltool wrt bug #443028
 	if ! has_version dev-util/intltool && ! [[ ${PV} = 9999* ]]; then
 		sed -i \
@@ -190,10 +198,6 @@
 		echo '#define secure_getenv(x) NULL' >> config.h.in
 		sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
 	fi
-
-	# link udevd(8) and systemd-udevd(8) manpages to systemd-udevd.service(8) manpage
-	echo '.so systemd-udevd.service.8' > "${T}"/udevd.8
-	echo '.so systemd-udevd.service.8' > "${T}"/systemd-udevd.8
 }
 
 src_configure() {
@@ -201,13 +205,11 @@
 	use keymap || export ac_cv_prog_ac_ct_GPERF=true #452760
 
 	local econf_args
-
 	econf_args=(
 		ac_cv_search_cap_init=
 		ac_cv_header_sys_capability_h=yes
 		DBUS_CFLAGS=' '
 		DBUS_LIBS=' '
-		--bindir=/bin
 		--docdir=/usr/share/doc/${PF}
 		--libdir=/usr/$(get_libdir)
 		--with-html-dir=/usr/share/doc/${PF}/html
@@ -232,6 +234,9 @@
 		--disable-timedated
 		--disable-xz
 		--disable-polkit
+		--disable-smack
+		--disable-tmpfiles
+		--enable-introspection=$(usex introspection)
 		$(use_enable acl)
 		$(use_enable doc gtk-doc)
 		$(use_enable gudev)
@@ -240,26 +245,30 @@
 		$(use_enable selinux)
 		$(use_enable static-libs static)
 	)
-	if use introspection; then
-		econf_args+=(
-			--enable-introspection=$(usex introspection)
-		)
-	fi
-	if use firmware-loader; then
-		econf_args+=(
-			--with-firmware-path="/lib/firmware/updates:/lib/firmware"
-		)
-	fi
+	use firmware-loader && econf_args+=( --with-firmware-path="/lib/firmware/updates:/lib/firmware" )
+
 	econf "${econf_args[@]}"
 }
 
 src_compile() {
 	echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
 	emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
-	local targets=(
-		libudev.la
+
+	# Most of the parallel build problems were solved by >=sys-devel/make-3.82-r4,
+	# but not everything -- separate building of the binaries as a workaround,
+	# which will force internal libraries required for the helpers to be built
+	# early enough, like eg. libsystemd-shared.la
+	local lib_targets=( libudev.la )
+	use gudev && lib_targets+=( libgudev-1.0.la )
+	emake "${lib_targets[@]}"
+
+	local exec_targets=(
 		systemd-udevd
 		udevadm
+		)
+	emake "${exec_targets[@]}"
+
+	local helper_targets=(
 		ata_id
 		cdrom_id
 		collect
@@ -267,14 +276,17 @@
 		v4l_id
 		accelerometer
 		mtd_probe
+		)
+	use keymap && helper_targets+=( keymap )
+	emake "${helper_targets[@]}"
+
+	local man_targets=(
 		man/udev.7
 		man/udevadm.8
 		man/systemd-udevd.service.8
 	)
-	use keymap && targets+=( keymap )
-	use gudev && targets+=( libgudev-1.0.la )
+	emake "${man_targets[@]}"
 
-	emake "${targets[@]}"
 	if use doc; then
 		emake -C docs/libudev
 		use gudev && emake -C docs/gudev
@@ -289,7 +301,7 @@
 		install-libLTLIBRARIES
 		install-includeHEADERS
 		install-libgudev_includeHEADERS
-		install-binPROGRAMS
+		install-rootbinPROGRAMS
 		install-rootlibexecPROGRAMS
 		install-udevlibexecPROGRAMS
 		install-dist_udevconfDATA
@@ -317,7 +329,7 @@
 	# add final values of variables:
 	targets+=(
 		rootlibexec_PROGRAMS=systemd-udevd
-		bin_PROGRAMS=udevadm
+		rootbin_PROGRAMS=udevadm
 		lib_LTLIBRARIES="${lib_LTLIBRARIES}"
 		MANPAGES="man/udev.7 man/udevadm.8 \
 				man/systemd-udevd.service.8"
@@ -339,11 +351,10 @@
 		"${D}"/lib/udev/rules.d/99-systemd.rules \
 		"${D}"/usr/share/doc/${PF}/LICENSE.*
 
-	# see src_prepare() for content of these files
+	# see src_prepare() for content of these
 	insinto /lib/udev/rules.d
 	doins "${T}"/40-gentoo.rules
-	doman "${T}"/udevd.8
-	doman "${T}"/systemd-udevd.8
+	doman "${T}"/{systemd-,}udevd.8
 
 	# install udevadm compatibility symlink
 	dosym {../bin,sbin}/udevadm
@@ -433,23 +444,27 @@
 		fi
 	done
 
+	elog
+	elog "Starting from version >= 200 the new predictable network interface names are"
+	elog "used by default, see:"
+	elog "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+	elog "http://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
+	elog
+	elog "Example command to get the information for the new interface name before booting"
+	elog "(replace <ifname> with, for example, eth0):"
+	elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
+	elog
+	elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
+	elog "file /etc/udev/rules.d/80-net-name-slot.rules, or symlink it to /dev/null"
+	elog "to disable the feature."
+
 	if has_version sys-apps/biosdevname; then
 		ewarn
-		ewarn "You have sys-apps/biosdevname installed which has been deprecated"
-		ewarn "in favor of the predictable network interface names."
+		ewarn "You can replace the functionality of  sys-apps/biosdevname which you have"
+		ewarn "installed with the new predictable network interface names."
 	fi
 
 	ewarn
-	ewarn "The new predictable network interface names are used by default, see:"
-	ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	ewarn
-	ewarn "Example command to get the information for the new interface name before booting"
-	ewarn "(replace <ifname> with, for example, eth0):"
-	ewarn "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
-	ewarn
-	ewarn "You can use kernel commandline net.ifnames=0 to disable this feature."
-
-	ewarn
 	ewarn "You need to restart udev as soon as possible to make the upgrade go"
 	ewarn "into effect."
 	ewarn "The method you use to do this depends on your init system."
@@ -458,9 +473,9 @@
 
 	elog
 	elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
-	elog "         fixing known issues visit:"
-	elog "         http://wiki.gentoo.org/wiki/Udev/upgrade"
-	elog "         http://www.gentoo.org/doc/en/udev-guide.xml"
+	elog "fixing known issues visit:"
+	elog "http://wiki.gentoo.org/wiki/Udev/upgrade"
+	elog "http://www.gentoo.org/doc/en/udev-guide.xml"
 
 	# Update hwdb database in case the format is changed by udev version.
 	if use hwdb && has_version 'sys-apps/hwids[udev]'; then