Skip to content

Commit

Permalink
[bionic] Keep >=sys-kernel/ubuntu-sources-4.14 missing keyword masked…
Browse files Browse the repository at this point in the history
… until kernel developers can fix broken bluetooth support (ref. https://bugzilla.kernel.org/show_bug.cgi?id=197941 and https://bugzilla.kernel.org/show_bug.cgi?id=199035)
  • Loading branch information
shiznix committed May 23, 2018
1 parent 7def320 commit 54a15c6
Show file tree
Hide file tree
Showing 3 changed files with 95 additions and 4 deletions.
7 changes: 5 additions & 2 deletions sys-kernel/ubuntu-sources/Manifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
AUX omit-vbox.diff 461 BLAKE2B 861a9a510c38628700feef726be32b9cb1d8c5ea6725321b95009c77dcab1a5da31b2f11b30c8ced2739da1d3ff49200a1e14a86ead9c0c42fb1e412ee85a7fe SHA512 eef4dc0f2242e021ee21d4397d1125915506a10fd433b1917289fd9ea582ca789e746b2e446f099cdc7412fd16a3748b180dc4ee0a7631d53920d75ea830580b
DIST amd64-config.flavour.generic 171659 BLAKE2B 5788e10e3f1e594d0e4b1eae053f769f72904b9b46e6d96db0e47b9e3c9e17f9ad3972490d82135e5ffbba6a9cb1d30b3e840370f758bf6a4be403acb9034651 SHA512 768a588a3cdf68765b82d51964ea69f4e4430c8806a481618d7c3ff04b4fd96ae36903fdbaa3befd92955bcbff5991061fe680929beddd1563c0cf34c3110565
DIST i386-config.flavour.generic 193938 BLAKE2B 742acd9f21624957a282ec9127645e8ed0bc35149ce5663b8855a1c50d15ab55f465953dc9db3e81396479974b3f30bf16d788d696ecf57d2909c40a962a81aa SHA512 15b8b354e100f9db37ba199da7b1a5ec25b1b723f24e83e95ac8723d91841703ef22627d77c304026a6a1532576a3acc99034c5761f3ed51833f0f30b27e6461
DIST linux_4.15.0-20.21.diff.gz 7370272 BLAKE2B 49643ddc767d022983ab5d72b53245e6b338a203655fe4a8040f20fa049ae4d8de449e05a53e528899d2fd4e46487eee4446b75ce6cf8415669df015aefa3135 SHA512 21d4f7cd9519b663eeb0213ac1800c9e8e97ea5b27bc5bc4e7ae16f7490a279fc74fb27d08f52bebbebf822d597ba3a15f660efe321169e9614a9b02aaa1a3fa
DIST linux_4.13.0-39.44.diff.gz 7178266 BLAKE2B 753b4a26915b00d05fc5a1adf41227307764847b67b96425856c83366c0070324dc3c9577c235392c83bfc314a6c8975e71cc7e6d8d5a6b27607c8c415d75012 SHA512 a6598519d5aa8d747b5e51be319f139ddabf2d82428d42df46f4a4301a54b22cb3f2d5618c23aa2f8e0d3e14e3a81843b1c1d41af7334fab55f8ba80bba12ca3
DIST linux_4.13.0.orig.tar.gz 155489655 BLAKE2B aacb5bbb94666f4500c551602a49f0dcbcdc1ed3262f9466010f0f8293ab0820d1bd1f23a2e2969fb926f8fdfb2d2363feb5bb08d5a1803afbd09f197f03bdb8 SHA512 5d472f43028cb4d46bacbd435713e83ccc3f785c8030f2516aca63a71083cfe297a74b4d81c5b243b442d3f9db1edce2af7344bf64d3c79f0139bac3da57bdbf
DIST linux_4.15.0-22.24.diff.gz 7381687 BLAKE2B 968432730921c05fa78bfdbb7fdc037bf967634fd434a18567ca1219ff4676b69de8805319420c2a6d87ad2929c3ea2a07b5af3edd986565e08fdebb504ec102 SHA512 ea89bde365aaa9c90a3babc66e771a0a035fb6efe1ba47db6a6315b820c4f9f186e036ffe03c7a16e82dcc8a72bf34c2cdce9bb76da2cfc984bd53a824a5ac0d
DIST linux_4.15.0.orig.tar.gz 157656459 BLAKE2B ea262f9931f9a5e232cac6a9b3fa33fbbc375a57218df01dd9689621a1ce2c32c1351376dd8d70d19df16a75af42dd98594be9263e6de470da43175ba4946c68 SHA512 0fab606a295e0857f774f8adaa9d56bf2cb227fbab2daed374415da216391b156f49e606ba37ac402987c5796d408807da5d1a42c0d85a8552f109a3e279443d
EBUILD ubuntu-sources-4.15.17_p_p20_p21.ebuild 2691 BLAKE2B 605fe46541ecb6cfda75fc11af2431eec6f22e3e912453a26ee89ed243be1a9cf9cda2d5c63b35cba6fc67181078ddf6ff4d994d98870cfac93993b1ba25b47b SHA512 1f24582c59fb67ae7509d3fd778fc54c08cef0ed6e7a1f0e3c0d9f254b2fbaf5c9e0b34c80ccfbca5f4e3ca7503116d29208b1adda2216b75f406f2172b3fe10
EBUILD ubuntu-sources-4.13.16_p_p39_p44.ebuild 2700 BLAKE2B 54561ab89d684a0b6e3e4db8686df1a0d64d9a317b33711dd67ede4284cbbc007aa120b3f31c5dff5ba1e33628396479827ae13a8dd957da3480dfd802ddc20b SHA512 86c58639586bb4bae3c01750a95c5762e0584127973353e9b354ec6479aa7c241a7892232befb472e6e174e78a3c88c3eb91b044ff1f09af39f8c84cf8662cc4
EBUILD ubuntu-sources-4.15.17_p_p22_p24.ebuild 2701 BLAKE2B b4e91388401e395e6d96d5e71b52a0132f4d74bea042571cb5cf07cf7cfa58fd1920f0273f75baa624aaf9ae28b777b1a25d5435b6853e1070c0018a0373f757 SHA512 5785d09800c1dbd8fff0b226f42d3361fae9c964f1a8c0a0f3401d2bf0946562a9d9e36e86761f5df13e2b4889792c176ca2b5f6b5a9cfc194659afc0690a73a
MISC metadata.xml 393 BLAKE2B 8a3c26520070f8e3538bb60f465eb5f3a57e90f47e3522efeff38c7f48826b537f01bd2d75b549b000917b1d73336c2f1de5ddf0363e5b76f35020d53615b713 SHA512 f481fc4b124ec81d320fc3fd6047d0024bce66d4f8b2122fdd91957a75c3b24f4e7ddd8f77d2d4f60b8a8b23f5db6c19833cb140121af5b72c0147ab3f523cd3
88 changes: 88 additions & 0 deletions sys-kernel/ubuntu-sources/ubuntu-sources-4.13.16_p_p39_p44.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

EAPI=5 # kernel-2.eclass unsupported for EAPI6
ETYPE="sources"

URELEASE="artful-security"
inherit eutils mount-boot kernel-2 versionator ubuntu-versionator

MY_PN="linux"
MY_PV="${PV}"
BASE_PV="4.13.0" # ${PV} is taken from VERSION,PATCHLEVEL,SUBLEVEL in Makefile
KCONFIG_URELEASE="xenial/linux/4.4.0-123.147"
UURL="mirror://unity/pool/main/l/${MY_PN}"

DESCRIPTION="Ubuntu patched kernel sources"
HOMEPAGE="https://launchpad.net/ubuntu/+source/linux"
SRC_URI="${UURL}/${MY_PN}_${BASE_PV}.orig.tar.gz
${UURL}/${MY_PN}_${BASE_PV}-${UVER}.diff.gz
amd64? ( http://kernel.ubuntu.com/~kernel-ppa/configs/${KCONFIG_URELEASE}/amd64-config.flavour.generic )
x86? ( http://kernel.ubuntu.com/~kernel-ppa/configs/${KCONFIG_URELEASE}/i386-config.flavour.generic )"
LICENSE="GPL-2"
KEYWORDS="~x86 ~amd64"
IUSE=""
RESTRICT="binchecks mirror strip"
S="${WORKDIR}/linux-$(get_version_component_range 1-2)"

pkg_setup() {
case $ARCH in
i386)
defconfig_src=i386
;;
amd64)
defconfig_src=amd64
;;
*)
die "unsupported ARCH: $ARCH"
;;
esac
defconfig_src="${DISTDIR}/${defconfig_src}-config.flavour.generic"
unset ARCH; unset LDFLAGS # will interfere with Makefile if set
}

