From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- sys-apps/linux-misc-apps/Manifest | 2 +- .../linux-misc-apps/linux-misc-apps-5.8-r1.ebuild | 229 +++++++++++++++++++++ .../linux-misc-apps/linux-misc-apps-5.8.ebuild | 229 --------------------- 3 files changed, 230 insertions(+), 230 deletions(-) create mode 100644 sys-apps/linux-misc-apps/linux-misc-apps-5.8-r1.ebuild delete mode 100644 sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild (limited to 'sys-apps/linux-misc-apps') diff --git a/sys-apps/linux-misc-apps/Manifest b/sys-apps/linux-misc-apps/Manifest index 09efccbdfa4c..ba570e8d00d3 100644 --- a/sys-apps/linux-misc-apps/Manifest +++ b/sys-apps/linux-misc-apps/Manifest @@ -1,5 +1,5 @@ AUX freefall.confd 147 BLAKE2B b8fcd23306df7122e47e765dcba00cbec0fa7e2d9758d606e7e80cd3195b3fb7bce976fafef801812b425827f99689cde668106430119fcb57767bc816de635f SHA512 556472ab75ab8d3ccbedc44902a34bdef433430aa86fe5d8a125b27101f81e9c7c77e5a1fdfa84aef35078046e4b27a33eeb17d1745871f9e1f41e0ef64b2ba9 AUX freefall.initd 1111 BLAKE2B c9c5de16da61124a4e984b47ca7cfa368cb5d02bfa85286f2cb9eaa50557da1b55d86b7a5beba5a5db60653c4a84b57276edc982782b7f8509d9a33cf45956e9 SHA512 e4d4d724276d9b64b80b29be5c28b9efc15556dd31545c85e45253aec2305d37af4b60a0be3f2f279c76c27aba5a968053a9bab7d08f2d559277701fd84375f4 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556 -EBUILD linux-misc-apps-5.8.ebuild 6544 BLAKE2B 28a99d9acc4bd41c57b3ccb4beb2f51c276daa30d9f001695a87ac258d3debd28d67a3aaac19405832e83d61bb012d457acec79769b26c6b58890b111980314b SHA512 1c6c083cb8e32fb3cdd4a70417ef070ff7fe959759911ca9a5f67b82ddcf28964b5859e58d6085c8c661ed813b027ac58ff970de91a1c1dcad2b70d6a3193689 +EBUILD linux-misc-apps-5.8-r1.ebuild 6547 BLAKE2B fad7d15978d4be3845be69d9feb8d9bf968db5fb47b4c624c5e448ae7f4b5699744aac3fd5f59e20645a73f99a70d33d37b8a2a35c70ec4687cfc069a7424620 SHA512 b3c406b2f5b3654c119313882711ba48ae555c2c867cd145e8e058fee1207e6553525eb339a0ede9f1b08fa5fe1d0db66795df2a816a7ae765d733214db6e6d9 MISC metadata.xml 319 BLAKE2B 6e9089b60c04b70d9201f28d9dbb92feebdd9626ec0a8283aa35ca6da730e2b4fa05a6ae5414409e35b8d0ce7299bc57ea5dedfb79e265a7cfb69fef92121cb1 SHA512 000c8949d342ff8cbfbffd714877e51dda73891af1deb77275dbf921fab9ff41eb217662254195c55bcafbe822d2e9bb3e49bc0b7791a4fcd61eb8848a1b1a4e diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-5.8-r1.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-5.8-r1.ebuild new file mode 100644 index 000000000000..d89ebc89f32a --- /dev/null +++ b/sys-apps/linux-misc-apps/linux-misc-apps-5.8-r1.ebuild @@ -0,0 +1,229 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic linux-info toolchain-funcs + +DESCRIPTION="Misc tools bundled with kernel sources" +HOMEPAGE="https://kernel.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="static-libs tcpd usbip" + +MY_PV="${PV/_/-}" +MY_PV="${MY_PV/-pre/-git}" + +LINUX_V=$(ver_cut 1-2) + +_get_version_component_count() { + local cnt=( $(ver_rs 1- ' ') ) + echo ${#cnt[@]} || die +} + +if [ ${PV/_rc} != ${PV} ]; then + LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1)) + PATCH_VERSION=$(ver_cut 1-3) + LINUX_PATCH=patch-${PV//_/-}.xz + SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH} + https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}" +elif [ $(_get_version_component_count) == 4 ]; then + # stable-release series + LINUX_VER=$(ver_cut 1-3) + LINUX_PATCH=patch-${PV}.xz + SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_PATCH}" +else + LINUX_VER=${PV} +fi + +LINUX_SOURCES=linux-${LINUX_VER}.tar.xz +SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_SOURCES}" + +# pmtools also provides turbostat +# usbip available in seperate package now +RDEPEND="sys-apps/hwdata + >=dev-libs/glib-2.6 + >=sys-kernel/linux-headers-${LINUX_V} + usbip? ( + !net-misc/usbip + tcpd? ( sys-apps/tcp-wrappers ) + virtual/libudev + ) + !sys-power/pmtools" +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=( + samples/watchdog/watchdog-simple.c + tools/accounting/getdelays.c + tools/cgroup/cgroup_event_listener.c + tools/laptop/freefall/freefall.c + tools/testing/selftests/net/timestamping.c + tools/vm/slabinfo.c + usr/gen_init_cpio.c + # Broken: + #tools/lguest/lguest.c # fails to compile + #tools/vm/page-types.c # page-types.c:(.text+0xe2b): undefined reference to `debugfs__mount', not defined anywhere + #tools/net/bpf_jit_disasm.c # /usr/include/x86_64-pc-linux-gnu/bfd.h:35:2: error: #error config.h must be included before this header +) +# tools/vm/page-types.c - broken, header path issue +# 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=( + samples/mei:mei-amt-version + tools/firewire:nosy-dump + tools/iio:iio_event_monitor + tools/iio:iio_generic_buffer + tools/iio:lsiio + tools/laptop/dslm:dslm + tools/power/x86/turbostat:turbostat + tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy + tools/thermal/tmon:tmon +) +# 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 + eapply "${DISTDIR}"/${LINUX_PATCH} + fi + + pushd tools/usb/usbip/ >/dev/null && + sed -i 's/-Werror[^ ]* //g' configure.ac && + eautoreconf -i -f -v && + popd >/dev/null || die "usbip" + + sed -i \ + -e '/^nosy-dump.*LDFLAGS/d' \ + -e '/^nosy-dump.*CFLAGS/d' \ + -e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \ + "${S}"/tools/firewire/Makefile + + eapply_user +} + +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() { + append-cflags -fcommon + if use usbip; then + pushd tools/usb/usbip/ || die + econf \ + $(use_enable static-libs static) \ + $(use tcpd || echo --without-tcp-wrappers) \ + --with-usbids-dir=/usr/share/hwdata + popd + fi +} + +src_compile() { + local karch=$(kernel_asm_arch "${ARCH}") + # This is the minimal amount needed to start building host binaries. + #emake allmodconfig ARCH=${karch} + #emake prepare modules_prepare ARCH=${karch} + #touch Module.symvers + + # Now we can start building + append-cflags -I./tools/lib + 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} + done + + for t in ${TARGET_MAKE_SIMPLE[@]} ; do + dir=${t/:*} target_binfile=${t#*:} + target=${target_binfile/:*} binfile=${target_binfile/*:} + [ -z "${binfile}" ] && binfile=$target + einfo "Building $dir => $binfile (via emake $target)" + emake -C $dir ARCH=${karch} $target + done + + if use usbip; then + emake -C tools/usb/usbip + fi +} + +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} + done + + for t in ${TARGET_MAKE_SIMPLE[@]} ; do + dir=${t/:*} target_binfile=${t#*:} + target=${target_binfile/:*} binfile=${target_binfile/*:} + [ -z "${binfile}" ] && binfile=$target + einfo "Installing $dir => $binfile" + dosbin ${dir}/${binfile} + done + + if use usbip; then + pushd tools/usb/usbip/ >/dev/null || die "usbip" + emake DESTDIR="${D}" install + newdoc README README.usbip + newdoc AUTHORS AUTHORS.usbip + popd >/dev/null + dodoc Documentation/usb/usbip_protocol.rst + find "${D}" -name 'libusbip*.la' -delete || die + fi + + # At one point upstream it was moved, but be generic to detect if it's + # happened already + if [[ -f "${D}"/usr/sbin/generic_buffer ]] && \ + [[ ! -f "${D}"/usr/sbin/iio_generic_buffer ]]; then + mv -f "${D}"/usr/sbin/{,iio_}generic_buffer || die + fi + + newconfd "${FILESDIR}"/freefall.confd freefall + newinitd "${FILESDIR}"/freefall.initd freefall +} + +pkg_postinst() { + echo + elog "The cpupower utility is maintained separately at sys-power/cpupower" + elog "The lguest utility no longer builds, and has been dropped." + elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed" + if find "${ROOT}"/etc/runlevels/ -name hpfall ; then + ewarn "You must change hpfall to freefall in your runlevels!" + fi + if use usbip; then + elog "For using USB/IP you need to enable USBIP_VHCI_HCD in the client" + elog "machine's kernel config and USBIP_HOST on the server." + fi +} diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild deleted file mode 100644 index 305b9ee03e9a..000000000000 --- a/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic linux-info toolchain-funcs - -DESCRIPTION="Misc tools bundled with kernel sources" -HOMEPAGE="https://kernel.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="static-libs tcpd usbip" - -MY_PV="${PV/_/-}" -MY_PV="${MY_PV/-pre/-git}" - -LINUX_V=$(ver_cut 1-2) - -_get_version_component_count() { - local cnt=( $(ver_rs 1- ' ') ) - echo ${#cnt[@]} || die -} - -if [ ${PV/_rc} != ${PV} ]; then - LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1)) - PATCH_VERSION=$(ver_cut 1-3) - LINUX_PATCH=patch-${PV//_/-}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH} - https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}" -elif [ $(_get_version_component_count) == 4 ]; then - # stable-release series - LINUX_VER=$(ver_cut 1-3) - LINUX_PATCH=patch-${PV}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_PATCH}" -else - LINUX_VER=${PV} -fi - -LINUX_SOURCES=linux-${LINUX_VER}.tar.xz -SRC_URI="${SRC_URI} https://www.kernel.org/pub/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 - >=sys-kernel/linux-headers-${LINUX_V} - usbip? ( - !net-misc/usbip - tcpd? ( sys-apps/tcp-wrappers ) - virtual/libudev - ) - !sys-power/pmtools" -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=( - samples/watchdog/watchdog-simple.c - tools/accounting/getdelays.c - tools/cgroup/cgroup_event_listener.c - tools/laptop/freefall/freefall.c - tools/testing/selftests/net/timestamping.c - tools/vm/slabinfo.c - usr/gen_init_cpio.c - # Broken: - #tools/lguest/lguest.c # fails to compile - #tools/vm/page-types.c # page-types.c:(.text+0xe2b): undefined reference to `debugfs__mount', not defined anywhere - #tools/net/bpf_jit_disasm.c # /usr/include/x86_64-pc-linux-gnu/bfd.h:35:2: error: #error config.h must be included before this header -) -# tools/vm/page-types.c - broken, header path issue -# 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=( - samples/mei:mei-amt-version - tools/firewire:nosy-dump - tools/iio:iio_event_monitor - tools/iio:iio_generic_buffer - tools/iio:lsiio - tools/laptop/dslm:dslm - tools/power/x86/turbostat:turbostat - tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy - tools/thermal/tmon:tmon -) -# 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 - eapply "${DISTDIR}"/${LINUX_PATCH} - fi - - pushd tools/usb/usbip/ >/dev/null && - sed -i 's/-Werror[^ ]* //g' configure.ac && - eautoreconf -i -f -v && - popd >/dev/null || die "usbip" - - sed -i \ - -e '/^nosy-dump.*LDFLAGS/d' \ - -e '/^nosy-dump.*CFLAGS/d' \ - -e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \ - "${S}"/tools/firewire/Makefile - - eapply_user -} - -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() { - append-cflags -fcommon - if use usbip; then - pushd tools/usb/usbip/ || die - econf \ - $(use_enable static-libs static) \ - $(use tcpd || echo --without-tcp-wrappers) \ - --with-usbids-dir=/usr/share/misc - popd - fi -} - -src_compile() { - local karch=$(kernel_asm_arch "${ARCH}") - # This is the minimal amount needed to start building host binaries. - #emake allmodconfig ARCH=${karch} - #emake prepare modules_prepare ARCH=${karch} - #touch Module.symvers - - # Now we can start building - append-cflags -I./tools/lib - 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} - done - - for t in ${TARGET_MAKE_SIMPLE[@]} ; do - dir=${t/:*} target_binfile=${t#*:} - target=${target_binfile/:*} binfile=${target_binfile/*:} - [ -z "${binfile}" ] && binfile=$target - einfo "Building $dir => $binfile (via emake $target)" - emake -C $dir ARCH=${karch} $target - done - - if use usbip; then - emake -C tools/usb/usbip - fi -} - -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} - done - - for t in ${TARGET_MAKE_SIMPLE[@]} ; do - dir=${t/:*} target_binfile=${t#*:} - target=${target_binfile/:*} binfile=${target_binfile/*:} - [ -z "${binfile}" ] && binfile=$target - einfo "Installing $dir => $binfile" - dosbin ${dir}/${binfile} - done - - if use usbip; then - pushd tools/usb/usbip/ >/dev/null || die "usbip" - emake DESTDIR="${D}" install - newdoc README README.usbip - newdoc AUTHORS AUTHORS.usbip - popd >/dev/null - dodoc Documentation/usb/usbip_protocol.rst - find "${D}" -name 'libusbip*.la' -delete || die - fi - - # At one point upstream it was moved, but be generic to detect if it's - # happened already - if [[ -f "${D}"/usr/sbin/generic_buffer ]] && \ - [[ ! -f "${D}"/usr/sbin/iio_generic_buffer ]]; then - mv -f "${D}"/usr/sbin/{,iio_}generic_buffer || die - fi - - newconfd "${FILESDIR}"/freefall.confd freefall - newinitd "${FILESDIR}"/freefall.initd freefall -} - -pkg_postinst() { - echo - elog "The cpupower utility is maintained separately at sys-power/cpupower" - elog "The lguest utility no longer builds, and has been dropped." - elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed" - if find "${ROOT}"/etc/runlevels/ -name hpfall ; then - ewarn "You must change hpfall to freefall in your runlevels!" - fi - if use usbip; then - elog "For using USB/IP you need to enable USBIP_VHCI_HCD in the client" - elog "machine's kernel config and USBIP_HOST on the server." - fi -} -- cgit v1.2.3