diff options
6 files changed, 44 insertions, 55 deletions
diff --git a/sys-kernel/kogaion-sources/Manifest b/sys-kernel/kogaion-sources/Manifest index f624d8ee..5d99b9c3 100644 --- a/sys-kernel/kogaion-sources/Manifest +++ b/sys-kernel/kogaion-sources/Manifest @@ -1,2 +1 @@ -DIST linux-3.14.30+kogaion.tar.xz 81183748 SHA256 fa1ec3d87065345a7cf6f8d339df4e277c8c735a2ed4fc5eb2550f05a135e7f1 SHA512 50d71b4387485d778aafbe50df19888d68f1b3a37ffe4be1bcf76ff93f51a505871590ef46e8b98cbaec9911e72318fe67d4f368b7f4755887845f1695cf45d6 WHIRLPOOL ea46bfb373279998f837603e59c6eba0a4716b79b9666b03ef9fa03a31d856d2e6bb5cae24fc2959ee834e20aeca105a3c4e8b0cd3f1bad70f5c122c015e8de6 DIST linux-3.14.50+kogaion.tar.xz 81214044 SHA256 528518d57e49843c8c19360329d93cd5ba22f3d73cbbfb556f130df466ade2b6 SHA512 68ed192332c0fc72c0ab33fbcfc5f38342a757ece7b295724be4511679410960d8486dba39c64ffe6fbcd4d1272ee9ec4e1ad9f1a491d3f0eaffa66368c25f49 WHIRLPOOL 34111a4cdb557b153d747a274cb8a1488985616e3da7b75e66cdb62dff81afb72179610a4bbfe0b96d495bc1e1c69b204215d63e0da6c6b3bc870c5be80de9c7 diff --git a/sys-kernel/kogaion-sources/files/kogaion-sources-disable-xhci-enable-user-ns.patch b/sys-kernel/kogaion-sources/files/kogaion-sources-disable-xhci-enable-user-ns.patch new file mode 100644 index 00000000..3a6da450 --- /dev/null +++ b/sys-kernel/kogaion-sources/files/kogaion-sources-disable-xhci-enable-user-ns.patch @@ -0,0 +1,40 @@ +--- kogaion/config/kogaion-3.14-x86.config.old 2016-03-12 12:43:00.600373413 +0000 ++++ kogaion/config/kogaion-3.14-x86.config 2016-03-12 12:46:45.345318549 +0000 +@@ -147,7 +147,7 @@ + CONFIG_NAMESPACES=y + CONFIG_UTS_NS=y + CONFIG_IPC_NS=y +-# CONFIG_USER_NS is not set ++CONFIG_USER_NS=y + CONFIG_PID_NS=y + CONFIG_NET_NS=y + CONFIG_MM_OWNER=y +@@ -4931,7 +4931,7 @@ + # USB Host Controller Drivers + # + CONFIG_USB_C67X00_HCD=m +-CONFIG_USB_XHCI_HCD=m ++# CONFIG_USB_XHCI_HCD is not set + CONFIG_USB_EHCI_HCD=m + CONFIG_USB_EHCI_ROOT_HUB_TT=y + CONFIG_USB_EHCI_TT_NEWSCHED=y +--- kogaion/config/kogaion-3.14-amd64.config.old 2016-03-12 12:42:53.359216610 +0000 ++++ kogaion/config/kogaion-3.14-amd64.config 2016-03-12 12:46:01.745348709 +0000 +@@ -150,7 +150,7 @@ + CONFIG_NAMESPACES=y + CONFIG_UTS_NS=y + CONFIG_IPC_NS=y +-# CONFIG_USER_NS is not set ++CONFIG_USER_NS=y + CONFIG_PID_NS=y + CONFIG_NET_NS=y + CONFIG_MM_OWNER=y +@@ -4734,7 +4734,7 @@ + # USB Host Controller Drivers + # + CONFIG_USB_C67X00_HCD=m +-CONFIG_USB_XHCI_HCD=m ++# CONFIG_USB_XHCI_HCD is not set + CONFIG_USB_EHCI_HCD=m + CONFIG_USB_EHCI_ROOT_HUB_TT=y + CONFIG_USB_EHCI_TT_NEWSCHED=y diff --git a/sys-kernel/kogaion-sources/kogaion-sources-3.14.30.ebuild b/sys-kernel/kogaion-sources/kogaion-sources-3.14.30.ebuild deleted file mode 100644 index 69db2638..00000000 --- a/sys-kernel/kogaion-sources/kogaion-sources-3.14.30.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2004-2013 Sabayon Linux -# Copyright 2004-2014 Kogaion, Argent and ArgOS Linux -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -K_ROGKERNEL_NAME="kogaion" -K_ROGKERNEL_URI_CONFIG="yes" -K_ROGKERNEL_SELF_TARBALL_NAME="kogaion" -K_ONLY_SOURCES="1" -K_ROGKERNEL_FORCE_SUBLEVEL="0" -K_KERNEL_NEW_VERSIONING="1" - -inherit kogaion-kernel - -KEYWORDS="~amd64 ~arm ~x86" -DESCRIPTION="Official Kogaion Linux Standard kernel sources" -RESTRICT="mirror" -IUSE="sources_standalone" - -DEPEND="${DEPEND} - sources_standalone? ( !=sys-kernel/linux-kogaion-${PVR} ) - !sources_standalone? ( =sys-kernel/linux-kogaion-${PVR} )" diff --git a/sys-kernel/kogaion-sources/kogaion-sources-3.14.50.ebuild b/sys-kernel/kogaion-sources/kogaion-sources-3.14.50.ebuild index 0cfa4cc8..eaaa2d91 100644 --- a/sys-kernel/kogaion-sources/kogaion-sources-3.14.50.ebuild +++ b/sys-kernel/kogaion-sources/kogaion-sources-3.14.50.ebuild @@ -23,3 +23,7 @@ IUSE="sources_standalone" DEPEND="${DEPEND} sources_standalone? ( !=sys-kernel/linux-kogaion-${PVR} ) !sources_standalone? ( =sys-kernel/linux-kogaion-${PVR} )" + +src_prepare() { + epatch "${FILESDIR}/${PN}-disable-xhci-enable-user-ns.patch" +} diff --git a/sys-kernel/linux-kogaion/Manifest b/sys-kernel/linux-kogaion/Manifest index f624d8ee..5d99b9c3 100644 --- a/sys-kernel/linux-kogaion/Manifest +++ b/sys-kernel/linux-kogaion/Manifest @@ -1,2 +1 @@ -DIST linux-3.14.30+kogaion.tar.xz 81183748 SHA256 fa1ec3d87065345a7cf6f8d339df4e277c8c735a2ed4fc5eb2550f05a135e7f1 SHA512 50d71b4387485d778aafbe50df19888d68f1b3a37ffe4be1bcf76ff93f51a505871590ef46e8b98cbaec9911e72318fe67d4f368b7f4755887845f1695cf45d6 WHIRLPOOL ea46bfb373279998f837603e59c6eba0a4716b79b9666b03ef9fa03a31d856d2e6bb5cae24fc2959ee834e20aeca105a3c4e8b0cd3f1bad70f5c122c015e8de6 DIST linux-3.14.50+kogaion.tar.xz 81214044 SHA256 528518d57e49843c8c19360329d93cd5ba22f3d73cbbfb556f130df466ade2b6 SHA512 68ed192332c0fc72c0ab33fbcfc5f38342a757ece7b295724be4511679410960d8486dba39c64ffe6fbcd4d1272ee9ec4e1ad9f1a491d3f0eaffa66368c25f49 WHIRLPOOL 34111a4cdb557b153d747a274cb8a1488985616e3da7b75e66cdb62dff81afb72179610a4bbfe0b96d495bc1e1c69b204215d63e0da6c6b3bc870c5be80de9c7 diff --git a/sys-kernel/linux-kogaion/linux-kogaion-3.14.30.ebuild b/sys-kernel/linux-kogaion/linux-kogaion-3.14.30.ebuild deleted file mode 100644 index 1bb991d6..00000000 --- a/sys-kernel/linux-kogaion/linux-kogaion-3.14.30.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2004-2013 Sabayon Linux -# Copyright 2015 Kogaion -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit versionator - -K_ROGKERNEL_SELF_TARBALL_NAME="kogaion" -K_REQUIRED_LINUX_FIRMWARE_VER="20140902" -K_ROGKERNEL_FORCE_SUBLEVEL="0" -K_ROGKERNEL_PATCH_UPSTREAM_TARBALL="0" - -_ver="$(get_version_component_range 1-2)" -if use arm; then - K_KERNEL_IMAGE_NAME="uImage dtbs" -elif [ "${_ver}" = "3.9" ]; then - K_ROGKERNEL_ZFS="1" -fi -K_KERNEL_NEW_VERSIONING="1" - -K_MKIMAGE_RAMDISK_ADDRESS="0x81000000" -K_MKIMAGE_RAMDISK_ENTRYPOINT="0x00000000" -K_MKIMAGE_KERNEL_ADDRESS="0x80008000" - -inherit kogaion-kernel - -KEYWORDS="~amd64 ~x86" -DESCRIPTION="Official Kogaion Linux Standard kernel image" -RESTRICT="mirror" |