module-init-tools: import current stable from upstream Gentoo

BUG=None
TEST=updated m-i-t, rebuilt x86-alex from source, booted it, modules were loaded, checked `modprobe --version`

Change-Id: Iebb8b787006fd9ff062f2a0e5751d4b10f336c7d
Reviewed-on: http://gerrit.chromium.org/gerrit/6740
Reviewed-by: David James <davidjames@chromium.org>
Reviewed-by: Brian Harring <ferringb@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

sdk_container/src/third_party/portage-stable/sys-apps/module-init-tools/files/update-modules-3.5.sh

@@ -0,0 +1,395 @@
+#!/bin/bash
+# vim:ts=4
+# Distributed under the terms of the GNU General Public License v2
+#
+# This script will do:
+#  - create /etc/modules.conf from /etc/modules.d/*
+#  - create /etc/modprobe.conf from /etc/modprobe.d/*
+#  - update modules.dep if modules.conf has been updated so depmod doesnt whine
+#
+# This is all for backwards compatibility.  In the perfect world, we would be
+# running a linux-2.6 kernel and not have any modules.d directory.  Then there
+# would be no work for us as module-init-tools automatically scans modprobe.d.
+# Until that happens, we'll keep scanning and warning and being a pita.
+#
+
+
+ROOT="${ROOT%/}/"
+[ "${ROOT}" = "${ROOT#/}" ] && ROOT="${PWD}/${ROOT}"
+cd "${ROOT}"
+
+argv0=${0##*/}
+. /etc/init.d/functions.sh || {
+	echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2
+	exit 1
+}
+umask 022
+esyslog() { :; }
+export PATH=/sbin:${PATH}
+
+[ "${argv0}" = "modules-update" ] && ewarn "Please run 'update-modules' from now on; 'modules-update' is going away"
+
+
+#
+# Setup some variables
+#
+
+HEADER="### This file is automatically generated by update-modules"
+
+#
+# Parse command-line
+#
+
+VERBOSE=0
+DEBUG=0
+FORCE="false"
+BACKUP="false"
+KV=
+while [ -n "$1" ] ; do
+	case $1 in
+		--assume-kernel=*) KV=${1#*=};;
+		-b|--backup)       BACKUP="true";;
+		-f|--force|force)  FORCE="true";;
+		-v|--verbose)      ((VERBOSE+=1));;
+		-d|--debug)        ((DEBUG+=1));;
+		-V|--version)      exec echo "${argv0}$Revision: 1.1 $ $Date: 2008/10/25 23:55:43 $";;
+		-h|--help)
+			cat <<-EOF
+			Usage: update-modules [options]
+
+			Options:
+			 --assume-kernel=KV  Assume the kernel is at least version KV
+			 -b, --backup        Backup existing config files (add .old ext)
+			 -f, --force         Force execution in face of bad things
+			 -v, --verbose       Be a bit more verbose in what we do
+			 -d, --debug         Helpful debug output
+			 -V, --version       Dump version info
+			 -h, --help          This help screen, duh
+			EOF
+			exit 0
+			;;
+		*)
+			eerror "Error: I don't understand $1"
+			exit 1
+			;;
+	esac
+	shift
+done
+
+if [ ! -w ./etc ] ; then
+	eerror "You must be root to do this"
+	exit 2
+fi
+
+[ ${DEBUG} -gt 0 ] && set -x
+
+veinfo() { [ ${VERBOSE} -gt 0 ] && einfo "$*" ; return 0 ; }
+vewarn() { [ ${VERBOSE} -gt 0 ] && ewarn "$*" ; return 0 ; }
+
+[ "${ROOT}" != "/" ] && veinfo "Operating on ROOT = '${ROOT}'"
+
+#
+# Let's check the optimal case first: nothing to do
+#
+if ! ${FORCE} ; then
+	if [ ! -d "./etc/modules.d" ] ; then
+		if [ ! -d "./etc/modprobe.d" ] ; then
+			veinfo "No /etc/modules.d or /etc/modprobe.d dir; Nothing to do!"
+			exit 0
+
+		elif [ -e "./etc/modprobe.conf" ] ; then
+			vewarn "You should put settings in /etc/modprobe.d/ rather than modprobe.conf"
+
+		elif [ -e "./etc/modules.conf" ] ; then
+			vewarn "If you only run linux-2.4, you should delete /etc/modules.conf"
+
+		else
+			veinfo "We have just /etc/modprobe.d; Nothing to do!"
+			exit 0
+		fi
+	else
+		vewarn "You have /etc/modules.d, so things need to get coalesced"
+	fi
+fi
+
+#
+# Build list of config files to generate and verify none
+# have been modified in any way
+#
+for x in modprobe.conf modules.conf ; do
+	x="./etc/${x}"
+	[ -r ${x} ] || continue
+
+	if [ "$(sed -ne 1p ${x})" != "${HEADER}" ] ; then
+		ewarn "Warning: ${x#.} has not been automatically generated"
+
+		if ${FORCE} ; then
+			ewarn "--force specified, (re)generating file anyway"
+		else
+			eerror "Use \"update-modules force\" to force (re)generation"
+			exit 1
+		fi
+	fi
+done
+
+
+#
+# If the system doesnt have old modutils, then this is prob linux-2.6 only
+#
+if type -P modprobe.old > /dev/null || \
+   LC_ALL=C modprobe -V 2>/dev/null | grep -qs "modprobe version"
+then
+	GENERATE_OLD="true"
+else
+	GENERATE_OLD="false"
+fi
+
+
+# Reset the sorting order since we depend on it
+export LC_COLLATE="C"
+
+KV=${KV:-$(uname -r)}
+
+
+#
+#  Desc: backup a config file if need be and replace with new one
+# Usage: backup <old config file to backup> <new config file to replace with>
+#    Ex: backup /etc/modules.conf /etc/modules.conf.tempfile
+#
+backup() {
+	if ${BACKUP} && [ -e "$1" ] ; then
+		mv -f "$1" "$1".old
+	fi
+	mv -f "$2" "$1"
+}
+
+
+#
+#  Desc: Create module header
+# Usage: create_header <config dir>
+#    Ex: create_header /etc/modules.d
+create_header() {
+	local moddir=$1
+
+	cat <<-EOF
+	${HEADER}
+	#
+	# Please do not edit this file directly. If you want to change or add
+	# anything please take a look at the files in ${moddir} and read
+	# the manpage for update-modules(8).
+	#
+	EOF
+}
+
+
+#
+#  Desc: Combine all config files in a dir and place output in a file
+# Usage: generate_config <output config file> <config dir> <reference config dir> <silent>
+#    Ex: generate_config /etc/modules.conf /etc/modules.d
+#
+generate_config() {
+	local config=$1
+	local moddir=$2
+	local refdir=$3
+	local silent=$4
+	local tmpfile="${config}.$$"
+
+	[ -z "${silent}" ] && ebegin "Updating ${config#./etc/}"
+
+	create_header ${refdir:-${moddir}} > "${tmpfile}"
+
+	for cfg in "${moddir}"/* ; do
+		[ -d "${cfg}" ] && continue
+		[ ! -r "${cfg}" ] && continue
+
+		# Skip backup and RCS files #20597
+		case ${cfg} in *~|*.bak|*,v) continue;; esac
+
+		# If config file is found in the reference dir, then skip it
+		[ -n "${refdir}" ] && [ -e "${refdir}/${cfg##*/}" ] && continue
+
+		(
+		echo "### update-modules: start processing ${cfg#.}"
+		if [ -x "${cfg}" ] ; then
+			# $cfg can be executable; nice touch, Wichert! :)
+			"${cfg}"
+		else
+			cat "${cfg}"
+		fi
+		echo
+		echo "### update-modules: end processing ${cfg#.}"
+		echo
+		) >> "${tmpfile}"
+	done
+
+	backup "${config}" "${tmpfile}"
+
+	[ -z "${silent}" ] && eend 0
+
+	return 0
+}
+
+
+#
+# Generate the old modules.conf file based upon all the snippets in
+# modules.d.  Since modprobe doesnt handle modules.d, we need to gather
+# the files together in modules.conf for it.
+#
+
+if [ ! -d "./etc/modules.d" ] ; then
+	veinfo "No need to generate modules.conf :)"
+
+elif ${FORCE} || is_older_than ./etc/modules.conf ./etc/modules.d ; then
+	generate_config ./etc/modules.conf ./etc/modules.d
+
+else
+	veinfo "modules.conf: already up-to-date wheatness"
+fi
+
+#
+# Call depmod to keep insmod from complaining that modules.conf is more
+# recent then the modules.dep file.
+#
+if [ -e "./etc/modules.conf" ] ; then
+	depfile=$(
+		# the modules.conf file has optional syntax:
+		# depfile=/path/to/modules.dep
+		ret=$(sed -n -e '/^[[:space:]]*depfile=/s:.*=::p' ./etc/modules.conf)
+		eval echo "${ret:-/lib/modules/${KV}/modules.dep}"
+	)
+
+	if [ -d "${depfile%/*}" ] ; then
+		if [ ./etc/modules.conf -nt "${depfile}" ] ; then
+			arch=$(uname -m)
+			ebegin "Updating modules.dep"
+			for cfg in /lib/modules/${KV}/build /usr/src/linux-${KV} \
+			           /lib/modules/${KV} /boot /usr/src/linux ""
+			do
+				cfg=".${cfg}/System.map"
+				for suffix in -genkernel-${arch}-${KV} -genkernel-'*'-${KV} -${KV} "" ; do
+					scfg=$(echo ${cfg}${suffix})
+					scfg=${scfg%% *}
+					[ -f "${scfg}" ] && cfg=${scfg} && break 2
+				done
+				cfg=""
+			done
+			[ -n "${cfg}" ] && cfg="-F ${cfg}"
+			depmod -b "${ROOT}" -a ${cfg} ${KV}
+			eend $?
+			veinfo "Ran: depmod -b '${ROOT}' -a ${cfg} ${KV}"
+		else
+			veinfo "modules.dep: already up-to-date goodness"
+		fi
+	else
+		vewarn "The dir '${depfile}' does not exist, skipping call to depmod"
+	fi
+fi
+
+
+#
+# Generate the new modprobe.conf file if possible.  What this entails is
+# grabbing details from the old modprobe via the -c option and sticking
+# it in the newer config file.  This is useful for backwards compat support
+# and for packages that provide older style /etc/modules.d/ files but not
+# newer style /etc/modprobe.d/ files.
+#
+# First we try to use the script `generate-modprobe.conf` from the
+# module-init-tools and if that fails us, we try and generate modprobe.conf
+# ourselves from the /etc/modules.d/ files.
+#
+if ! type -P generate-modprobe.conf > /dev/null ; then
+	vewarn "Skipping /etc/modprobe.conf generation (generate-modprobe.conf doesn't exist)"
+
+elif ! ${FORCE} && ! is_older_than ./etc/modprobe.conf ./etc/modules.d ./etc/modprobe.d ; then
+	veinfo "modprobe.conf: already up-to-date nutness"
+
+elif [ ! -e ./etc/modules.conf -a ! -e ./etc/modules.d ] ; then
+	veinfo "No need to generate modprobe.conf :)"
+	rm -f ./etc/modprobe.conf
+
+else
+	#
+	# First, bitch like crazy
+	#
+	for f in ./etc/modules.d/* ; do
+		# hack: ignore baselayout ;x
+		case ${f##*/} in
+			aliases|i386) continue;;
+		esac
+		[ -e "${f}" ] || continue
+		if [ ! -e "./etc/modprobe.d/${f##*/}" ] ; then
+			ewarn "Please file a bug about ${f#.}: it needs an /etc/modprobe.d/${f##*/}"
+		fi
+	done
+
+	generated_ok=0
+	tmpfile="./etc/modprobe.conf.$$"
+
+	#
+	# First we try to use regular generate-modprobe.conf
+	#
+	if ${GENERATE_OLD} ; then
+		ebegin "Updating modprobe.conf"
+		create_header /etc/modprobe.d > "${tmpfile}"
+		if generate-modprobe.conf ${ASSUME_KV:+--assume-kernel=${KV}} \
+		   >> "${tmpfile}" 2> "${tmpfile}.err"
+		then
+			backup "./etc/modprobe.conf" "${tmpfile}"
+			eend 0
+			generated_ok=1
+		else
+			[[ ${VERBOSE} -gt 0 ]] && cat "${tmpfile}.err"
+			eend 1 "Warning: could not generate /etc/modprobe.conf!"
+		fi
+	fi
+
+	#
+	# If the helper script failed, we fall back to doing it by hand
+	#
+	if [[ ${generated_ok} -eq 0 ]] ; then
+		ebegin "Updating modprobe.conf by hand"
+
+		generate_config ./etc/modprobe.conf ./etc/modules.d ./etc/modprobe.d 0
+		create_header /etc/modprobe.d > "${tmpfile}"
+
+		# Just use generate-modprobe.conf to filter compatible syntax
+		if TESTING_MODPROBE_CONF=./etc/modprobe.conf \
+		   generate-modprobe.conf ${ASSUME_KV:+--assume-kernel=${KV}} \
+		   >> "${tmpfile}" 2> "${tmpfile}.err"
+		then
+			# we use mv here instead of backup_config() as the call to
+			# generate_config() above already took care of the backup
+			mv -f "${tmpfile}" "./etc/modprobe.conf"
+			eend $?
+		else
+			[[ ${VERBOSE} -gt 0 ]] && cat "${tmpfile}.err"
+			eend 1 "Warning: could not generate /etc/modprobe.conf!"
+		fi
+	fi
+
+	#
+	# Now append all the new files ... modprobe will not scan /etc/modprobe.d/
+	# if /etc/modprobe.conf exists, so we need to append /etc/modprobe.conf with
+	# /etc/modprobe.d/* ... http://bugs.gentoo.org/145962
+	#
+	if [[ -e ./etc/modprobe.conf ]] ; then
+		for cfg in ./etc/modprobe.d/* ; do
+			[ -d "${cfg}" ] && continue
+			[ ! -r "${cfg}" ] && continue
+
+			# Skip backup and RCS files #20597
+			case ${cfg} in *~|*.bak|*,v) continue;; esac
+
+			(
+			echo
+			echo "### update-modules: start processing ${cfg#.}"
+			cat "${cfg}"
+			echo "### update-modules: end processing ${cfg#.}"
+			) >> "./etc/modprobe.conf"
+		done
+	fi
+
+	rm -f "${tmpfile}" "${tmpfile}.err"
+fi
+
+: # make sure we fall through with 0 exit status

sdk_container/src/third_party/portage-stable/sys-apps/module-init-tools/files/update-modules.8

@@ -0,0 +1,74 @@
+.TH UPDATE-MODULES 8 "Gentoo Linux" "2007"
+.SH NAME
+update\-modules \- (re)generate module config files in /etc/
+.SH SYNOPSIS
+\fBupdate\-modules\fR \fI[options]\fR
+.SH DESCRIPTION
+\fBupdate\-modules\fR is a simple tool to manage the module config files found
+in the /etc/ directory.
+
+The old Linux module utilities use a single file for all their configuration.
+This makes it difficult for packages to dynamically add information about their
+own modules.
+
+\fBupdate-modules\fR makes the dynamic addition of information easier by
+generating the single configuration file from the many files located in
+\fI/etc/modules.d/\fR.  All files in that directory are assembled together to
+form \fI/etc/modules.conf\fR.
+
+Newer Linux module utilities include support automatically for a directory of
+configuration files in \fI/etc/modprobe.d/\fR.  However, to maintain backwards
+compatibility with packages that do not yet support this, we still need to
+assemble the contents of \fI/etc/modules.d/\fR and \fI/etc/modprobe.d/\fR and
+produce the corresponding \fI/etc/modules.conf\fR and \fI/etc/modprobe.conf\fR.
+
+Also, when requested, it is also possible to generate \fI/etc/modules.devfs\fR.
+.SH OPTIONS
+.TP
+\fI\-\-assume-kernel=<KV>\fR
+When calculating which files need to be generated, assume the kernel version
+is at least the specified \fIKV\fR.
+.TP
+\fI\-b\fR, \fI\-\-backup\fR
+When updating configuration files, make backups by renaming files with a '.old'
+suffix if they are going to be updated.
+.TP
+\fI\-d\fR, \fI\-\-debug\fR
+Run with shell debugging enabled.  Really only useful for tracking down
+misbehavior.
+.TP
+\fI\-D\fR, \fI\-\-devfs\fR
+Force generation of the deprecated \fI/etc/modules.devfs\fR file.
+.TP
+\fI\-f\fR, \fI\-\-force\fR
+Force generation of files regardless of timestamps.  By default,
+\fBupdate-modules\fR will regenerate files only when timestamps indicate that
+the configuration files are out of date.
+.TP
+\fI\-v\fR, \fI\-\-verbose\fR
+Enable verbose output since by default, \fBupdate-modules\fR only displays
+information when it does something and not when it skips steps.
+.SH "FILES"
+There are two types of file you can put in the module directories: normal files
+and exectuable files.  Normal files contain standard modules configuration
+information, as described in \fBmodules.conf\fR(5) (for files in
+\fI/etc/modules.d/\fR) or as described in \fBmodprobe.conf\fR(5) (for files in
+\fI/etc/modprobe.d/\fR).  Executable files are executed and their output is
+used as extra configuration information.  Error messages are sent to stderr and
+thus do not become part of the configuration file.
+
+.nf
+\fI/etc/modules.d/\fR - config snippets for old module utilities (<= linux-2.4)
+\fI/etc/modules.conf\fR - sum of all files in \fI/etc/modules.d/\fR
+\fI/etc/modprobe.d/\fR - config snippets for new module utilities (>= linux-2.6)
+\fI/etc/modprobe.conf\fR - sum of all files in \fI/etc/modprobe.d/\fR
+.fi
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.SH AUTHORS
+This manual page was written by Wichert Akkerman <wakkerma@debian.org>
+for the Debian GNU/Linux system.  Modified for \fIGentoo Linux\fR.
+.SH "SEE ALSO"
+.BR depmod (1),
+.BR modules.conf (5),
+.BR modprobe.conf (5)

sdk_container/src/third_party/portage-stable/sys-apps/module-init-tools/module-init-tools-3.16-r1.ebuild

@@ -0,0 +1,100 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.16-r1.ebuild,v 1.4 2011/08/16 13:18:35 chainsaw Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="tools for managing linux kernel modules"
+HOMEPAGE="http://modules.wiki.kernel.org/"
+SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${P}.tar.bz2
+	mirror://gentoo/${P}-man.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE="static"
+RESTRICT="test"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}
+	!<sys-apps/baselayout-2.0.1
+	!sys-apps/modutils"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	touch *.5 *.8 # dont regen manpages
+}
+
+src_compile() {
+	mkdir build && cd build #290207
+	use static && append-ldflags -static
+	ECONF_SOURCE=.. \
+	econf \
+		--prefix=/ \
+		--enable-zlib \
+		--enable-zlib-dynamic \
+		--disable-static-utils
+	emake || die
+}
+
+src_test() {
+	# this manually runs configure and stuff, so ignore it
+	./tests/runtests -v || die
+}
+
+src_install() {
+	emake -C build install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	into /
+	newsbin "${FILESDIR}"/update-modules-3.5.sh update-modules || die
+	doman "${FILESDIR}"/update-modules.8 || die
+
+	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
+	install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install ohci_hcd \$CMDLINE_OPTS
+	install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe --ignore-install uhci_hcd \$CMDLINE_OPTS
+	EOF
+
+	insinto /etc/modprobe.d
+	doins "${T}"/usb-load-ehci-first.conf || die #260139
+}
+
+pkg_postinst() {
+	# cheat to keep users happy
+	if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then
+		sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules
+	fi
+
+	# For files that were upgraded but not renamed via their ebuild to
+	# have a proper .conf extension, rename them so etc-update tools can
+	# take care of things. #274942
+	local i f cfg
+	eshopts_push -s nullglob
+	for f in "${ROOT}"etc/modprobe.d/* ; do
+		# The .conf files need no upgrading unless a non-.conf exists,
+		# so skip this until later ...
+		[[ ${f} == *.conf ]] && continue
+		# If a .conf doesn't exist, then a package needs updating, or
+		# the user created it, or it's orphaned.  Either way, we don't
+		# really know, so leave it alone.
+		[[ ! -f ${f}.conf ]] && continue
+
+		i=0
+		while :; do
+			cfg=$(printf "%s/._cfg%04d_%s.conf" "${f%/*}" ${i} "${f##*/}")
+			[[ ! -e ${cfg} ]] && break
+			((i++))
+		done
+		elog "Updating ${f}; please run 'etc-update'"
+		mv "${f}.conf" "${cfg}"
+		mv "${f}" "${f}.conf"
+	done
+	# Whine about any non-.conf files that are left
+	for f in "${ROOT}"etc/modprobe.d/* ; do
+		[[ ${f} == *.conf ]] && continue
+		ewarn "The '${f}' file needs to be upgraded to end with a '.conf'."
+		ewarn "Either upgrade the package that owns it, or manually rename it."
+	done
+	eshopts_pop
+}