From 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 13 Mar 2018 16:55:35 +0000 Subject: gentoo resync : 13.03.2018 --- sys-fs/Manifest.gz | Bin 22045 -> 21869 bytes sys-fs/btrfs-progs/Manifest | 2 +- sys-fs/btrfs-progs/metadata.xml | 4 + sys-fs/ocfs2-tools/Manifest | 7 - .../files/ocfs2-tools-1.6.4-asneeded.patch | 78 ----- .../files/ocfs2-tools-recent-kernels.patch | 19 -- sys-fs/ocfs2-tools/files/ocfs2.confd | 37 --- sys-fs/ocfs2-tools/files/ocfs2.initd | 124 -------- sys-fs/ocfs2-tools/metadata.xml | 11 - sys-fs/ocfs2-tools/ocfs2-tools-1.8.2-r2.ebuild | 83 ------ sys-fs/udev/Manifest | 2 + sys-fs/udev/udev-238.ebuild | 327 +++++++++++++++++++++ 12 files changed, 334 insertions(+), 360 deletions(-) delete mode 100644 sys-fs/ocfs2-tools/Manifest delete mode 100644 sys-fs/ocfs2-tools/files/ocfs2-tools-1.6.4-asneeded.patch delete mode 100644 sys-fs/ocfs2-tools/files/ocfs2-tools-recent-kernels.patch delete mode 100644 sys-fs/ocfs2-tools/files/ocfs2.confd delete mode 100644 sys-fs/ocfs2-tools/files/ocfs2.initd delete mode 100644 sys-fs/ocfs2-tools/metadata.xml delete mode 100644 sys-fs/ocfs2-tools/ocfs2-tools-1.8.2-r2.ebuild create mode 100644 sys-fs/udev/udev-238.ebuild (limited to 'sys-fs') diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz index 3a2af32dc22e..b44ffcf57fea 100644 Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 1a1a528151e6..1b274e03367c 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -17,4 +17,4 @@ EBUILD btrfs-progs-4.15.ebuild 2515 BLAKE2B 1ea8bdd9f1162533c673c95f251b214260f1 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4 EBUILD btrfs-progs-9999.ebuild 2515 BLAKE2B 1ea8bdd9f1162533c673c95f251b214260f1bbea58c806803cdf0795e688d624774705765745b63cae047a7f89539e42e10fae7c58b34b35ebeb187c97734477 SHA512 ef7f69cf25c524e26aba8cf2e0889c623faf3aa6dd88a8cf2f944756c52918b825570e6f92581ea8343fb96db0c565541855409afef6e3bed056cf397089276e -MISC metadata.xml 810 BLAKE2B 0f36bf0c2c7f161669d8511683a6947a25d5a5ac7e79389e1f189d8bff70b6f0ac1095712a6646f1958fadb27a8b0d7b58b146bc300ee6e8b5b3d63e3acb7917 SHA512 9654d8d242c503b6a64bb01274407e92afb661db96ccd0831fef2f41ae03a22b950dcc11eee57605d1f7ca4ff38613803542486e12b20780e1fce9f642e64852 +MISC metadata.xml 934 BLAKE2B eb3a4c7fba09e537bcb97c3bdcc70b1cf7adf6c66a60abc7ab977f3d35ab0189ece1eb3994490a0418c3ad513a2896ee8bd19edbcef6f57ff3ab1d2af060289e SHA512 83c68333a33df7b836f3fe90c2dfe09789b8c3ecab7c1573534c37d745d565127ec291a91df400cf83d88ec7c284f1bf1a2f37130ec33b7f5e149f10edd80cee diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml index d131bb2ef536..7da838752d13 100644 --- a/sys-fs/btrfs-progs/metadata.xml +++ b/sys-fs/btrfs-progs/metadata.xml @@ -13,6 +13,10 @@ polynomial-c@gentoo.org Lars Wendler + + base-system@gentoo.org + Gentoo Base System + Build ext2 conversion utility (btrfs-convert) Enable reiserfs support in btrfs-convert tool. diff --git a/sys-fs/ocfs2-tools/Manifest b/sys-fs/ocfs2-tools/Manifest deleted file mode 100644 index 3d7a3b638f32..000000000000 --- a/sys-fs/ocfs2-tools/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX ocfs2-tools-1.6.4-asneeded.patch 2606 BLAKE2B 96fbe75c79bcb327d17bf337f15f8828c9ad099e6f4eff92e70edc3c0924e0293d9e496f9804973ac75ed2ba1e383c86a60094e3a174228ae505740008d6ddc7 SHA512 d39c0e73672cd2e7810155690c89da6fae55aa4798dd6e02d3aa0bdb7642bc88d43733ea992262c9fd5c10d40d5ffed7ca7abae6d3114ebdc6915251d43a9a7d -AUX ocfs2-tools-recent-kernels.patch 650 BLAKE2B e1b8f7aaddee682affa6de3b43b9c8c8c890d17ab0260756c4a47cc80e94f7e6333593a56efab6b7078377863d754f3cac35e08df84188ddcf5232a288ee0728 SHA512 4e5f5f5fa3a8cbde6f937e574b97c1d6a76d4cec5b9df16a094527c5ca59ed37857f54c4687dfd4557ef4c0fd701825d5ee2091d76eabbecd2b029b5fdf27b1e -AUX ocfs2.confd 1494 BLAKE2B 6390651f1d07fb82c98e7058a7ffa1267672fafc64b84fc320d58076de723e6472b4587ec7fd7ad6345a310f225b1a66f50296e39e772ff4a2c22d7fafa6943b SHA512 7cb63e889fad081d41283534032f41413bbb37202391d7a0f08f590170dc7a11c45bd90946910ba7680e401e4cb80eeb70fe85eb55ecbe9c16507e4d3d0b08c9 -AUX ocfs2.initd 4004 BLAKE2B 8d9f839d9ad7607b45e768b95ebc589c0e6fb729d2fff3afac04cd28f5b72f2a2d958c8e9153ae8db7a5cc01dd4a8e397f6514f3fd4f615317ed6acbb2953208 SHA512 ab35d6916871eed469c3e05470dec6913b96bf806fd67d090f5a6af9eb28e4cd648707d768c0a47f6d2926f969421837adf9ef714b336c929b73df785dbfae1b -DIST ocfs2-tools-1.8.2.tar.xz 963132 BLAKE2B 00bbaecfc797329c4a7798c3c33bea0871ffe828ff2a7b12ece4e904fb4df3734326f8a0da69160daafe438c2db3f0e93054e89497e698af1d72724e766929e4 SHA512 b1354730a1e51117497b56e0a1fd79667d608cdf2ccdfa9eb7355f9f40684e64c0787722fa8e6046b35dd00c2ff7a822719b47d059f23253f0bab64e181875ee -EBUILD ocfs2-tools-1.8.2-r2.ebuild 1838 BLAKE2B 758601a4385b6492cfbd5c030e6208475c839b957b776368f87d3e37473f838ce3cc50b89f07880e84ccf43b494fe4f0a9095afe7179248bab7d2c0b67373dcd SHA512 091df2c69adff025e1399f19ef601649f0279efa4a5e4311e5a2e7cb1e4b49ae5c49d34464cc20c325c5f615f243c9f56d2880524235e106e36c3d642a953b05 -MISC metadata.xml 320 BLAKE2B 9608019a1f3dd3164c7db7c399cda6b61ab8de154c7218c589a050516a20084d2b2e5e51d29acb3b5534c2f7626255debfbd12440820e2facf413d6fba9d0024 SHA512 281f53acb3439cc8881e8fa0d8b314107fc17bb56e63f8fd51548fccc3e9cd95098cf0199decaa8813a55ab234cf8a1147f94689cb993d3c7ea79df9e3372a1f diff --git a/sys-fs/ocfs2-tools/files/ocfs2-tools-1.6.4-asneeded.patch b/sys-fs/ocfs2-tools/files/ocfs2-tools-1.6.4-asneeded.patch deleted file mode 100644 index 8920e773004b..000000000000 --- a/sys-fs/ocfs2-tools/files/ocfs2-tools-1.6.4-asneeded.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- a/configure.in 2011-01-19 20:43:35.000000000 +0100 -+++ b/configure.in 2012-02-21 11:14:51.047974999 +0100 -@@ -265,7 +265,6 @@ - cpg_package=openais - fi - TRY_PATH="$AIS_TRY_PATH" -- AC_MSG_CHECKING([for cpg_initialize in -lcpg]) - while test "x$TRY_PATH" != "x"; do - TRY="`echo $TRY_PATH | cut -f1 -d:`" - NEW_TRY_PATH="`echo $TRY_PATH | cut -f2- -d:`" -@@ -281,9 +280,8 @@ - # TRY="$TRY" - - saved_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $TRY -lcpg" -- AC_LINK_IFELSE([AC_LANG_CALL([], [cpg_initialize])], -- cpg_found=yes) -+ LDFLAGS="$LDFLAGS $TRY" -+ AC_SEARCH_LIBS([cpg_initialize], [cpg], [cpg_found=yes], [], []) - LDFLAGS="$saved_LDFLAGS" - - if test "x$cpg_found" = "xyes"; then -@@ -292,10 +290,7 @@ - fi - done - fi --if test "x$cpg_found" = "xyes"; then -- AC_MSG_RESULT(yes) --else -- AC_MSG_RESULT(no) -+if test "x$cpg_found" = "xno"; then - AC_MSG_WARN([libcpg not found, ocfs2_controld will not be built]) - fi - AC_SUBST(CPG_LDFLAGS) -@@ -309,7 +304,6 @@ - if test "x$ckpt_found" = "xyes"; then - ckpt_found= - TRY_PATH="$AIS_TRY_PATH" -- AC_MSG_CHECKING([for saCkptInitialize in -lSaCkpt]) - while test "x$TRY_PATH" != "x"; do - TRY="`echo $TRY_PATH | cut -f1 -d:`" - NEW_TRY_PATH="`echo $TRY_PATH | cut -f2- -d:`" -@@ -325,9 +319,8 @@ - # TRY="$TRY" - - saved_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $TRY -lSaCkpt" -- AC_LINK_IFELSE([AC_LANG_CALL([], [saCkptInitialize])], -- ckpt_found=yes) -+ LDFLAGS="$LDFLAGS $TRY" -+ AC_SEARCH_LIBS([saCkptInitialize], [SaCkpt], [ckpt_found=yes], [], []) - LDFLAGS="$saved_LDFLAGS" - - if test "x$ckpt_found" = "xyes"; then -@@ -336,10 +329,7 @@ - fi - done - fi --if test "x$ckpt_found" = "xyes"; then -- AC_MSG_RESULT(yes) --else -- AC_MSG_RESULT(no) -+if test "x$ckpt_found" = "xno"; then - AC_MSG_WARN([libSaCkpt not found, ocfs2_controld will not be built]) - fi - AC_SUBST(AIS_LDFLAGS) - ---- a/ocfs2_controld/Makefile 2012-02-21 11:49:36.248974932 +0100 -+++ b/ocfs2_controld/Makefile 2012-02-21 11:49:47.943974980 +0100 -@@ -14,7 +14,7 @@ - ifneq ($(BUILD_PCMK_SUPPORT),) - SBIN_PROGRAMS += ocfs2_controld.pcmk - # Some pacemaker headers which pacemaker.c includes want this. --PCMK_INCLUDES = -I/usr/include/pacemaker -I/usr/include/heartbeat/ $(GLIB_CFLAGS) -+PCMK_INCLUDES = -I/usr/include/pacemaker -I/usr/include/heartbeat/ `pkg-config --cflags libxml-2.0` $(GLIB_CFLAGS) - endif - - INCLUDES = -I$(TOPDIR)/include -I. $(PCMK_INCLUDES) diff --git a/sys-fs/ocfs2-tools/files/ocfs2-tools-recent-kernels.patch b/sys-fs/ocfs2-tools/files/ocfs2-tools-recent-kernels.patch deleted file mode 100644 index 24bc40dcd09f..000000000000 --- a/sys-fs/ocfs2-tools/files/ocfs2-tools-recent-kernels.patch +++ /dev/null @@ -1,19 +0,0 @@ -# git diff include/ocfs2-kernel/ocfs2_fs.h -diff --git a/include/ocfs2-kernel/ocfs2_fs.h b/include/ocfs2-kernel/ocfs2_fs.h -index 3eafb07..7bb954a 100644 ---- a/include/ocfs2-kernel/ocfs2_fs.h -+++ b/include/ocfs2-kernel/ocfs2_fs.h -@@ -1681,11 +1681,11 @@ static inline int ocfs2_sprintf_system_inode_name(char *buf, int len, - return chars; - } - --static inline void ocfs2_set_de_type(struct ocfs2_dir_entry *de, -+/*static inline void ocfs2_set_de_type(struct ocfs2_dir_entry *de, - umode_t mode) - { - de->file_type = ocfs2_type_by_mode[(mode & S_IFMT)>>S_SHIFT]; --} -+}*/ - - static inline int ocfs2_gd_is_discontig(struct ocfs2_group_desc *gd) - { \ No newline at end of file diff --git a/sys-fs/ocfs2-tools/files/ocfs2.confd b/sys-fs/ocfs2-tools/files/ocfs2.confd deleted file mode 100644 index 89f7a983ea38..000000000000 --- a/sys-fs/ocfs2-tools/files/ocfs2.confd +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Put your cluster names here, separated by space, ie. -# OCFS2_CLUSTER="cluster1 admincluster cluster2" -OCFS2_CLUSTER="home" - -# Some heartbeat tweaks to prevent self-fencing quite so much during heavy load. -# http://oss.oracle.com/projects/ocfs2/dist/documentation/ocfs2_faq.html - -# How long to wait before a node is considered dead from lack of network activity. -OCFS2_IDLE_TIMEOUT_MS="30000" -# How often we should attempt to send heartbeats. -OCFS2_KEEPALIVE_DELAY_MS="2000" -OCFS2_RECONNECT_DELAY_MS="2000" -# How often we should attempt to send heartbeats. -# How many interations before a node is considered dead from lack of IO activity. -# (dead_threshold - 1) * 2s -OCFS2_DEAD_THRESHOLD="61" - -# Default: "-fy" (force check on double-unmounted boot). I beleave this is best. -# Native way is "-y", but once I have twice reboot/powerOFF with bad result... -# Affected only fstab. -OCFS2_FSCK="-fy" - -# http://oss.oracle.com/projects/ocfs2-tools/news/article_8.html -# starting from 1.4.3, fsck.ocfs2 "aggressively cache the metadata blocks" -# this is useful on lots of free memory, but I have heavy slowdown on x86_64 -# with 1G of RAM. -# "yes" will "swapoff -a" & "swapon -a" around fsck to avoid caching over swap -OCFS2_FSCK_SWAPOFF="yes" - -# Signal to kill processes on stop/umount on busy device (empty to not kill) -#OCFS2_UMOUNT_KILL="KILL" - -# "yes" to force stop -#OCFS2_FORCE_STOP="no" diff --git a/sys-fs/ocfs2-tools/files/ocfs2.initd b/sys-fs/ocfs2-tools/files/ocfs2.initd deleted file mode 100644 index 32ff2e0bd67f..000000000000 --- a/sys-fs/ocfs2-tools/files/ocfs2.initd +++ /dev/null @@ -1,124 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net localmount - before netmount -} - -check_modules_config() { - local MODULES=$1 - local CONFIGS=$2 - local MODULE - local retval=0 - - for MODULE in ${MODULES}; do - if ! ls -1 /sys/module | egrep -q "^${MODULE}$"; then - retval=1 - fi - done - if [ ${retval} -eq 1 ] && [ -e /proc/config.gz ]; then - retval=0 - for MODULE in ${CONFIGS}; do - if ! gzip -dc /proc/config.gz | egrep -q "^CONFIG_${MODULE}=y$"; then - retval=1 - fi - done - fi - return ${retval} -} - -check_modules() { - check_modules_config "ocfs2_dlmfs ocfs2 ocfs2_dlm ocfs2_nodemanager" "OCFS2_FS OCFS2_FS_O2CB" && check_modules_config configfs CONFIGFS_FS && return 0 - if ! egrep -q '\s*ocfs2\s*$' /proc/filesystems || ! egrep -q '\s*ocfs2_dlmfs\s*$' /proc/filesystems; then - ewarn "One or more required modules are not loaded." - ewarn "Make sure you have " - ewarn " - placed ocfs, dlmfs and configfs into /etc/modules.autoload.d/kernel-2.6 or built directly into the kernel." - ewarn "For a (in)complete documentation, read /usr/share/doc/ocfs-/INSTALL.GENTOO.bz2" - fi - return 1 -} - -check_pseudofs() { - local retval=0 - local HASMOUNT="mount -l -t" - if [ -z "`${HASMOUNT} configfs`" ] ; then - retval=1 - fi - if [ -z "`${HASMOUNT} ocfs2_dlmfs`" ] ; then - retval=1 - fi - - if [ ${retval} -eq 1 ]; then - ewarn "One or more pseudo-filesystes are not mounted." - ewarn "Make sure you have following lines in your /etc/fstab:" - ewarn "none /sys/kernel/config configfs defaults 0 0" - ewarn "none /sys/kernel/dlm ocfs2_dlmfs defaults 0 0" - fi - return ${retval} -} - - - -start() { - check_modules || return $? - check_pseudofs || return $? - - einfo "Starting OCFS2 cluster" - for cluster in ${OCFS2_CLUSTER}; do - ebegin " - ${cluster}" - /sbin/o2cb_ctl -H -n ${cluster} -t cluster -a online=yes >/dev/null 2>&1 - eend $? - - # Some heartbeat tweaks to prevent self-fencing quite so much during heavy load. - # http://oss.oracle.com/projects/ocfs2/dist/documentation/ocfs2_faq.html - - # How long to wait before a node is considered dead from lack of network activity. - echo $OCFS2_IDLE_TIMEOUT_MS > /sys/kernel/config/cluster/${cluster}/idle_timeout_ms - # How often we should attempt to send heartbeats. - echo $OCFS2_KEEPALIVE_DELAY_MS > /sys/kernel/config/cluster/${cluster}/keepalive_delay_ms - echo $OCFS2_RECONNECT_DELAY_MS > /sys/kernel/config/cluster/${cluster}/reconnect_delay_ms - # How many interations before a node is considered dead from lack of IO activity. - # (dead_threshold - 1) * 2s - echo $OCFS2_DEAD_THRESHOLD > /sys/kernel/config/cluster/${cluster}/heartbeat/dead_threshold - done - sleep 2 -} - -stop() { - # Shamelesly stolen from netmount - local ret - ebegin "Unmounting OCFS2 filesystems" - [ -z "$(umount -art ocfs2 2>&1)" ] - ret=$? - eend ${ret} "Failed to simply unmount filesystems" - [ ${ret} -eq 0 ] && return 0 - - declare -a siglist=( "TERM" "KILL" "KILL" ) - local retry=0 - local remaining="go" - - while [ -n "${remaining}" -a ${retry} -lt 3 ] - do - remaining="$(awk '$3 ~ /'ocfs2'/ { if ($2 != "/") print $2 }' /proc/mounts | sort -r)" - IFS=$'\n' - set -- ${remaining//\\040/ } - unset IFS - [ -z "${remaining}" ] && break - - ebegin $'\t'"Unmounting ocfs2 filesystems (retry #$((retry+1)))" - /bin/fuser -k -${siglist[$((retry++))]} -m "$@" &>/dev/null - sleep 5 - umount "$@" &>/dev/null - eend $? $'\t'"Failed to unmount filesystems" - done - - - einfo "Stopping OCFS2 cluster" - for cluster in ${OCFS_CLUSTERS}; do - ebegin " - ${cluster}" - /sbin/o2cb_ctl -H -n ${cluster} -t cluster -a online=no >/dev/null 2>&1 - eend $? - done -} diff --git a/sys-fs/ocfs2-tools/metadata.xml b/sys-fs/ocfs2-tools/metadata.xml deleted file mode 100644 index 7bc09f148256..000000000000 --- a/sys-fs/ocfs2-tools/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - cluster@gentoo.org - Gentoo Cluster Project - - - Enable external locking - - diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2-r2.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2-r2.ebuild deleted file mode 100644 index 1db9772faead..000000000000 --- a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.2-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -inherit autotools python-single-r1 - -DESCRIPTION="Support programs for the Oracle Cluster Filesystem 2" -HOMEPAGE="http://oss.oracle.com/projects/ocfs2-tools/" -SRC_URI="https://dev.gentoo.org/~alexxy/distfiles/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug external gtk" - -RDEPEND=" - dev-libs/libaio:= - sys-apps/util-linux:= - sys-cluster/libcman - external? ( - sys-cluster/libdlm - sys-cluster/pacemaker[-heartbeat] - ) - sys-fs/e2fsprogs - sys-libs/e2fsprogs-libs:= - sys-libs/ncurses:0= - sys-libs/readline:0= - sys-process/psmisc - gtk? ( - ${PYTHON_DEPS} - dev-python/pygtk[${PYTHON_USEDEP}] - ) -" -# 99% of deps this thing has is automagic -# specialy cluster things corosync/pacemaker -DEPEND="${RDEPEND}" - -REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( - "${S}/documentation/samples/cluster.conf" - "${S}/documentation/users_guide.txt" -) - -MAKEOPTS+=" -j1" - -PATCHES=( - "${FILESDIR}/${PN}-1.6.4-asneeded.patch" - "${FILESDIR}/${PN}-recent-kernels.patch" -) - -pkg_setup() { - use gtk && python-single-r1_pkg_setup -} - -src_prepare() { - sed -e 's/ncurses, tgetstr/ncurses, printw/g' -i configure.in || die - # gentoo uses /sys/kernel/dlm as dlmfs mountpoint - sed -e 's:"/dlm/":"/sys/kernel/dlm":g' \ - -i libo2dlm/o2dlm_test.c \ - -i libocfs2/dlm.c || die "sed failed" - default - rm -f aclocal.m4 || die - AT_M4DIR=. eautoreconf - use gtk && python_fix_shebang . -} - -src_configure() { - econf \ - $(use_enable debug debug) \ - $(use_enable debug debugexe) \ - $(use_enable gtk ocfs2console) \ - --enable-dynamic-fsck \ - --enable-dynamic-ctl -} - -src_install() { - default - use gtk && python_optimize - newinitd "${FILESDIR}/ocfs2.initd" ocfs2 - newconfd "${FILESDIR}/ocfs2.confd" ocfs2 -} diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 488c045575ad..593ba220c920 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -9,6 +9,7 @@ DIST systemd-234.tar.gz 4800186 BLAKE2B 398ed8869da98909d1374ef5e549ca3e26b02ece DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d DIST systemd-237.tar.gz 6871350 BLAKE2B 4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91 SHA512 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b +DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8 DIST udev-216-patches-2.tar.xz 1264 BLAKE2B b1bbb6b1b7734edc3352b4352a45b4b5df4715b0fc92c4936798aa93fb078755b7795f475d7bc42392ad8ef57853e9ce2507c66cc9bfbd37e6fe22ada4c156cc SHA512 1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4 EBUILD udev-216.ebuild 15211 BLAKE2B 81f928e1ba8897fbe5dc97efbd6e33b6d4c77065741732969f4ca50f32c7458a914e6786175d560bbd3eba183ad023cfe41217d967029cdf18fdd185d6764eed SHA512 bf4e3c887eaca0ab747b5ffbcceeba94ed6662a27838cc9f5c09bb248483ececbe37cc9db17a3fd246f789874cc62b2ed831e7f452f9c5163e735da33c924b68 EBUILD udev-225-r1.ebuild 13566 BLAKE2B 9aba88a7a7edcd0b2f63f590f84af713df2b2bbb3ddf979655ecad6eafd4f77442928e1ecc7587afc2ad976b8068878dd11714633b159d84591d743c5b6d5640 SHA512 ea3955b5cee2d1a1adfe21cc00eda4e6378a344f5862e1825fdb4bf313077b6e2b5fbb8ee80e786ab4809644d1b3c39dcdcbe14bd01e17e94ca2726d1f3de33d @@ -17,5 +18,6 @@ EBUILD udev-234-r1.ebuild 9990 BLAKE2B 8759bf272f1f7d2e03692049c11d9cbf106e0169c EBUILD udev-235.ebuild 9988 BLAKE2B 275ed1ba897951832d3bcd566aed8c3762002736444fcd808b71c11cdadb194ab59da7df31af42092f474eeba2ae47f87cf8d68ed1c09117990c0bdfeda7fbaf SHA512 8a6fc0f42ccba3f0cbf808d1bf4c2d725347781f156fb36fe39057573f35e8d2a5c01fc091e2a5fc2a9a49ba78b4c86f6fec164ffd4d9d153092c3dfdc46c76f EBUILD udev-236-r1.ebuild 10185 BLAKE2B 461b607a9672056701d0ac69849168c4363fbc635d2e200426a2f796a1f52bb41a8eb25edce4200a4506359181bfaf7114d8cdbdf53272216c5475d69986de72 SHA512 0ed2e5937152dfc8ee216471bdaa1f409aba394a64b23dec433de69908b14fabfa0c3ae0e01d0e6be6ccc2104067fa0a02eb2d44e9cd84ded72f75ab91441510 EBUILD udev-237.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4 +EBUILD udev-238.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4 EBUILD udev-9999.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4 MISC metadata.xml 680 BLAKE2B 3f6b21eff391977d69921da6eeb7f48ae6c706dd856e12c4b0126f0db4ced358925374bed23d950d957a58b5447e087ad98301aa1f75dd140a1cd816ef1d2426 SHA512 2e90cdfb013904211fba8404c6b96ad940dfaea05eebe7592e3fa185dec9b16b738cc7661fd466990788accf8c261a596bcb08477e879e0e18fcc91cdce65c5e diff --git a/sys-fs/udev/udev-238.ebuild b/sys-fs/udev/udev-238.ebuild new file mode 100644 index 000000000000..3b794e7c3ded --- /dev/null +++ b/sys-fs/udev/udev-238.ebuild @@ -0,0 +1,327 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user versionator + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="acl +kmod selinux" + +RESTRICT="test" + +COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] + sys-libs/libcap[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl ) + kmod? ( >=sys-apps/kmod-16 ) + selinux? ( >=sys-libs/libselinux-2.1.9 ) + ! "${T}"/40-gentoo.rules + # Gentoo specific floppy and usb groups + ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" + ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" + EOF + + local PATCHES=( + "${FILESDIR}/236-uucp-group.patch" + ) + + default +} + +meson_multilib_native_use() { + if multilib_is_native_abi && use "$1"; then + echo true + else + echo false + fi +} + +multilib_src_configure() { + local emesonargs=( + -Dacl=$(meson_multilib_native_use acl) + -Defi=false + -Dkmod=$(meson_multilib_native_use kmod) + -Dselinux=$(meson_multilib_native_use selinux) + -Dlink-udev-shared=false + -Dsplit-usr=true + + # Prevent automagic deps + -Dgcrypt=false + -Dlibcryptsetup=false + -Dlibidn=false + -Dlibidn2=false + -Dlibiptc=false + -Dseccomp=false + -Dlz4=false + -Dxz=false + ) + meson_src_configure +} + +src_configure() { + # Prevent conflicts with i686 cross toolchain, bug 559726 + tc-export AR CC NM OBJCOPY RANLIB + multilib-minimal_src_configure +} + +multilib_src_compile() { + # meson creates this link + local libudev=$(readlink src/udev/libudev.so.1) + + local targets=( + src/udev/${libudev} + ) + if multilib_is_native_abi; then + targets+=( + systemd-udevd + udevadm + src/udev/ata_id + src/udev/cdrom_id + src/udev/collect + src/udev/mtd_probe + src/udev/scsi_id + src/udev/v4l_id + man/udev.conf.5 + man/systemd.link.5 + man/hwdb.7 + man/udev.7 + man/systemd-udevd.service.8 + man/udevadm.8 + ) + fi + eninja "${targets[@]}" +} + +multilib_src_install() { + local libudev=$(readlink src/udev/libudev.so.1) + + into / + dolib.so src/udev/{${libudev},libudev.so.1,libudev.so} + + insinto "/usr/$(get_libdir)/pkgconfig" + doins src/libudev/libudev.pc + + if multilib_is_native_abi; then + into / + dobin udevadm + + exeinto /lib/systemd + doexe systemd-udevd + + exeinto /lib/udev + doexe src/udev/{ata_id,cdrom_id,collect,mtd_probe,scsi_id,v4l_id} + + rm rules/99-systemd.rules || die + insinto /lib/udev/rules.d + doins rules/*.rules + + insinto /usr/share/pkgconfig + doins src/udev/udev.pc + + mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die + rm man/systemd-udevd-{control,kernel}.socket.8 || die + doman man/*.[0-9] + fi +} + +multilib_src_install_all() { + doheader src/libudev/libudev.h + + insinto /etc/udev + doins src/udev/udev.conf + keepdir /etc/udev/{hwdb.d,rules.d} + + insinto /lib/systemd/network + doins network/99-default.link + + # see src_prepare() for content of 40-gentoo.rules + insinto /lib/udev/rules.d + doins "${T}"/40-gentoo.rules + doins "${S}"/rules/*.rules + + dobashcomp shell-completion/bash/udevadm + + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/_udevadm + + einstalldocs +} + +pkg_postinst() { + mkdir -p "${ROOT%/}"/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 "${ROOT%/}"/dev/loop 2>/dev/null + if [[ -d ${ROOT%/}/dev/loop ]]; then + ewarn "Please make sure your remove /dev/loop," + ewarn "else losetup may be confused when looking for unused devices." + fi + + local fstab="${ROOT%/}"/etc/fstab dev path fstype rest + while read -r dev path fstype rest; do + if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then + ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs" + ewarn "filesystem. Otherwise udev won't be able to boot." + ewarn "See, https://bugs.gentoo.org/453186" + fi + done < "${fstab}" + + if [[ -d ${ROOT%/}/usr/lib/udev ]]; then + ewarn + ewarn "Please re-emerge all packages on your system which install" + ewarn "rules and helpers in /usr/lib/udev. They should now be in" + ewarn "/lib/udev." + ewarn + ewarn "One way to do this is to run the following command:" + ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)" + ewarn "Note that qfile can be found in app-portage/portage-utils" + fi + + local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules + local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules + for old_rules in "${old_cd_rules}" "${old_net_rules}"; do + if [[ -f ${old_rules} ]]; then + ewarn + ewarn "File ${old_rules} is from old udev installation but if you still use it," + ewarn "rename it to something else starting with 70- to silence this deprecation" + ewarn "warning." + fi + done + + elog + elog "Starting from version >= 197 the new predictable network interface names are" + elog "used by default, see:" + elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" + elog "https://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 with, for example, eth0):" + elog "# udevadm test-builtin net_id /sys/class/net/ 2> /dev/null" + elog + elog "You can use either kernel parameter \"net.ifnames=0\", create empty" + elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null" + elog "to disable the feature." + + if has_version 'sys-apps/biosdevname'; then + ewarn + ewarn "You can replace the functionality of sys-apps/biosdevname which has been" + ewarn "detected to be installed with the new predictable network interface names." + fi + + 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." + if has_version 'sys-apps/openrc'; then + ewarn "For sys-apps/openrc users it is:" + ewarn "# /etc/init.d/udev --nodeps restart" + fi + + elog + elog "For more information on udev on Gentoo, upgrading, writing udev rules, and" + elog "fixing known issues visit:" + elog "https://wiki.gentoo.org/wiki/Udev" + elog "https://wiki.gentoo.org/wiki/Udev/upgrade" + + # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, + # do the same for 80-net-setup-link.rules to keep the old behavior + local net_move=no + local net_name_slot_sym=no + local net_rules_path="${ROOT%/}"/etc/udev/rules.d + local net_name_slot="${net_rules_path}"/80-net-name-slot.rules + local net_setup_link="${net_rules_path}"/80-net-setup-link.rules + if [[ ! -e ${net_setup_link} ]]; then + [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes + if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then + net_move=yes + net_name_slot_sym=yes + fi + fi + if [[ ${net_move} == yes ]]; then + ebegin "Copying ${net_name_slot} to ${net_setup_link}" + + if [[ ${net_name_slot_sym} == yes ]]; then + ln -nfs /dev/null "${net_setup_link}" + else + cp "${net_name_slot}" "${net_setup_link}" + fi + eend $? + fi + + # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 + # https://bugs.gentoo.org/246847 + # https://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 + # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + [[ -z ${REPLACING_VERSIONS} ]] && udev_reload + fi +} -- cgit v1.2.3