* [gentoo-commits] gentoo-x86 commit in sys-fs/eudev: eudev-9999.ebuild eudev-3.1.ebuild ChangeLog
@ 2015-05-30 13:53 Anthony G. Basile (blueness)
0 siblings, 0 replies; only message in thread
From: Anthony G. Basile (blueness) @ 2015-05-30 13:53 UTC (permalink / raw
To: gentoo-commits
blueness 15/05/30 13:53:27
Modified: eudev-9999.ebuild ChangeLog
Added: eudev-3.1.ebuild
Log:
Version bump. eudev-3.1 = udev-220.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path
1.68 sys-fs/eudev/eudev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild?r1=1.67&r2=1.68
Index: eudev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- eudev-9999.ebuild 20 May 2015 16:47:04 -0000 1.67
+++ eudev-9999.ebuild 30 May 2015 13:53:27 -0000 1.68
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.67 2015/05/20 16:47:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.68 2015/05/30 13:53:27 blueness Exp $
EAPI="5"
@@ -127,6 +127,8 @@
--with-rootlibexecdir=/lib/udev
--with-html-dir="/usr/share/doc/${PF}/html"
--enable-split-usr
+ --enable-manpages
+ --disable-hwdb
--exec-prefix=/
$(use_enable gudev)
@@ -192,9 +194,6 @@
prune_libtool_files --all
rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
- # drop distributed hwdb files, they override sys-apps/hwids
- rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
-
insinto /lib/udev/rules.d
doins "${FILESDIR}"/40-gentoo.rules
1.160 sys-fs/eudev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/ChangeLog?rev=1.160&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/ChangeLog?rev=1.160&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/ChangeLog?r1=1.159&r2=1.160
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- ChangeLog 20 May 2015 16:47:04 -0000 1.159
+++ ChangeLog 30 May 2015 13:53:27 -0000 1.160
@@ -1,6 +1,12 @@
# ChangeLog for sys-fs/eudev
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.159 2015/05/20 16:47:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.160 2015/05/30 13:53:27 blueness Exp $
+
+*eudev-3.1 (30 May 2015)
+
+ 30 May 2015; Anthony G. Basile <blueness@gentoo.org> +eudev-3.1.ebuild,
+ eudev-9999.ebuild:
+ Version bump. eudev-3.1 = udev-220.
20 May 2015; Anthony G. Basile <blueness@gentoo.org> eudev-1.10-r2.ebuild,
eudev-2.1.1.ebuild, eudev-3.0.ebuild, eudev-9999.ebuild:
1.1 sys-fs/eudev/eudev-3.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-3.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-3.1.ebuild?rev=1.1&content-type=text/plain
Index: eudev-3.1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-3.1.ebuild,v 1.1 2015/05/30 13:53:27 blueness Exp $
EAPI="5"
KV_min=2.6.39
WANT_AUTOMAKE=1.13
inherit autotools eutils linux-info multilib multilib-minimal user
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
inherit git-2
else
SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
HOMEPAGE="https://github.com/gentoo/eudev"
LICENSE="LGPL-2.1 MIT GPL-2"
SLOT="0"
IUSE="doc gudev +hwdb +kmod introspection selinux static-libs test"
COMMON_DEPEND=">=sys-apps/util-linux-2.20
gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
introspection? ( >=dev-libs/gobject-introspection-1.38 )
kmod? ( >=sys-apps/kmod-16 )
selinux? ( >=sys-libs/libselinux-2.1.9 )
!<sys-libs/glibc-2.11
!sys-apps/gentoo-systemd-integration
!sys-apps/systemd
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)"
DEPEND="${COMMON_DEPEND}
dev-util/gperf
virtual/os-headers
virtual/pkgconfig
>=sys-devel/make-3.82-r4
>=sys-kernel/linux-headers-${KV_min}
doc? ( >=dev-util/gtk-doc-1.18
app-text/docbook-xml-dtd:4.2
app-text/docbook-xml-dtd:4.5
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
)
>=dev-util/intltool-0.50
test? ( app-text/tree dev-lang/perl )"
RDEPEND="${COMMON_DEPEND}
!<sys-fs/lvm2-2.02.103
!<sec-policy/selinux-base-2.20120725-r10
!sys-fs/udev
!sys-apps/systemd"
PDEPEND=">=sys-fs/udev-init-scripts-26
hwdb? ( >=sys-apps/hwids-20140304[udev] )"
# The multilib-build.eclass doesn't handle situation where the installed headers
# are different in ABIs. In this case, we install libgudev headers in native
# ABI but not for non-native ABI.
multilib_check_headers() { :; }
pkg_pretend() {
ewarn
ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
ewarn "as described in the URL below:"
ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
ewarn
ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
ewarn "between the default or user-modified choice of sys-fs/udev. If you wish to disable"
ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
ewarn
}
pkg_setup() {
CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET"
linux-info_pkg_setup
get_running_version
# These are required kernel options, but we don't error out on them
# because you can build under one kernel and run under another.
if kernel_is lt ${KV_min//./ }; then
ewarn
ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
ewarn "Make sure to run udev under kernel version ${KV_min} or above."
ewarn
fi
}
src_prepare() {
# change rules back to group uucp instead of dialout for now
sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
|| die "failed to change group dialout to uucp"
epatch_user
if use doc; then
gtkdocize --docdir docs || die "gtkdocize failed"
else
echo 'EXTRA_DIST =' > docs/gtk-doc.make
fi
eautoreconf
}
multilib_src_configure() {
tc-export CC #463846
export cc_cv_CFLAGS__flto=no #502950
# Keep sorted by ./configure --help and only pass --disable flags
# when *required* to avoid external deps or unnecessary compile
local econf_args
econf_args=(
ac_cv_search_cap_init=
ac_cv_header_sys_capability_h=yes
DBUS_CFLAGS=' '
DBUS_LIBS=' '
--with-rootprefix=
--with-rootrundir=/run
--docdir=/usr/share/doc/${PF}
--libdir=/usr/$(get_libdir)
--with-rootlibexecdir=/lib/udev
--with-html-dir="/usr/share/doc/${PF}/html"
--enable-split-usr
--enable-manpages
--disable-hwdb
--exec-prefix=/
$(use_enable gudev)
)
# Only build libudev for non-native_abi, and only install it to libdir,
# that means all options only apply to native_abi
if multilib_is_native_abi; then
econf_args+=(
--with-rootlibdir=/$(get_libdir)
$(use_enable doc gtk-doc)
$(use_enable introspection)
$(use_enable kmod)
$(use_enable static-libs static)
$(use_enable selinux)
)
else
econf_args+=(
--disable-static
--disable-gtk-doc
--disable-introspection
--disable-kmod
--disable-selinux
)
fi
ECONF_SOURCE="${S}" econf "${econf_args[@]}"
}
multilib_src_compile() {
if multilib_is_native_abi; then
emake
else
emake -C src/shared
emake -C src/libudev
use gudev && emake -C src/gudev
fi
}
multilib_src_install() {
if multilib_is_native_abi; then
emake DESTDIR="${D}" install
else
emake -C src/libudev DESTDIR="${D}" install
use gudev && emake -C src/gudev DESTDIR="${D}" install
fi
}
multilib_src_test() {
# make sandbox get out of the way
# these are safe because there is a fake root filesystem put in place,
# but sandbox seems to evaluate the paths of the test i/o instead of the
# paths of the actual i/o that results.
# also only test for native abi
if multilib_is_native_abi; then
addread /sys
addwrite /dev
addwrite /run
default_src_test
fi
}
multilib_src_install_all() {
prune_libtool_files --all
rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
insinto /lib/udev/rules.d
doins "${FILESDIR}"/40-gentoo.rules
if ! [[ ${PV} = 9999* ]]; then
insinto /usr/share/doc/${PF}/html/gudev
doins "${S}"/docs/gudev/html/*
insinto /usr/share/doc/${PF}/html/libudev
doins "${S}"/docs/libudev/html/*
fi
}
pkg_preinst() {
local htmldir
for htmldir in gudev libudev; do
if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
fi
if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
dosym ../../doc/${PF}/html/${htmldir} \
/usr/share/gtk-doc/html/${htmldir}
fi
done
}
pkg_postinst() {
mkdir -p "${EROOT}"run
# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
# So try to remove it here (will only work if empty).
rmdir "${EROOT}"dev/loop 2>/dev/null
if [[ -d ${EROOT}dev/loop ]]; then
ewarn "Please make sure your remove /dev/loop,"
ewarn "else losetup may be confused when looking for unused devices."
fi
if use hwdb && has_version 'sys-apps/hwids[udev]'; then
udevadm hwdb --update --root="${ROOT%/}"
# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
# reload database after it has be rebuilt, but only if we are not upgrading
# also pass if we are -9999 since who knows what hwdb related changes there might be
if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
[[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
udevadm control --reload
fi
fi
ewarn
ewarn "You need to restart eudev as soon as possible to make the"
ewarn "upgrade go into effect:"
ewarn "\t/etc/init.d/udev --nodeps restart"
elog
elog "For more information on eudev on Gentoo, writing udev rules, and"
elog "fixing known issues visit:"
elog " http://www.gentoo.org/doc/en/udev-guide.xml"
elog
# http://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
# http://bugs.gentoo.org/246847
# http://bugs.gentoo.org/514174
enewgroup input
# Update hwdb database in case the format is changed by udev version.
if has_version 'sys-apps/hwids[udev]'; then
udevadm hwdb --update --root="${ROOT%/}"
# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
if [[ -z ${REPLACING_VERSIONS} ]]; then
# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
return 0
fi
udevadm control --reload
fi
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-05-30 13:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-30 13:53 [gentoo-commits] gentoo-x86 commit in sys-fs/eudev: eudev-9999.ebuild eudev-3.1.ebuild ChangeLog Anthony G. Basile (blueness)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox