Attachment #396438 for bug #533918




SRC_URI="${SRC_URI} mirror://kernel/linux/kernel/v3.x/${LINUX_SOURCES}"

# pmtools also provides turbostat
# usbip available in seperate package now
RDEPEND="sys-apps/hwids
		>=dev-libs/glib-2.6
		tcpd? ( sys-apps/tcp-wrappers )

# 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/perf - covered by dev-utils/perf
# tools/usb - testcases only
# tools/virtio - testcaes only
USBIP=tools/usb/usbip

	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
src_unpack() {

		epatch "${DISTDIR}"/${LINUX_PATCH}
	fi

	sed -i -e 's/\(BUILD_OUTPUT.*:= \)$(PWD)/\1./' tools/power/x86/turbostat/Makefile
	pushd ${USBIP} >/dev/null &&
	eautoreconf -i -f -v &&
	popd >/dev/null || die "usbip"

	sed -i \
		-e '/^nosy-dump.*LDFLAGS/d' \
		-e '/^nosy-dump.*CFLAGS/d' \

}

src_configure() {
	cd ${USBIP} && \
	econf \
		$(use_enable static-libs static) \
		$(use tcpd || echo --without-tcp-wrappers) \
		--with-usbids-dir=/usr/share/misc
}

src_compile() {

		einfo "Building $dir => $target"
		emake -C $dir ARCH=${karch} $target
	done

	emake -C ${USBIP}
}

src_install() {

		dosbin ${dir}/${target}
	done

	pushd ${USBIP} >/dev/null \
		|| die "Missing usbip/userspace"
	emake DESTDIR="${D}" install

	newdoc README README.usbip
	newdoc AUTHORS AUTHORS.usbip
	popd >/dev/null
	dodoc drivers/usb/usbip/usbip_protocol.txt

	newconfd "${FILESDIR}"/freefall.confd freefall
	newinitd "${FILESDIR}"/freefall.initd freefall
	prune_libtool_files

pkg_postinst() {
	echo
	elog "The cpupower utility is maintained separately at sys-power/cpupower"
	elog "The usbip utility is maintained separately at net-misc/usbip"
}

Return to bug 533918

Lines 38-44 Link Here

(-)portage/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild.orig (-4 / +23 lines)
38	SRC_URI="${SRC_URI} mirror://kernel/linux/kernel/v3.x/${LINUX_SOURCES}"	38	SRC_URI="${SRC_URI} mirror://kernel/linux/kernel/v3.x/${LINUX_SOURCES}"
39		39
40	# pmtools also provides turbostat	40	# pmtools also provides turbostat
41	# usbip available in seperate package now
42	RDEPEND="sys-apps/hwids	41	RDEPEND="sys-apps/hwids
43	>=dev-libs/glib-2.6	42	>=dev-libs/glib-2.6
44	tcpd? ( sys-apps/tcp-wrappers )	43	tcpd? ( sys-apps/tcp-wrappers )
Lines 69-81 Link Here
69	# These have a broken make install, no DESTDIR	68	# These have a broken make install, no DESTDIR
70	TARGET_MAKE_SIMPLE=(	69	TARGET_MAKE_SIMPLE=(
71	tools/firewire:nosy-dump	70	tools/firewire:nosy-dump
72	tools/power/x86/turbostat:../../../../turbostat	71	tools/power/x86/turbostat:turbostat
73	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy	72	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
74	Documentation/misc-devices/mei:mei-amt-version	73	Documentation/misc-devices/mei:mei-amt-version
75	)	74	)
76	# tools/perf - covered by dev-utils/perf	75	# tools/perf - covered by dev-utils/perf
77	# tools/usb - testcases only	76	# tools/usb - testcases only
78	# tools/virtio - testcaes only	77	# tools/virtio - testcaes only
		78	USBIP=tools/usb/usbip
79		79
80	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do	80	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
81	src_unpack() {	81	src_unpack() {
Lines 95-100 Link Here
95	epatch "${DISTDIR}"/${LINUX_PATCH}	95	epatch "${DISTDIR}"/${LINUX_PATCH}
96	fi	96	fi
97		97
		98	sed -i -e 's/\(BUILD_OUTPUT.*:= \)$(PWD)/\1./' tools/power/x86/turbostat/Makefile
		99	pushd ${USBIP} >/dev/null &&
		100	eautoreconf -i -f -v &&
		101	popd >/dev/null \|\| die "usbip"
		102
98	sed -i \	103	sed -i \
99	-e '/^nosy-dump.*LDFLAGS/d' \	104	-e '/^nosy-dump.*LDFLAGS/d' \
100	-e '/^nosy-dump.*CFLAGS/d' \	105	-e '/^nosy-dump.*CFLAGS/d' \
Lines 115-121 Link Here
115	}	120	}
116		121
117	src_configure() {	122	src_configure() {
118	:	123	cd ${USBIP} && \
		124	econf \
		125	$(use_enable static-libs static) \
		126	$(use tcpd \|\| echo --without-tcp-wrappers) \
		127	--with-usbids-dir=/usr/share/misc
119	}	128	}
120		129
121	src_compile() {	130	src_compile() {
Lines 137-142 Link Here
137	einfo "Building $dir => $target"	146	einfo "Building $dir => $target"
138	emake -C $dir ARCH=${karch} $target	147	emake -C $dir ARCH=${karch} $target
139	done	148	done
		149
		150	emake -C ${USBIP}
140	}	151	}
141		152
142	src_install() {	153	src_install() {
Lines 153-158 Link Here
153	dosbin ${dir}/${target}	164	dosbin ${dir}/${target}
154	done	165	done
155		166
		167	pushd ${USBIP} >/dev/null \
		168	\|\| die "Missing usbip/userspace"
		169	emake DESTDIR="${D}" install
		170
		171	newdoc README README.usbip
		172	newdoc AUTHORS AUTHORS.usbip
		173	popd >/dev/null
		174	dodoc drivers/usb/usbip/usbip_protocol.txt
		175
156	newconfd "${FILESDIR}"/freefall.confd freefall	176	newconfd "${FILESDIR}"/freefall.confd freefall
157	newinitd "${FILESDIR}"/freefall.initd freefall	177	newinitd "${FILESDIR}"/freefall.initd freefall
158	prune_libtool_files	178	prune_libtool_files
Lines 161-165 Link Here
161	pkg_postinst() {	181	pkg_postinst() {
162	echo	182	echo
163	elog "The cpupower utility is maintained separately at sys-power/cpupower"	183	elog "The cpupower utility is maintained separately at sys-power/cpupower"
164	elog "The usbip utility is maintained separately at net-misc/usbip"
165	}	184	}