Skip to content

Commit

Permalink
sys-kernel/lh-sources: Bump to latest aufs3, genpatches and linux rel…
Browse files Browse the repository at this point in the history 
…ease

Package-Manager: portage-2.2.11-r1
  • Loading branch information
@jlec
jlec committed Aug 10, 2014
1 parent 5fd81b4 commit 1eb8a17
Show file tree
Hide file tree
Showing 3 changed files with 155 additions and 0 deletions.
5 changes: 5 additions & 0 deletions sys-kernel/lh-sources/ChangeLog
View file
@@ -1,5 +1,10 @@


*lh-sources-3.16.0 (10 Aug 2014)

10 Aug 2014; Justin Lecher <jlec@gentoo.org> +lh-sources-3.16.0.ebuild:
Bump to latest aufs3, genpatches and linux release

10 Aug 2014; Justin Lecher <jlec@gentoo.org> -lh-sources-3.15.3.ebuild,
-lh-sources-3.15.5.ebuild, -lh-sources-3.15.6.ebuild,
-lh-sources-3.15.7.ebuild, +lh-sources-3.15.9.ebuild:
Expand Down
9 changes: 9 additions & 0 deletions sys-kernel/lh-sources/Manifest
View file
@@ -1,12 +1,21 @@
DIST 0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r5-3.15.patch1 3338 SHA256 ef40c71371168754a1f696216183ffe161aaf1d10add77964e081f3fd36b799b SHA512 009238524b9e45ba0b0e85b78c5e98c1a54276f5425ab3fc56850d3cd334d0bb4cf75e9d1749f0f0def59c8a1bcc0a12a64787698328e5fd51e0e8158d5c3dc4 WHIRLPOOL a59db6e943f2a96c201b79dbf7d2cfcabfb5e772f80474b960c7967ec7bb3224a60ad92e2f352c68a99e48432ce0403b13990ddcb89abb0b3ac74ee7fc31ee68
DIST 0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r5-3.16.patch1 3338 SHA256 95cfdf13bc78e07cc540d6fc9087f0b4d710ce225acf36abbbbdeee421b023b9 SHA512 fd484e55bbff30f37e8d4b4c652bfce8d1e9a1bd2221e2d965ce18bd3eb929a3109fc02910535735b4af88f2f4700980f167dd7429b89a0fefdc24e778522473 WHIRLPOOL 90c4ba8101e3513e58875073fa2a6a55446e026747a1011302e81f1a5f38808a8d25f522c233997fa97cefc26b807cd2fb0d86bd47d6bc98cbb3e383f58c1877
DIST 0002-block-introduce-the-BFQ-v7r5-I-O-sched-for-3.15.patch1 210298 SHA256 1a3ecd9d1e19a6b21f54ad8c7b219c6894fa7c5457a127344d0fe69b62f1c4bd SHA512 b499354d0244c024ff077aec7a6e9d2d05b4523ddc63fc2a0a688fcbf38ed58ffc30924ff4ba9116530afd9f5e39cfe4f12067d31d2f45a32fdd28f24c6ae07d WHIRLPOOL 16c41e651b310cd2d0d40c38ae0342e5ca5c422b4120c815cc8298a63d3f72f93e28be4ec65bed36404175cad2b09234d8f99badd82d76895afcfaa49229ac77
DIST 0002-block-introduce-the-BFQ-v7r5-I-O-sched-for-3.16.patch1 210285 SHA256 445b4e9ac3d9281a69523214e09323b36eda88f75ce07bc836451ead76e4adac SHA512 63db43b6ce1d43f9cf4bc1736378eae3a53b396d684eb40502889e272f291208bacbcfcc2bdbab84ece472133a3b35ee4cdb11bc0bb0986d7f9fbad0b40d8ba1 WHIRLPOOL 0888a20d9f5a79bd9acfc3ffd24f601c7704108ec8c172eff082be56f764e77d0f4e5158fc20db36a73228e34b3ae81e029fa8f61032148b12ea0e76489e7ae4
DIST 0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r5-for-3.15.0.patch1 40497 SHA256 3f599d798ff5a3d449c7cf9bfec5503ab598d2d8372b051d5e1bd2419fb16ee0 SHA512 cfaba4e000d89e8cb6722d06d75d26e5396cf799a3e4c6ea169de008d1f97e26449a1af0a1fd5389bea21de248c71ce653f805dd9dfcfc4c74a8f95521f1dd7f WHIRLPOOL 490d6bdd2d7ab8706ff0241be000fce1511cde3da087435b4111070f27754e3b007236b0470eb934b9daedcda69b17d798a6a0228a97b162e7c4d433a28e2b4c
DIST 0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r5-for-3.16.0.patch1 40497 SHA256 901db70d0e8ea73167998662cfa517e0d9c48d93b95500b5a5d74dfca2ac4c66 SHA512 b645b483623b2a5fa2806991e2f73df83faf4ecd5a331624e38c671ed462bf124b884caad2fc76c8eaa326e3645d2e3efe2d2c06da90410db4ff6798e3305326 WHIRLPOOL 7f726cf637a11363031795a4cc6511a85e6a13a71b732ff1a53bee6c12dfa01e266b1c1a275459c281d337b9cc90275446b9e11bf32a1316593ffcdfc27009a3
DIST README-v7r5-0.BFQ 20481 SHA256 c12799344770d3834a8bff7f957e4ef432d819980d32359c04b4c87a662c855b SHA512 ca5bf1b4fbd61a9733e8d6f12f7740d34117e72aed29558368dd8922ade66651a313fefa19855d7d157d115cd14d1d7a84d4161d20f6447da48ea60140c0938b WHIRLPOOL b9db6e465c5648714a3730f5c83169908482e454fcdb597a943fdd64d823780b7c35625d023adfb478c9fb53970f9e1773cf38bd33b9fd2ba073b12e4e6ec915
DIST aufs-sources-3.15_p20140804.tar.xz 159828 SHA256 43e4a715637c050a33c0800b8a63f522c0415b5b6144d228febabc8daf611139 SHA512 c2bcff56d2394c5cffd67684438c22bcede77c46d2552ebfe98ad0cfa5ccc175303585210a0c6f43830fdc4a290942c7e161da2ac27a8a8956bf881f70b3468a WHIRLPOOL 8783755ef09e22e480aa99baa77695ba89795c3be5f44eae226f1df622e2b236b2d5bb6535cedeebc82cd6e8964fc36e09655a6a6affb0539ce907471ec296ab
DIST aufs-sources-3.16_p20140811.tar.xz 160092 SHA256 1524af0e28b4653f93dac37179860fd63c4031c7fb23fa74a9dcb348ce1ba454 SHA512 781462ac96d808ce33ae926e8972361929e9d44207e3e0d612f7b40fb0e1a5a186714403cb926f872289dffb091d1f4d174b052808af0a0f1836950695a1b526 WHIRLPOOL 5d74596bf0562872733a2b43e3dbebfd4e8132e00f095da4bb564cd95d29a6ffad89676dc8e90b31d5b1838504b2ea0fd0dec5f917f6aa9c5cdae02a8988147f
DIST deblob-3.15 120796 SHA256 d24f4b0548f42e7e83695919008cb75c70f5a7cb9c8a10824ca3c5c51fa62eaf SHA512 7815575001e48569268e60248da2768c6ee81982761420068ce16e6282a9552783595712ae4d937bb62d7e5f33e62b5daab0da35c8bb49c5d94ebde42f030495 WHIRLPOOL 403de2590101bc30408750a7a4eb1bdd6effbc5e2cc5c0615feff34abea649d015e02c4e54ddbb3dc33864c160f516a5e1e526162bdd0176944b382e9a52f425
DIST deblob-3.16 127089 SHA256 36a4b6667d16cac9f4882f4c96a57c37ea2f7ef8ed9e128db3ee9f60fc7d95d6 SHA512 8c7edc649eb68c194ab05856bf7a0359b18793001c247e6e742a56daaca7c159787240634a79a042ac8f31338900d8afcd3c82883ba5398be43d4d63a1882dec WHIRLPOOL 17b3e1025a138a13d5a0a973802d899e3881694cfc59520197994fd93245d835b092cb976873d15cf8b9079562ed3fa62dba19d87a668dbb757ddedd13d12946
DIST deblob-check-3.15 614485 SHA256 a594a31b5c0a7bc544d2c5158a16d4565de4e45b14f3fc309cfcf91bf46491e2 SHA512 f85e0d9ebf25b37fd9ae765cb2d5767ac475abc72d8b6bb5ed775f03efb216d53cfe1d86bd2945642274cd2c3ddd6ee0ded05019bde7bac71733c96b366cabb7 WHIRLPOOL 8e8e6cdd41313f61a7f9aa4630185f06e785ad951582165d0890596a3e59f8c703a658bf75a36359750eddb9a8b3edb86656860a88dc47b722329aff4cdbb7ef
DIST deblob-check-3.16 632725 SHA256 9647fc6ef8dc3ad7cadc511c0987664ba971892c3d4f733725d5b86e32caa4bf SHA512 4dd69ae9c7a98b1b5fc01de48282d4c4da196bd938ec55c2a82442d1134822693d517466db2ed4ebe8d46014a9dbe1c0ba2263cb21e49372dd0d0ace5ba3d504 WHIRLPOOL 5feadd7e44e6d9c633f58fc34b91c5ba4dc3105d8d9f3abb656cd15fc3603c3d68ad94d8d233fc47f5378a98988e8f9fa62fcddc4b7d1cba197ca7e9784445a6
DIST genpatches-3.15-11.base.tar.xz 204552 SHA256 b258eb058d17664cc119f0e3f510e133e7377de5032099547113e45b25386b2b SHA512 69bbc49607701c618043ed20295caf237426d947c8ab6a080de543894841f705189054367f3f97c2839a93e0ccb110446a83f01435afd43daa1e6272db746b44 WHIRLPOOL 416c37ce7f5097a9c7ca2518b7e3f2e00f084f3a5fe4732d5c08f18ff34c1125e7828e71b3558e96080b197d81885ffcb71c244e86893862f3ecb8a43dded2f1
DIST genpatches-3.15-11.extras.tar.xz 17664 SHA256 73486dc03f689795af6387938f691e63afbbaba922ae7a39771bc8bbbabf38f3 SHA512 cca40d93a944dd31c591a91817a40ac2991609c8200dae2c3e0298caaccf9e07b4fd0044b4d51c5337ff0fcfcab22d469e0a265f84eabca70c68a4d4eedaff04 WHIRLPOOL 601941ce9018f726e4fc6392a7dabcd03da5d457652aec7d871039c1428f1861f354b83673d056906dd94e63c5f9c68eb0036ae41443995fee2acfa5e3b6ee4a
DIST genpatches-3.16-1.base.tar.xz 6504 SHA256 ebc5f370ff0cc3d7c0213ed72b09c6c2f68be9758845d64fdde55f3771dd1fcf SHA512 3fc5e998e218be96a9011e469431a75c83a6a1e50caa02d443b7b876b22c32b3c6104c74e95a942c37f2156ef66586a67bd5d115d07da62b5e87efacc63de782 WHIRLPOOL 5a417d38f0e994d0a92b8c670176ae98f0ace4ea6bfa527131afec2943d57ba013499df39c40312849a7b9eb8433eb315a85e7597a1d0aa03d65860e876d896c
DIST genpatches-3.16-1.extras.tar.xz 17660 SHA256 0e2a55e6c44af02959ed08d7618dbd2c1a80f77f01788c21437d384f4d9db806 SHA512 749455b968f3f7a7ce5ae924eef9ae0d6099e9a5f11f0f1c0a740989d9299b12bfab05881f501286c58ecbd3bf6398f22109ae808d574c22a81a493f99aacfcf WHIRLPOOL 0baebf3920875c2b0905aff3a00010a379d825b13d14c09abe8a26ff0c03556a29c28baf80fa566a1d1303ebfd501d858684868534a5104282a17417c8cf38d5
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.15.tar.xz 79676484 SHA256 c3927e87be4040fa8aca1b58663dc0776aaf00485604ff88a623be2f3fb07794 SHA512 d5dc477cad4584e56e2e2ef9e0950c2b22e76e5cf5090a896ba099cb7c5e5db1853a4aeb96b199189653dc66d461557e95198e37516a619f7ddc01ba6b308e02 WHIRLPOOL 7f3dfde1a23aab75b7f40770ae2ca77c1b28f845e4abe6296b2aec9b56fe94f7afa76b00eb6cc7475305c31b726ebeb4643107dd48c12ac04c933cf1856b8e77
DIST linux-3.16.tar.xz 80501624 SHA256 4813ad7927a7d92e5339a873ab16201b242b2748934f12cb5df9ba2cfe1d77a0 SHA512 64033e741d3f42ed06010e63e69d66e1d3d9414ef20f76834508878d4218b72619541a18ef4fd377204af2859e52198310998109b20ed9b67722586b28c9a231 WHIRLPOOL 69e5e367751185ff4e8d7c1f23c6f1e8f547fe782f581f6cf5f0bde301fa922185c8b996b815cf19fb7f14ca64042e264e87d321872ee3096adad02b1015769b
141 changes: 141 additions & 0 deletions sys-kernel/lh-sources/lh-sources-3.16.0.ebuild
View file
@@ -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="1"
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_p20140811
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
}

0 comments on commit 1eb8a17

Please sign in to comment.