src_unpack() {
unpack ${A}
epatch_user
}

src_prepare() {
ubuntu-versionator_src_prepare
# Ubuntu patchset (don't use epatch so we can easily see what files get patched) #
cat "${WORKDIR}/${MY_PN}_${BASE_PV}-${UVER}.diff" | patch -p1 || die

# Fix from LP# 1630990 (header syntax error with !CONFIG_SECURITYFS) #
sed -e 's/const struct inode_operations \*iops))$/const struct inode_operations *iops)/' \
-i include/linux/security.h

# Omit building Ubuntu's VBox kernel modules, these are provided by package app-emulation/virtualbox-modules #
epatch -p1 "${FILESDIR}/omit-vbox.diff"

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

# Ubuntu #
install -d ${TEMP}/configs || die
make -s mrproper || die "make mrproper failed"

mv "${TEMP}/configs" "${S}" || die
}

src_install() {
# copy sources into place #
dodir /usr/src
cp -a "${S}" "${D}/usr/src/${PN}-${MY_PV}-${UVER}" || die
cd "${D}/usr/src/${PN}-${MY_PV}-${UVER}"

# prepare for real-world use and 3rd-party module building #
make mrproper || die
cp $defconfig_src .config || die
yes "" | make oldconfig || die
}

pkg_postinst() {
[ ! -e "${ROOT}usr/src/linux" ] && \
ln -s "${PN}-${MY_PV}-${UVER}" "${ROOT}usr/src/linux"
elog "Changelog can be found in /usr/src/linux/debian.master/changelog"
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
EAPI=5 # kernel-2.eclass unsupported for EAPI6
ETYPE="sources"

URELEASE="bionic"
URELEASE="bionic-security"
inherit eutils mount-boot kernel-2 versionator ubuntu-versionator

MY_PN="linux"
Expand All @@ -20,7 +20,7 @@ SRC_URI="${UURL}/${MY_PN}_${BASE_PV}.orig.tar.gz
amd64? ( http://kernel.ubuntu.com/~kernel-ppa/configs/${KCONFIG_URELEASE}/amd64-config.flavour.generic )
x86? ( http://kernel.ubuntu.com/~kernel-ppa/configs/${KCONFIG_URELEASE}/i386-config.flavour.generic )"
LICENSE="GPL-2"
KEYWORDS="~x86 ~amd64"
#KEYWORDS="~x86 ~amd64"
IUSE=""
RESTRICT="binchecks mirror strip"
S="${WORKDIR}/linux-$(get_version_component_range 1-2)"
Expand Down

0 comments on commit 54a15c6

Please sign in to comment.