From 30b108ba76772e120832028b281c41c947d85a2c Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Mon, 29 Dec 2014 00:12:08 +0000 Subject: [PATCH] Bump. Package-Manager: portage-2.2.10/cvs/Linux x86_64 --- sys-apps/linux-misc-apps/ChangeLog | 8 +- sys-apps/linux-misc-apps/Manifest | 20 +-- sys-apps/linux-misc-apps/files/freefall.confd | 6 + sys-apps/linux-misc-apps/files/freefall.initd | 45 +++++ .../linux-misc-apps-3.18.ebuild | 165 ++++++++++++++++++ 5 files changed, 228 insertions(+), 16 deletions(-) create mode 100644 sys-apps/linux-misc-apps/files/freefall.confd create mode 100644 sys-apps/linux-misc-apps/files/freefall.initd create mode 100644 sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild diff --git a/sys-apps/linux-misc-apps/ChangeLog b/sys-apps/linux-misc-apps/ChangeLog index 0c4341d2f580..9c54c19fd8f5 100644 --- a/sys-apps/linux-misc-apps/ChangeLog +++ b/sys-apps/linux-misc-apps/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/linux-misc-apps # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-misc-apps/ChangeLog,v 1.7 2014/02/18 07:59:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-misc-apps/ChangeLog,v 1.8 2014/12/29 00:12:01 robbat2 Exp $ + +*linux-misc-apps-3.18 (29 Dec 2014) + + 29 Dec 2014; Robin H. Johnson +files/freefall.confd, + +files/freefall.initd, +linux-misc-apps-3.18.ebuild: + Bump. 18 Feb 2014; Samuli Suominen linux-misc-apps-3.6-r2.ebuild: diff --git a/sys-apps/linux-misc-apps/Manifest b/sys-apps/linux-misc-apps/Manifest index a29be78927b6..e663b1a2e355 100644 --- a/sys-apps/linux-misc-apps/Manifest +++ b/sys-apps/linux-misc-apps/Manifest @@ -1,20 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - +AUX freefall.confd 147 SHA256 3ed6f497dbb8f6b8a65f369b74d04a826a1b0463b344ce5d1b2000d97f4d5471 SHA512 556472ab75ab8d3ccbedc44902a34bdef433430aa86fe5d8a125b27101f81e9c7c77e5a1fdfa84aef35078046e4b27a33eeb17d1745871f9e1f41e0ef64b2ba9 WHIRLPOOL 74dd1f0f336da5bca45d40fdf083384e272c1197b3307a2840bb43937a365bea3bb78d972675dcd8fce67ca4ef1cfbc0150a81f25f8c637c40c858c1f18d9c42 +AUX freefall.initd 1231 SHA256 65dced0f1f866947143b05e6c8452e415eabe6c4293b0cac6ca78c4b4ab923c5 SHA512 3427f942ecf03728d4ea5db796deb650d60cfe06446a74ffc7087d24dd29c0b56eb5026efb3c29a8fc61e47a0b7f6b626ba74e068103b69ba949aa0d92fcf519 WHIRLPOOL 559974d4171f4544fbe52b18761b583696afb24fbfadbdd36e4d473388508460e90be1a7b1a792fa68887e74b1999a372811fadb3d8ee965610d7d38996ec33b AUX hpfall.confd 144 SHA256 54e3e4fa314066b0e0e177a7d19e86ad594ca89a307c134d236691edfe6970f8 SHA512 995fae481f169a2e53e4985113d5581ec37690a0fa2b77ca4665ff2e26d1ec073edc12d4001d4ca144ba3e3ce57b269bd8016ea024844fa3bde145bc7e4945f6 WHIRLPOOL de56cb87ae12029a18ad4131ae8a1e256a63f39aea3aae9eadbd28bf77631b29480c229765bf91b8afba35f9c4d0eee0a90cb33e5420b9608abd1622d27aaba3 AUX hpfall.initd 1216 SHA256 aa285384720c5e1be7265f45e1845b00f8450c1fb137349936c7fdc7459213ca SHA512 5bd8b0fee7f3197132b3bda98b5f55a2e412406364726b99bc1ee7f360d407cd20a316ca15f9bae47a445728da8b03891ab6bfd48e9c7dfa94da90a15e49363f WHIRLPOOL 4eb79bb148e46572bf2a2c269a78e2c092c444a1e7940417019cd0f57460ad8bde44c6483abba6ed0b4e3bc241f8fbfacc7872b393bcc167980998c848175bb1 +DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6 DIST linux-3.6.tar.bz2 82296001 SHA256 88ae0a20fd39ecae79db0ce8f9397922fae33c8b06a54ed2c883c861126c9771 SHA512 cbaefc2c4c8ab2251c3345b7b2c88d55a49e3468d8b177b05dd6d96a802efa9a052b1a1ecab8b71298bac97f45259516d88253838332b4fdb4307780ebcddce9 WHIRLPOOL e17e3800951f0c3af21015d1a1c99698d0ef70815bd4f131dd60b30baef70d4c255988857533a9a7c058388c2febfcf02d12cde2a7ed46b24fa85aeb260c0251 +EBUILD linux-misc-apps-3.18.ebuild 4658 SHA256 70a589d989efd9993c6bd4d2882dfaef0a04162ab89bbb66b869cd95e352672f SHA512 6116047de80a36ac1f9d5329bdecbf0ca29d5467ccc0e367c45209f8a64b09ad2d35b2c4fc7f367a8f8a847eba43b4cb8a61fc9a48e733996fde0b0ba5e42061 WHIRLPOOL 305c98a3a7e890411dc9da4ebe7cc02b35c4737249a56d4573d60ef2db303b80b77688c7accd84a5db97936fb162b5f98eec76ea1684c89a6c0947bb8e449436 EBUILD linux-misc-apps-3.6-r2.ebuild 5192 SHA256 4359b671ded561288d4574fdf0661243e9f080433c835d56d0a0b108184cbf6f SHA512 aad20d65073140e519776cd92bff67055a6e24e0cd61b29c8d0779bb0acbd901692f764ca15a02c3d933c3e9105abc5f537e2bd49da032e69c1f55fcc6ab7be9 WHIRLPOOL 29341160818d06341be333416a4f0348def79bccd4d4b5db9ffc79e16de608827cbc4fcf76397e758a247159a02373ab9a7e6dd16e25cbac631da576b68ea82d -MISC ChangeLog 1490 SHA256 c32d0b0b4742e0b2943afe8e88b282278af7529de402dcb6e4f2c9305ee971ae SHA512 6eead081a92c1317efcafa4caff88d6bab746e75b2342755b026f6ad88f3c172dc6e9e2573079b9ecf23755f4f679c154c51f910dfddaf6009b1e3114a91c5d0 WHIRLPOOL b413ad947c12691225fbd1562392c9017e97ce6e2b2a3d4f557191a78618c1d12482c5294faf242c1115e32962ac62702d129d571811c619f4ff57b8008487cf +MISC ChangeLog 1665 SHA256 f4c71ec42992408bd8bf2178b4eb06221d3527471e94c8c034a028edb7549fec SHA512 4344ac73f65de3650dbd64343a90e8753075460d80dbc91fc724aacb9c377c3e7e8a114a1cdd3ff6fda872da439e6522d546dfe9ca8f981f40690d8e827598d0 WHIRLPOOL e6cd6ca29d6fc9d79d6b46be6cbad0d397b8472cd49fc521aac91eb9019087cb06fae221cf38df977db67ea5bc6984bafce6ad64a1c5ce60b2205150b172775f MISC metadata.xml 202 SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a SHA512 bd1c14da72bdd52e3bea3056f5b9f908c31d6915b651d15d80a0a7d26778c97cde493ae9ca4352bd313eb16ddbed9b169c6b620c7f4a9b77973f7077fa8d997c WHIRLPOOL c073cc4c903e3377c7aee652c5661a1657cc5ba70c3deb4b2d7b2d0e31a78fb8b362b2f255de3faddbf4c46250d14d2d5d39a6a13b910ad18f8d53df362163a0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQEcBAEBCAAGBQJTAxJhAAoJEEdUh39IaPFNR2gIAKS4BKKJZEGjIjX4CqMdmfHK -RfvH3cOiOKX53RWnUIYrkyymKwgtt1Fck4itOpKxZmZAEZK7MV+x2+77g0ntexk5 -676Fun8pMbrn9ZgIoIemNLmTPYAn8v3wB9RaL5bWuQFueK8NNWyXTdzCErxGiS8J -F7Aa2GHNA5B4jp5mqIAn8F/pYvEhzLSYI8XlT7NARijlRXHe2rU+XDOJ8+lfVvcf -XLrDArEWvT4xj3xbwwgulUR7iUhSdFKKtqk9qMld5PU2N34nCtIMClJBnD/Zr7mw -lqmav1oiMfAc37O7hO/a2kT2CabXoTeGPWutIaPmLiCLxq2Z0JgfqV1ak9wM9cY= -=uF9M ------END PGP SIGNATURE----- diff --git a/sys-apps/linux-misc-apps/files/freefall.confd b/sys-apps/linux-misc-apps/files/freefall.confd new file mode 100644 index 000000000000..c082615cbcac --- /dev/null +++ b/sys-apps/linux-misc-apps/files/freefall.confd @@ -0,0 +1,6 @@ +# /etc/conf.d/freefall + +# The name of the disk device that hpfall should protect. +# Usually this is 'sda' or 'hda' the primary master. + +DISK="sda" diff --git a/sys-apps/linux-misc-apps/files/freefall.initd b/sys-apps/linux-misc-apps/files/freefall.initd new file mode 100644 index 000000000000..914bbabcd8b5 --- /dev/null +++ b/sys-apps/linux-misc-apps/files/freefall.initd @@ -0,0 +1,45 @@ +#!/sbin/runscript +# Copyright 2012-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-misc-apps/files/freefall.initd,v 1.1 2014/12/29 00:12:01 robbat2 Exp $ + +checkconfig() { + if [ -z "$DISK" ] ; then + eerror "You need to setup DISK in /etc/conf.d/freefall first" + return 1 + fi + + if [ ! -b /dev/${DISK} ]; then + eerror "Could not find disk /dev/${DISK}!" + eerror "Adjust the DISK setting in /etc/conf.d/freefall" + return 1 + fi + + if [ ! -e /sys/block/${DISK}/device/unload_heads ] ; then + eerror "No protect entry for ${DISK}!" + eerror "Kernel 2.6.28 and above is required" + return 1 + fi + + if [ ! -c /dev/freefall ]; then + ebegin "Loading hp_accel module" + modprobe hp_accel + eend $? || return 1 + fi +} + +start () { + checkconfig || return 1 + + ebegin "Starting active hard-drive protection daemon" + start-stop-daemon --start --quiet \ + --exec /usr/sbin/freefall /dev/${DISK} + eend $? +} + +stop() { + ebegin "Stopping active hard-drive protection daemon" + start-stop-daemon --stop --quiet \ + --exec /usr/sbin/freefall + eend $? +} diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild new file mode 100644 index 000000000000..3397c4fc1583 --- /dev/null +++ b/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2014 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.18.ebuild,v 1.1 2014/12/29 00:12:01 robbat2 Exp $ + +EAPI=5 + +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 ~ppc ~x86" +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//_/-}.xz + SRC_URI="mirror://kernel/linux/kernel/v3.x/testing/${LINUX_PATCH} + mirror://kernel/linux/kernel/v3.x/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}.xz + SRC_URI="mirror://kernel/linux/kernel/v3.x/${LINUX_PATCH}" +else + LINUX_VER=${PV} +fi + +LINUX_SOURCES=linux-${LINUX_VER}.tar.xz +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 ) + !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=( + Documentation/accounting/getdelays.c + tools/cgroup/cgroup_event_listener.c + Documentation/laptops/dslm.c + Documentation/laptops/freefall.c + Documentation/networking/timestamping/timestamping.c + Documentation/watchdog/src/watchdog-simple.c + tools/lguest/lguest.c + tools/vm/slabinfo.c + usr/gen_init_cpio.c +) +# 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=( + 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 + + #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 + + sed -i \ + -e '/^nosy-dump.*LDFLAGS/d' \ + -e '/^nosy-dump.*CFLAGS/d' \ + -e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \ + "${S}"/tools/firewire/Makefile +} + +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() { + : +} + +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 + 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=${t/*:} + einfo "Building $dir => $target" + emake -C $dir ARCH=${karch} $target + done +} + +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=${t/*:} + einfo "Installing $dir => $target" + dosbin ${dir}/${target} + done + + 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" +} -- 2.26.2