Merge changes from net-misc/usbip-3.6 that just came out when I was not looking.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)

2 files changed, 224 insertions, 1 deletions

diff --git a/sys-apps/linux-misc-apps/ChangeLog b/sys-apps/linux-misc-apps/ChangeLog
index 0f72d29c7aab..c31a2705673c 100644
--- a/sys-apps/linux-misc-apps/ChangeLog
+++ b/sys-apps/linux-misc-apps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/linux-misc-apps
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-misc-apps/ChangeLog,v 1.2 2012/11/19 10:02:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-misc-apps/ChangeLog,v 1.3 2012/11/19 10:23:08 robbat2 Exp $
+
+*linux-misc-apps-3.6-r1 (19 Nov 2012)
+
+  19 Nov 2012; Robin H. Johnson <robbat2@gentoo.org>
+  +linux-misc-apps-3.6-r1.ebuild:
+  Merge changes from net-misc/usbip-3.6 that just came out when I was not
+  looking.
 
 *linux-misc-apps-3.6 (19 Nov 2012)
 
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r1.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r1.ebuild
new file mode 100644
index 000000000000..0eebbe540805
--- /dev/null
+++ b/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r1.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r1.ebuild,v 1.1 2012/11/19 10:23:08 robbat2 Exp $
+
+EAPI=4
+
+inherit versionator eutils toolchain-funcs linux-info autotools flag-o-matic
+
+DESCRIPTION="Misc tools bundled with kernel sources"
+HOMEPAGE="http://kernel.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE="static-libs tcpd"
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+LINUX_V=$(get_version_component_range 1-2)
+
+if [ ${PV/_rc} != ${PV} ]; then
+	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
+	PATCH_VERSION=$(get_version_component_range 1-3)
+	LINUX_PATCH=patch-${PV//_/-}.bz2
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [ $(get_version_component_count) == 4 ]; then
+	# stable-release series
+	LINUX_VER=$(get_version_component_range 1-3)
+	LINUX_PATCH=patch-${PV}.bz2
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+	LINUX_VER=${PV}
+fi
+
+LINUX_SOURCES=linux-${LINUX_VER}.tar.bz2
+SRC_URI="${SRC_URI} mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+# pciutils for cpupower
+# pmtools also provides turbostat
+# sysfsutils and glib for usbip - remove sysfsutils in 3.7 or 3.8
+RDEPEND="sys-apps/pciutils
+		sys-apps/hwids
+		>=sys-fs/sysfsutils-2
+		>=dev-libs/glib-2.6
+		tcpd? ( sys-apps/tcp-wrappers )
+		!sys-power/pmtools
+		!net-misc/usbip"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+S="${WORKDIR}/linux-${LINUX_VER}"
+
+# All of these are integrated with the kernel build system,
+# No make install, and ideally build with with the root Makefile
+TARGETS_SIMPLE=(
+	Documentation/accounting/getdelays.c
+	Documentation/cgroups/cgroup_event_listener.c
+	Documentation/laptops/dslm.c
+	Documentation/laptops/hpfall.c
+	Documentation/networking/timestamping/timestamping.c
+	Documentation/watchdog/src/watchdog-simple.c
+	tools/lguest/lguest.c
+	tools/vm/page-types.c
+	tools/vm/slabinfo.c
+	usr/gen_init_cpio.c
+)
+# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
+# Documentation/networking/ifenslave.c - obsolete
+# Documentation/ptp/testptp.c - pending linux-headers-3.0
+
+# These have a broken make install, no DESTDIR
+TARGET_MAKE_SIMPLE=(
+	tools/firewire:nosy-dump
+	tools/power/x86/turbostat:turbostat
+	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
+	Documentation/misc-devices/mei:mei-amt-version
+	tools/power/cpupower:cpupower
+)
+# tools/perf - covered by dev-utils/perf
+# tools/usb - testcases only
+# tools/virtio - testcaes only
+
+	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
+src_unpack() {
+	unpack ${LINUX_SOURCES}
+
+	MY_A=
+	for _AFILE in ${A}; do
+		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
+		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
+		MY_A="${MY_A} ${_AFILE}"
+	done
+	[[ -n ${MY_A} ]] && unpack ${MY_A}
+}
+
+src_prepare() {
+	if [[ -n ${LINUX_PATCH} ]]; then
+		epatch "${DISTDIR}"/${LINUX_PATCH}
+	fi
+
+	pushd drivers/staging/usbip/userspace >/dev/null &&
+	eautoreconf -i -f -v &&
+	popd >/dev/null || die "usbip"
+
+	libs="-lcpupower -lrt -lpci"
+	sed -i \
+		-e "/$libs/{ s,${libs},,g; s,\$, ${libs},g;}" \
+		"${S}"/tools/power/cpupower/Makefile
+
+	sed -i \
+		-e '/^nosy-dump.*LDFLAGS/d' \
+		-e '/^nosy-dump.*CFLAGS/d' \
+		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
+		"${S}"/tools/firewire/Makefile
+}
+
+cpupower_make() {
+	emake ${makeargs} \
+		CC="$(tc-getCC)" AR="$(tc-getAR)" \
+		docdir="/usr/share/doc/${PF}/cpupower" \
+		mandir="/usr/share/man" \
+		libdir="/usr/$(get_libdir)" \
+		OPTIMIZATION="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CPUFREQ_BENCH=/bin/false \
+		DEBUG=/bin/false \
+		STRIP=/bin/true \
+		"$@" || die
+}
+
+kernel_asm_arch() {
+	a="${1:${ARCH}}"
+	case ${a} in
+		# Merged arches
+		x86|amd64) echo x86 ;;
+		ppc*) echo powerpc ;;
+		# Non-merged
+		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
+		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
+	esac
+}
+
+src_configure() {
+	cd drivers/staging/usbip/userspace && \
+	econf \
+		$(use_enable static-libs static) \
+		$(use tcpd || echo --without-tcp-wrappers) \
+		--with-usbids-dir=/usr/share/misc
+}
+
+src_compile() {
+	local karch=$(kernel_asm_arch "${ARCH}")
+	# This is the minimal amount needed to start building host binaries.
+	#emake allmodconfig ARCH=${karch} || die
+	#emake prepare modules_prepare ARCH=${karch} || die
+	#touch Module.symvers
+
+	# Now we can start building
+	for s in ${TARGETS_SIMPLE[@]} ; do
+		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
+		einfo "Building $s => $bin"
+		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c} || die
+	done
+
+	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
+		dir=${t/:*} target=${t/*:}
+		einfo "Building $dir => $target"
+		emake -C $dir ARCH=${karch} $target || die
+	done
+
+	emake -C drivers/staging/usbip/userspace
+
+	# cpupower is special
+	einfo "Buildling cpupower"
+	cd "${S}"/tools/power/cpupower
+	cpupower_make ARCH=${karch} all || die
+}
+
+src_install() {
+	into /usr
+	for s in ${TARGETS_SIMPLE[@]} ; do
+		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
+		einfo "Installing $s => $bin"
+		dosbin ${dir}/${bin} || die "Failed to install ${bin}"
+	done
+
+	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
+		dir=${t/:*} target=${t/*:}
+		einfo "Installing $dir => $target"
+		dosbin ${dir}/${target} || die
+	done
+
+	pushd drivers/staging/usbip/userspace >/dev/null \
+		|| die "Missing usbip/userspace"
+	emake DESTDIR="${D}" install
+
+	newdoc README README.usbip
+	newdoc AUTHORS AUTHORS.usbip
+	dodoc ../usbip_protocol.txt
+	popd >/dev/null
+
+	local karch=$(kernel_asm_arch "${ARCH}")
+	pushd "${S}"/tools/power/cpupower >/dev/null \
+		|| die "Missing tools/power/cpupower"
+	cpupower_make ARCH=${karch} DESTDIR="${D}" install || die
+	popd >/dev/null
+
+	# Avoid conflict
+	rm -f "${D}"/usr/include/cpufreq.h
+
+	newconfd "${FILESDIR}"/hpfall.confd hpfall
+	newinitd "${FILESDIR}"/hpfall.initd hpfall
+	prune_libtool_files
+}