From befa6eba8b40800e22d8ea433adcee4f398451f3 Mon Sep 17 00:00:00 2001 From: Oleg Vinichenko Date: Sat, 14 Jan 2017 19:33:08 +0000 Subject: [PATCH] update debian-ource-4.9.2, masked for testing. clean old versions --- profiles/package.mask/funtoo-staging-oleg | 3 + sys-kernel/debian-sources/Manifest | 8 +- .../debian-sources-3.19.3.ebuild | 163 ------------------ .../debian-sources-4.4.6.ebuild | 155 ----------------- ...8.7.ebuild => debian-sources-4.9.2.ebuild} | 4 +- 5 files changed, 7 insertions(+), 326 deletions(-) delete mode 100644 sys-kernel/debian-sources/debian-sources-3.19.3.ebuild delete mode 100644 sys-kernel/debian-sources/debian-sources-4.4.6.ebuild rename sys-kernel/debian-sources/{debian-sources-4.8.7.ebuild => debian-sources-4.9.2.ebuild} (99%) diff --git a/profiles/package.mask/funtoo-staging-oleg b/profiles/package.mask/funtoo-staging-oleg index 01151c363..db9dac057 100644 --- a/profiles/package.mask/funtoo-staging-oleg +++ b/profiles/package.mask/funtoo-staging-oleg @@ -1,3 +1,6 @@ +# mask debian-sources for testing: +=sys-kernel/debian-sources-4.9.2 + # FL-3372: add kibana-bin-5.0.0 which requires masked below elasticsearch. >=www-apps/kibana-bin-5.0.0 diff --git a/sys-kernel/debian-sources/Manifest b/sys-kernel/debian-sources/Manifest index 901df4a7b..659ac5d0e 100644 --- a/sys-kernel/debian-sources/Manifest +++ b/sys-kernel/debian-sources/Manifest @@ -1,12 +1,8 @@ -DIST linux_3.19.3-1~exp1.debian.tar.xz 481064 SHA256 f134b7ac864cd614553a646c5672365cb744acba5844fa2f469d0aa9399e6656 SHA512 417eb9b5df8909d476c216410b279881d8536cbf76cf466823cebb8027f23d39bf0b69492370e65a46520f9a854739ac6f2f054cf0f8f43d790eeb1b54492957 WHIRLPOOL f3bbeb4ec3945abbcda2bcd4f8927a977b93554bd8b65ab95b37272baa6efcb411e9d85f9219d1f8a56224f7a0f683c28198ac2f5089d585c76eb17458f4920c -DIST linux_3.19.3.orig.tar.xz 82762712 SHA256 df1b9f47513da7fce7f1eed9e6107f0948d963c5c0bcf1c056d0680fd92d1344 SHA512 25271fec37ab51d66932d97da1719ab4b1eba8dc0a833652623740c4a55d0ac912ead2a8e3086375c3c30a53b5ffd921719f731ed604de2c8fe42edb245b9471 WHIRLPOOL f05ed8c994a3c3df58d58ff218ac714b21b48af4463120370c63071909c95f2ef43e5569a7e69f18a9a90e724f7f1bb2ebb32ee0a323b63e5d10e4ab95a22e45 -DIST linux_4.4.6-1.debian.tar.xz 3082148 SHA256 07e736f656e5cb35bfc17ea9d246d4801e77e2673b55802fc60932b1000b644f SHA512 e776de33d7a69857b2b61563e8231e9db94e00b147186d458356fbfb6d431eafbe0762cab247ba049ace1b6762f79e9ffd65fb4d78405ba612cf93f35205b8dd WHIRLPOOL 75c0ed1b683831e2e6045375359731e4dff73aa8663035e855cb173c5babf9bf9dfbbac37225ac75a45a3e7de15c1b63f64c570a02bcc1cf9e53003558182667 -DIST linux_4.4.6.orig.tar.xz 88520888 SHA256 2ee44a292f0dcda9c22a27a1414545360cb45964fc0751e2541824d3c5342b45 SHA512 f5197594b9417ceea5f8f7a8feac547500030edc392afc5b9b94a299f3e3ad0501ed563ef82c83539197bc5269781ccc917a1a79d28b1664cd9712b21c615d94 WHIRLPOOL 0e38957ebf97adb91a7b68549cc90a54923da246ca5dee66e8c3af5a2ffdce7328ea8a4d7d0ee7fed115780b29562a4db8dfca11ca9d604018af42d5aa21d3b9 DIST linux_4.5.2-1.debian.tar.xz 571628 SHA256 dd5aac0ccc982524f24f716dee0d51bde8aca9b28ac65397d66f8c23b822748f SHA512 efd4ffa05328ce7e8a1126cd9a54c874c453a02d393d9c8c05e9f54af4d7058f45514890d814c1faa26b6af61f5f6d12b017b38f6cf0bb72b3f49dcc8de9e705 WHIRLPOOL 638dae6b4fc28a802f9e4568c6ff97b4481103ea02e7d16a711e2add8c3d735bc1ec1692f79410e003b0b1acf6414eb81b3d2d07159c32a8778f4abe4883294b DIST linux_4.5.2.orig.tar.xz 89618872 SHA256 a8db6181ec1f54b84582a71e2a4f95cf20842602cf19e0874f8dd5c7535528ed SHA512 3d91b1a7605dd9d1520569e30e924dc5b2600dacde35c34c4ff64e37f9d3453eff6a7b64c8407ec125383c7b20421e8445937d399109f65b754660ce1914c461 WHIRLPOOL 12b11ad71d8c01b2614651eb362b1e9e13c226ea9a7772ef5214bbcc5cd4d7d883b7301cb5fdf0e2a5ced3b2583f7a49f82995c67dc57e330c3f3cf4ea976ecf DIST linux_4.7.8-1~bpo8+1.debian.tar.xz 2666180 SHA256 4d36972bb6d9f4a484352a7155123cc5d0621b2953c6ebba3117eeeaf174daef SHA512 831348b28847e89ca25e18a86f5cbbb49bdb1c03da82fb719a8032d662ea7cadda03cf980167c4281481925e649f16ebb706a5a44f55183e872bca8451cbb6b9 WHIRLPOOL af2e8ac46127376be5ce92f20ea3944cf45828be853b32818a6a4e344b13263e00dc389fa90af71b89108b2ae6a102d480cb2c2611b403e80872629c230a6285 DIST linux_4.7.8.orig.tar.xz 91653948 SHA256 acfd237c35826a3f34609a208bb438c72310032fb49f725a7694bb3bd62106d0 SHA512 a8b5baa9f9fa0900ccd3bc85c650defe78bca4a3547aee469c6ff647272df0a9dd8b0240c7405d362598cb1705ce3195fb57c3c3f87b95b35731ee11712970ac WHIRLPOOL d57d0f7d26439ef30cb6e2f87899c59fcdcfaf46ad9adea5d1bc737f78f64f909c684cc1bc468c4cf657118e38821ebbd715a1aba1575379a2d205aa0460f397 DIST linux_4.8.15-1.debian.tar.xz 2847036 SHA256 4bf152429c854126e30e759ae6bab68bb113e2f043c0d731ec9ca2f5661cd48c SHA512 303f6d6e79eba4b043612b871b5f9089f912f6f791a3ee2014c79d74a645ccabf78d5b488fe8bf3cdec8868c6568f725b6be5b5661f0a0fb9d36733342e9852d WHIRLPOOL 3f87a15d0e4cd4517ea919828ac60f7796e71e3f964c7a96824e0905f13549b45fc3ba926d5ee30795bfda86edf146b8b45b389e84c92bf3ed7e7d15329f6be6 DIST linux_4.8.15.orig.tar.xz 93288968 SHA256 59589f55a4f06f53de998eefa0e62df984db517b0e695d864b2bbb3fd5355a92 SHA512 0021be7c4be0c12da8c6726d85631ce33724d8ba8694f60cff62aa237b423c8e7255d4913480f9efd300c17b5f69b7869b03f09b84478e95ca8530f07eb02e74 WHIRLPOOL 4b3fe9c056eb2e9883af0b78e24d151fb04381fb8b52cf9eb98e640f0874b831b589b7a8fd7e390e6e027328a1317e04f52eead8b5962d367b014af580efd22a -DIST linux_4.8.7-1.debian.tar.xz 3038132 SHA256 a687274b79349826d2df451880d76bae3437d369fdcdd08846b115af5dfc0492 SHA512 cb2efd72702a099bbafeb62efe5f07ae5fcb24c483d853f83b72cf089271a8c7f173197cfcaed1f6a57d5ea6312d6969263632a2ef268a4eaeb45a5c7126e60e WHIRLPOOL e719996861194f6b3533944705db6158b5065ca51fb29f5818943ebdef93baa7be8426d2e3430d2db43b61d2d573eaaa78514bab762f6350c097b9190ee423cc -DIST linux_4.8.7.orig.tar.xz 93286108 SHA256 56213787416d505cad27be7269603f58b1bb23bd8edaca766783cc9095d70dda SHA512 1d2b9c9d44eb7b2789a7e2fad7385d66a79a2fdb4516fb57fd9a3cb9e03689b99e7aa101cac3fe674461862924d983ace42f4fbf280645c134b01d2914134e6e WHIRLPOOL 2ac4e27510f7faa91c548364e765b61ba738ee9d58ad711779a0b7110328557816637c19f00e4e92cc9c437837b44c6a8538a3277cd347ad1766e3de142f7447 +DIST linux_4.9.2-2.debian.tar.xz 807096 SHA256 d22d1e837c7d955afad7ee2f5c8b489c7f21d27466f3b00fad7e61026a60b65d SHA512 d01b62e34a5583948b9fb8677fa9fe8651da58d0d00585d27275a54c93ebb5f2fc28fb7fd0fe1e2b6fe1c452878669b15054e186ed9770ed89375e801711f027 WHIRLPOOL db98abd3761a1271b11890d28d95181a95526b8899cdae59662492d55f5b03825694333a60ae63a3c34cba366d260e0d65ca81c96acaa2500c758069f79528fb +DIST linux_4.9.2.orig.tar.xz 94423460 SHA256 5892fc7692d7e0ac971aa39f4d42ddc8c4275d76a60d056c49d3e8ba6eb16088 SHA512 95f1993edfdba90b4edce2fc7c67cc5f0fbe55e12f80031b584c2b2629e4a58885967b670c4c524a1b727b15d8f737020431f6fba1de8fbf794512b3012db8ed WHIRLPOOL b87972cfc19ac64c9a2f1d22eaa7c188c1d373d68b71656c504636701b19c86aedd565b7e42900b0426fddcf5353e44373f0923df74dfa34fca5a8d5e8af40ce diff --git a/sys-kernel/debian-sources/debian-sources-3.19.3.ebuild b/sys-kernel/debian-sources/debian-sources-3.19.3.ebuild deleted file mode 100644 index 88d1717e0..000000000 --- a/sys-kernel/debian-sources/debian-sources-3.19.3.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit check-reqs eutils mount-boot - -SLOT=$PVR -CKV=3.19.3 -KV_FULL=${PN}-${PVR} -EXTRAVERSION=-1~exp1 -MODVER=${CKV}${EXTRAVERSION} -KERNEL_ARCHIVE="linux_${PV}.orig.tar.xz" -PATCH_ARCHIVE="linux_${PV}${EXTRAVERSION}.debian.tar.xz" -RESTRICT="binchecks strip mirror" -# based on : http://packages.ubuntu.com/maverick/linux-image-2.6.35-22-server -LICENSE="GPL-2" -KEYWORDS="*" -IUSE="binary rt" -DEPEND="binary? ( >=sys-kernel/genkernel-3.4.40.7 )" -DESCRIPTION="Debian Sources (and optional binary kernel)" -HOMEPAGE="http://www.debian.org" -SRC_URI="mirror://funtoo/${KERNEL_ARCHIVE} mirror://funtoo/${PATCH_ARCHIVE}" -S="$WORKDIR/linux-${CKV}" - -get_patch_list() { - [[ -z "${1}" ]] && die "No patch series file specified" - local patch_series="${1}" - while read line ; do - if [[ "${line:0:1}" != "#" ]] ; then - echo "${line}" - fi - done < "${patch_series}" -} - -pkg_pretend() { - # Ensure we have enough disk space to compile - if use binary ; then - CHECKREQS_DISK_BUILD="14G" - - check-reqs_pkg_setup - fi -} - -pkg_setup() { - export REAL_ARCH="$ARCH" - unset ARCH; unset LDFLAGS #will interfere with Makefile if set -} - -src_prepare() { - - cd "${S}" - for debpatch in $( get_patch_list "${WORKDIR}/debian/patches/series" ); do - epatch -p1 "${WORKDIR}/debian/patches/${debpatch}" - done - - if use rt ; then - for rtpatch in $( get_patch_list "${WORKDIR}/debian/patches/series-rt" ) ; do - epatch -p1 "${WORKDIR}/debian/patches/${rtpatch}" - done - fi - - # end of debian-specific stuff... - - sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" Makefile || die - sed -i -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' Makefile || die - rm -f .config >/dev/null - cp -a "${WORKDIR}"/debian "${T}" - make -s mrproper || die "make mrproper failed" - #make -s include/linux/version.h || die "make include/linux/version.h failed" - cd "${S}" - cp -aR "${WORKDIR}"/debian "${S}"/debian - - ## XFS LIBCRC kernel config fixes, FL-823 - epatch "${FILESDIR}"/debian-sources-3.14.4-xfs-libcrc32c-fix.patch - - local opts - use rt && opts="rt" || opts="standard" - local myarch="amd64" - [ "$REAL_ARCH" = "x86" ] && myarch="i386" && opts="$opts 686-pae" - cp "${FILESDIR}"/config-extract . || die - chmod +x config-extract || die - ./config-extract ${myarch} ${opts} || die - cp .config "${T}"/config || die - make -s mrproper || die "make mrproper failed" - #make -s include/linux/version.h || die "make include/linux/version.h failed" -} - -src_compile() { - ! use binary && return - install -d "${WORKDIR}"/out/{lib,boot} - install -d "${T}"/{cache,twork} - install -d "${WORKDIR}"/build "${WORKDIR}"/out/lib/firmware - genkernel \ - --no-save-config \ - --kernel-config="${T}"/config \ - --kernname="${PN}" \ - --build-src="${S}" \ - --build-dst="${WORKDIR}"/build \ - --makeopts="${MAKEOPTS}" \ - --firmware-dst="${WORKDIR}"/out/lib/firmware \ - --cachedir="${T}"/cache \ - --tempdir="${T}"/twork \ - --logfile="${WORKDIR}"/genkernel.log \ - --bootdir="${WORKDIR}"/out/boot \ - --lvm \ - --luks \ - --mdadm \ - --iscsi \ - --module-prefix="${WORKDIR}"/out \ - all || die "genkernel failed" -} - -src_install() { - # copy sources into place: - dodir /usr/src - cp -a "${S}" "${D}"/usr/src/linux-${P} || die - cd "${D}"/usr/src/linux-${P} - # prepare for real-world use and 3rd-party module building: - make mrproper || die - cp "${T}"/config .config || die - cp -a "${T}"/debian debian || die - yes "" | make oldconfig || die - # if we didn't use genkernel, we're done. The kernel source tree is left in - # an unconfigured state - you can't compile 3rd-party modules against it yet. - use binary || return - make prepare || die - make scripts || die - # OK, now the source tree is configured to allow 3rd-party modules to be - # built against it, since we want that to work since we have a binary kernel - # built. - cp -a "${WORKDIR}"/out/* "${D}"/ || die "couldn't copy output files into place" - # module symlink fixup: - rm -f "${D}"/lib/modules/*/source || die - rm -f "${D}"/lib/modules/*/build || die - cd "${D}"/lib/modules - # module strip: - find -iname *.ko -exec strip --strip-debug {} \; - # back to the symlink fixup: - local moddir="$(ls -d [23]*)" - ln -s /usr/src/linux-${P} "${D}"/lib/modules/${moddir}/source || die - ln -s /usr/src/linux-${P} "${D}"/lib/modules/${moddir}/build || die - - # Fixes FL-14 - cp "${WORKDIR}/build/System.map" "${D}/usr/src/linux-${P}/" || die - cp "${WORKDIR}/build/Module.symvers" "${D}/usr/src/linux-${P}/" || die - -} - -pkg_postinst() { - if use binary && [[ -h "${ROOT}"usr/src/linux ]]; then - rm "${ROOT}"usr/src/linux - fi - - if use binary && [[ ! -e "${ROOT}"usr/src/linux ]]; then - ewarn "With binary use flag enabled /usr/src/linux" - ewarn "symlink automatically set to debian kernel" - ln -sf linux-${P} "${ROOT}"usr/src/linux - fi - - if [ -e ${ROOT}lib/modules ]; then - depmod -a $MODVER - fi -} diff --git a/sys-kernel/debian-sources/debian-sources-4.4.6.ebuild b/sys-kernel/debian-sources/debian-sources-4.4.6.ebuild deleted file mode 100644 index e2cda1166..000000000 --- a/sys-kernel/debian-sources/debian-sources-4.4.6.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit check-reqs eutils mount-boot - -SLOT=$PVR -CKV=4.4.6 -KV_FULL=${PN}-${PVR} -EXTRAVERSION=-1 -MODVER=${CKV}${EXTRAVERSION} -KERNEL_ARCHIVE="linux_${PV}.orig.tar.xz" -PATCH_ARCHIVE="linux_${PV}${EXTRAVERSION}.debian.tar.xz" -RESTRICT="binchecks strip mirror" -# based on : http://packages.ubuntu.com/maverick/linux-image-2.6.35-22-server -LICENSE="GPL-2" -KEYWORDS="*" -IUSE="binary" -DEPEND="binary? ( >=sys-kernel/genkernel-3.4.40.7 )" -DESCRIPTION="Debian Sources (and optional binary kernel)" -HOMEPAGE="http://www.debian.org" -SRC_URI="mirror://funtoo/${KERNEL_ARCHIVE} mirror://funtoo/${PATCH_ARCHIVE}" -S="$WORKDIR/linux-${CKV}" - -get_patch_list() { - [[ -z "${1}" ]] && die "No patch series file specified" - local patch_series="${1}" - while read line ; do - if [[ "${line:0:1}" != "#" ]] ; then - echo "${line}" - fi - done < "${patch_series}" -} - -pkg_pretend() { - # Ensure we have enough disk space to compile - if use binary ; then - CHECKREQS_DISK_BUILD="14G" - - check-reqs_pkg_setup - fi -} - -pkg_setup() { - export REAL_ARCH="$ARCH" - unset ARCH; unset LDFLAGS #will interfere with Makefile if set -} - -src_prepare() { - - cd "${S}" - for debpatch in $( get_patch_list "${WORKDIR}/debian/patches/series" ); do - epatch -p1 "${WORKDIR}/debian/patches/${debpatch}" - done - # end of debian-specific stuff... - - sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" Makefile || die - sed -i -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' Makefile || die - rm -f .config >/dev/null - cp -a "${WORKDIR}"/debian "${T}" - make -s mrproper || die "make mrproper failed" - #make -s include/linux/version.h || die "make include/linux/version.h failed" - cd "${S}" - cp -aR "${WORKDIR}"/debian "${S}"/debian - - ## XFS LIBCRC kernel config fixes, FL-823 - epatch "${FILESDIR}"/debian-sources-3.14.4-xfs-libcrc32c-fix.patch - - local opts - opts="standard" - local myarch="amd64" - [ "$REAL_ARCH" = "x86" ] && myarch="i386" && opts="$opts 686-pae" - cp "${FILESDIR}"/config-extract . || die - chmod +x config-extract || die - ./config-extract ${myarch} ${opts} || die - cp .config "${T}"/config || die - make -s mrproper || die "make mrproper failed" - #make -s include/linux/version.h || die "make include/linux/version.h failed" -} - -src_compile() { - ! use binary && return - install -d "${WORKDIR}"/out/{lib,boot} - install -d "${T}"/{cache,twork} - install -d "${WORKDIR}"/build - DEFAULT_KERNEL_SOURCE="${S}" CMD_KERNEL_DIR="${S}" genkernel ${GKARGS} \ - --no-save-config \ - --kernel-config="${T}"/config \ - --kernname="${PN}" \ - --build-src="${S}" \ - --build-dst="${WORKDIR}"/build \ - --makeopts="${MAKEOPTS}" \ - --cachedir="${T}"/cache \ - --tempdir="${T}"/twork \ - --logfile="${WORKDIR}"/genkernel.log \ - --bootdir="${WORKDIR}"/out/boot \ - --lvm \ - --luks \ - --mdadm \ - --iscsi \ - --module-prefix="${WORKDIR}"/out \ - all || die "genkernel failed" -} - -src_install() { - # copy sources into place: - dodir /usr/src - cp -a "${S}" "${D}"/usr/src/linux-${P} || die - cd "${D}"/usr/src/linux-${P} - # prepare for real-world use and 3rd-party module building: - make mrproper || die - cp "${T}"/config .config || die - cp -a "${T}"/debian debian || die - yes "" | make oldconfig || die - # if we didn't use genkernel, we're done. The kernel source tree is left in - # an unconfigured state - you can't compile 3rd-party modules against it yet. - use binary || return - make prepare || die - make scripts || die - # OK, now the source tree is configured to allow 3rd-party modules to be - # built against it, since we want that to work since we have a binary kernel - # built. - cp -a "${WORKDIR}"/out/* "${D}"/ || die "couldn't copy output files into place" - # module symlink fixup: - rm -f "${D}"/lib/modules/*/source || die - rm -f "${D}"/lib/modules/*/build || die - cd "${D}"/lib/modules - # module strip: - find -iname *.ko -exec strip --strip-debug {} \; - # back to the symlink fixup: - local moddir="$(ls -d [234]*)" - ln -s /usr/src/linux-${P} "${D}"/lib/modules/${moddir}/source || die - ln -s /usr/src/linux-${P} "${D}"/lib/modules/${moddir}/build || die - - # Fixes FL-14 - cp "${WORKDIR}/build/System.map" "${D}/usr/src/linux-${P}/" || die - cp "${WORKDIR}/build/Module.symvers" "${D}/usr/src/linux-${P}/" || die - -} - -pkg_postinst() { - if use binary && [[ -h "${ROOT}"usr/src/linux ]]; then - rm "${ROOT}"usr/src/linux - fi - - if use binary && [[ ! -e "${ROOT}"usr/src/linux ]]; then - ewarn "With binary use flag enabled /usr/src/linux" - ewarn "symlink automatically set to debian kernel" - ln -sf linux-${P} "${ROOT}"usr/src/linux - fi - - if [ -e ${ROOT}lib/modules ]; then - depmod -a $MODVER - fi -} diff --git a/sys-kernel/debian-sources/debian-sources-4.8.7.ebuild b/sys-kernel/debian-sources/debian-sources-4.9.2.ebuild similarity index 99% rename from sys-kernel/debian-sources/debian-sources-4.8.7.ebuild rename to sys-kernel/debian-sources/debian-sources-4.9.2.ebuild index c703c9134..8ec7432e4 100644 --- a/sys-kernel/debian-sources/debian-sources-4.8.7.ebuild +++ b/sys-kernel/debian-sources/debian-sources-4.9.2.ebuild @@ -5,9 +5,9 @@ EAPI=5 inherit check-reqs eutils mount-boot SLOT=$PVR -CKV=4.8.7 +CKV=4.9.2 KV_FULL=${PN}-${PVR} -EXTRAVERSION=-1 +EXTRAVERSION=-2 MODVER=${CKV}${EXTRAVERSION} KERNEL_ARCHIVE="linux_${PV}.orig.tar.xz" PATCH_ARCHIVE="linux_${PV}${EXTRAVERSION}.debian.tar.xz"