diff --git a/sys-kernel/lh-sources/ChangeLog b/sys-kernel/lh-sources/ChangeLog index 2ed328f9..a63d56d4 100644 --- a/sys-kernel/lh-sources/ChangeLog +++ b/sys-kernel/lh-sources/ChangeLog @@ -1,5 +1,10 @@ +*lh-sources-3.16.3 (18 Sep 2014) + + 18 Sep 2014; Justin Lecher +lh-sources-3.16.3.ebuild: + Bump to latest genpatches and linux release + 14 Sep 2014; Justin Lecher lh-sources-3.16.2.ebuild: Bump to latest aufs3 diff --git a/sys-kernel/lh-sources/Manifest b/sys-kernel/lh-sources/Manifest index ba1793c8..75ed264f 100644 --- a/sys-kernel/lh-sources/Manifest +++ b/sys-kernel/lh-sources/Manifest @@ -10,6 +10,8 @@ DIST genpatches-3.16-2.base.tar.xz 11984 SHA256 4e134e601992be75502e1d1378e653e6 DIST genpatches-3.16-2.extras.tar.xz 17664 SHA256 97897a464ff638dda372c8bed7ee10723fde7f370cab2c770fd28b450bf3221f SHA512 251639762bdd1477314a2f2b89249955826848e15874677242c10c56e9f724c54b1afdaeae8479b5326bd4861efc73e8d29658170379a6e1724450335c0c1faa WHIRLPOOL dd38dd64c263dea74f20658e8904bf2f88858cd3f613b16f0361195f9bcb73859310897f35ba501a3f46fe1ccba573e051a61fe42b2d3383bf3750081ff6269a DIST genpatches-3.16-3.base.tar.xz 62548 SHA256 6263f780ba964ddabffa97b25a20e614ee4cfcdb5ba69553ffb2204ad1a66bb8 SHA512 746e477009c9c9950f5de1507361812ecd59d351c23c24d2913e6aeb76e31f96b2e781efe0098f6649a447a694ec1ecdc77f0123413d4f9e98e8bcdc81a07810 WHIRLPOOL e8a6b21fd79c2727104513f48fe1663c47032b397da700c53a331660b390a0257c610429bd85871038fc80a4f37de37b7e5d52ef6b7426ca75c7f60df6897b68 DIST genpatches-3.16-3.extras.tar.xz 17672 SHA256 8874fc85725f970a9812baa6e6fbfdaee657fb741214241832ea7f5e62d4899c SHA512 855b9a0463173dd721a16a6efb5e6ca412f0972a2450470fa875b28d3a213cd4095db720ab22147cf5cea900f7ddf4162c7c9adf6f9ceeb1b3d4171bcc441023 WHIRLPOOL 7e60f734738e06e64549c6b4fa0b8b837e0979878e1a1e46105f9c63d66bf320acc6484c57abc0efa266323ad86a9c276b6837f3f00b40f70d256d0863e30044 +DIST genpatches-3.16-4.base.tar.xz 114720 SHA256 62fcf6a199e178c31cf9b439374b96bd98c93e6d0053d91f45ce383380b8fbc5 SHA512 b361cb28eb043930e7babfb727e40a34f58f1c733cddf7227596618723519c162c98859d1f77a15fa151e58407645b0061abf7cb903936b9c65cdffeb8a30fc7 WHIRLPOOL 9e63d053c18243da53d8bc087da60d32dc8523185c4e0fca4ba9d171014bc788c21a6ad6e18acde57a65372b711676571a640f0b698aa415b92a6a7b7f91df3e +DIST genpatches-3.16-4.extras.tar.xz 17660 SHA256 48e19245992eb3c476f1638f1395e67619bf6b44314a040e08d009cce3d01ee8 SHA512 cba451d240cb44067d7f20ecc1ab92e40b864fcb516e6d28d1f279db069bb7a785c9c78b3bed9047e13702cc46497dd5d520d503e798eb0aa8debe928a2293e1 WHIRLPOOL d328f842ec73e13009d96ce9a9c56a04f5f2b6072871585e40b49e0e8d71412e39c685a5c2861a4684cf880bf2a55c4359a57f515b348dbfce26f7ac5d31519e DIST lh-logo_linux_320_240_clut224.ppm 58367 SHA256 9692bfdd2257ae5131ac14eb6f34386416ec228be68a4bb02381378876e34812 SHA512 18cd56961a81f4ca87933859a35d84af86602f480a6b92dbb3c2f4a9b83abb7023c64939bc781bbe7f9e8e105df508698a66790909f9144fb99c1e347ccf22de WHIRLPOOL 66933acfce018d07d9d70dbfd56155bb23f7fdccb2295c28100165d6c8c14194556bdadf66b119f42db1d700d1ce5bf2eeca17f44c26582bb13656d166c055e8 DIST lh-sources-kernel-8883161b98577bd2397dc8616f8e805fb1861be1.patch 15840 SHA256 8154715b3b3c7ebfb614db64afabeb192692e82c73bacdceaad0dc584a07fb8f SHA512 f0acbc5ca8115dbee77437e69ff7de45756ac3ba50bb895681630f4e4722b8cb1b034a2aded5645aac8ae88cb236f864f2d150fa4dea017ffee45ca1d70b9d8c WHIRLPOOL 40977af61d98f5d31695b6f81438ac08dbd07d51663df4d5a078564cdcc7fc9310d9ce97522c43bf0e631d10d2d8d304eb437700cf44799b7b9496675fc4a59e DIST linux-3.16.tar.xz 80501624 SHA256 4813ad7927a7d92e5339a873ab16201b242b2748934f12cb5df9ba2cfe1d77a0 SHA512 64033e741d3f42ed06010e63e69d66e1d3d9414ef20f76834508878d4218b72619541a18ef4fd377204af2859e52198310998109b20ed9b67722586b28c9a231 WHIRLPOOL 69e5e367751185ff4e8d7c1f23c6f1e8f547fe782f581f6cf5f0bde301fa922185c8b996b815cf19fb7f14ca64042e264e87d321872ee3096adad02b1015769b diff --git a/sys-kernel/lh-sources/lh-sources-3.16.3.ebuild b/sys-kernel/lh-sources/lh-sources-3.16.3.ebuild new file mode 100644 index 00000000..790151bd --- /dev/null +++ b/sys-kernel/lh-sources/lh-sources-3.16.3.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.6.1.ebuild,v 1.1 2012/10/07 19:36:37 mpagano Exp $ + +EAPI=5 + +ETYPE="sources" +K_WANT_GENPATCHES="base extras" +K_GENPATCHES_VER="4" +K_DEBLOB_AVAILABLE="1" +UNIPATCH_STRICTORDER=1 +inherit kernel-2 readme.gentoo versionator +detect_version +detect_arch + +KMAIN_VER=$(get_version_component_range 1-2) + +AUFS_VERSION=3.16_p20140915 +AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz" +# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs3.8 > aufs-sources-${AUFS_VERSION}.tar +AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" + +LOGO_URI="http://dev.gentoo.org/~jlec/distfiles/lh-logo_linux_320_240_clut224.ppm" + +# Set to true, if BFQ needs to apply seperately +BFQ=true + +BFQ_URI_PATCH_MINOR="0" +BFQ_URI_PATCH_LEVEL="7r5" +BFQ_BASE="http://www.algogroup.unimo.it/people/paolo/disk_sched/patches/${KMAIN_VER}.${BFQ_URI_PATCH_MINOR}-v${BFQ_URI_PATCH_LEVEL}" +BFQ_URI=" + ${BFQ_BASE}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v${BFQ_URI_PATCH_LEVEL}-${KMAIN_VER}.patch -> \ + 0001-block-cgroups-kconfig-build-bits-for-BFQ-v${BFQ_URI_PATCH_LEVEL}-${KMAIN_VER}.patch1 + ${BFQ_BASE}/0002-block-introduce-the-BFQ-v${BFQ_URI_PATCH_LEVEL}-I-O-sched-for-${KMAIN_VER}.patch -> \ + 0002-block-introduce-the-BFQ-v${BFQ_URI_PATCH_LEVEL}-I-O-sched-for-${KMAIN_VER}.patch1 + ${BFQ_BASE}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v${BFQ_URI_PATCH_LEVEL}-for-${KMAIN_VER}.${BFQ_URI_PATCH_MINOR}.patch -> \ + 0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v${BFQ_URI_PATCH_LEVEL}-for-${KMAIN_VER}.${BFQ_URI_PATCH_MINOR}.patch1 + ${BFQ_BASE}/README.BFQ -> README-v${BFQ_URI_PATCH_LEVEL}-${BFQ_URI_PATCH_MINOR}.BFQ" + +GCCOPT_PATCH_LEVEL="8883161b98577bd2397dc8616f8e805fb1861be1" +GCCOPT_PATCH_NAME="enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch" +GCCOPT_URI="https://raw2.github.com/graysky2/kernel_gcc_patch/${GCCOPT_PATCH_LEVEL}/${GCCOPT_PATCH_NAME} -> ${PN}-kernel-${GCCOPT_PATCH_LEVEL}.patch" +GCCOPT_HOMEPAGE="https://github.com/graysky2/kernel_gcc_patch" +DESCRIPTION="Full sources including the Gentoo patchset, the BFQ patchset and aufs support for the ${KMAIN_VER} kernel" +HOMEPAGE=" + http://dev.gentoo.org/~mpagano/genpatches + http://aufs.sourceforge.net/ + ${GCCOPT_HOMEPAGE} + " +SRC_URI=" + ${KERNEL_URI} + ${ARCH_URI} + ${AUFS_URI} + ${LOGO_URI} + ${GCCOPT_URI} + !vanilla? ( ${GENPATCHES_URI} ) +" + +if [[ ${BFQ} == "true" ]]; then + HOMEPAGE+=" http://www.algogroup.unimo.it/people/paolo/disk_sched" + SRC_URI+=" ${BFQ_URI}" +fi + +KEYWORDS="~amd64 ~x86" +IUSE="deblob module vanilla" +README_GENTOO_SUFFIX="-r1" + +PDEPEND=">=sys-fs/aufs-util-3.7" + +AUFS_PATCH_LIST=" + "${WORKDIR}"/aufs3-kbuild.patch + "${WORKDIR}"/aufs3-base.patch + "${WORKDIR}"/aufs3-mmap.patch" +BFQ_PATCH_LIST=( + "${DISTDIR}"/0001-block-cgroups-kconfig-build-bits-for-BFQ-v${BFQ_URI_PATCH_LEVEL}-${KMAIN_VER}.patch1 + "${DISTDIR}"/0002-block-introduce-the-BFQ-v${BFQ_URI_PATCH_LEVEL}-I-O-sched-for-${KMAIN_VER}.patch1 + "${DISTDIR}"/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v${BFQ_URI_PATCH_LEVEL}-for-${KMAIN_VER}.${BFQ_URI_PATCH_MINOR}.patch1 + ) +GCCOPT_LIST=( "${DISTDIR}"/${PN}-kernel-${GCCOPT_PATCH_LEVEL}.patch ) + +BFQ_DOC="${DISTDIR}/README-v${BFQ_URI_PATCH_LEVEL}-${BFQ_URI_PATCH_MINOR}.BFQ" + +# http://unicorn.drogon.net/rpi/linux-arm.patch +ARM_PATCH_LIST="${FILESDIR}/${PN}-${KMAIN_VER}-armv6.patch" + +UNIPATCH_LIST=" + ${ARM_PATCH_LIST} + ${AUFS_PATCH_LIST} + ${GCCOPT_LIST} +" +# "${FILESDIR}"/c2412d91c68426e22add16550f97ae5cd988a159.patch + +if [[ ${BFQ} == "true" ]]; then + # UNIPATCH_LIST+=" ${BFQ_PATCH_LIST[@]}" + UNIPATCH_DOCS="${BFQ_DOC}" +fi + +src_unpack() { + if use vanilla; then + unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT + ewarn "You are using USE=vanilla" + ewarn "This will drop all support from the gentoo kernel security team" + fi + use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch" + unpack ${AUFS_TARBALL} + if [[ ${BFQ} == "true" ]]; then + mkdir "${WORKDIR}"/patches || die + cp ${BFQ_PATCH_LIST[@]} "${WORKDIR}"/patches || die + fi + kernel-2_src_unpack +} + +src_prepare() { + if ! use module; then + sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die + fi + cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die + cp -rf "${WORKDIR}"/{Documentation,fs} . || die + cp "${DISTDIR}"/lh-logo_linux_320_240_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm || die +} + +src_install() { + kernel-2_src_install + dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch + docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch + readme.gentoo_create_doc +} + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" + has_version sys-fs/aufs-util || \ + elog "In order to use aufs FS you need to install sys-fs/aufs-util" + + readme.gentoo_pkg_postinst +} + +pkg_postrm() { + kernel-2_pkg_postrm +}