Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-05-05 02:50:26 +02:00
Code Issues Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
blshkv 2018-05-10 12:44:45 +08:00
commit 605bf76a92
No known key found for this signature in database
GPG key ID: 273E3E90D1A6294F
13 changed files with 125 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net-wireless/rtl8812au_aircrack-ng/rtl8812au_aircrack-ng-5.1.5_p20180506.ebuild
View file

@ -33,7 +33,7 @@ pkg_setup() {
src_compile() {
set_arch_to_kernel
emake clean
emake
emake RTL8814=1
KVER="${KV_FULL}" emake clean
KVER="${KV_FULL}" emake
KVER="${KV_FULL}" emake RTL8814=1
}

1
net-wireless/rtl8812au_aircrack-ng/rtl8812au_aircrack-ng-9999.ebuild
View file

@ -1 +0,0 @@
rtl8812au_aircrack-ng-5.1.5_p20180506.ebuild

39
net-wireless/rtl8812au_aircrack-ng/rtl8812au_aircrack-ng-9999.ebuild Normal file
View file

@ -0,0 +1,39 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit linux-mod git-r3
DESCRIPTION="RTL8812AU/21AU and RTL8814AU driver with monitor mode and frame injection"
HOMEPAGE="https://github.com/aircrack-ng/rtl8812au"
EGIT_REPO_URI="https://github.com/aircrack-ng/rtl8812au.git"
EGIT_BRANCH="v5.1.5"
if [[ ${PV} == "9999" ]] ; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~x86"
EGIT_COMMIT="af8fa990a6548159980e6656bfdc57e5a9c83c41"
fi
LICENSE="GPL-2"
SLOT="0"
IUSE=""
DEPEND="!!net-wireless/rtl8812au_astsam"
MODULE_NAMES="8812au(net/wireless:) 8814au(net/wireless:)"
#compile against selected (not running) target
pkg_setup() {
linux-mod_pkg_setup
BUILD_PARAMS="KVER=${KV_FULL}"
}
src_compile() {
set_arch_to_kernel
KVER="${KV_FULL}" emake clean
KVER="${KV_FULL}" emake
KVER="${KV_FULL}" emake RTL8814=1
}

48
pentoo/pentoo-livecd/files/binary-driver-handler.initd-2018.0 → pentoo/pentoo-livecd/files/binary-driver-handler.initd-2018.1
View file

@ -102,7 +102,7 @@ start() {
else
#first we detect if the nvidia binary driver can actually support the hardware
NV_TARBALL="$(FETCHCOMMAND="false" RESUMECOMMAND="false" emerge --color=n -f nvidia-drivers --nodeps 2> /dev/zero | \
grep "SHA256 SHA512 WHIRLPOOL size ;-) ..." | awk '{print $2}')"
grep "BLAKE2B SHA512 size ;-) ..." | awk '{print $2}')"
if [ -n "${NV_TARBALL}" ]; then
cd $(mktemp -d -t nvidia-detectXXXX)
@ -222,7 +222,7 @@ start() {
fi
ATI_TARBALL="$(FETCHCOMMAND="false" RESUMECOMMAND="false" emerge --color=n -f ati-drivers --nodeps 2> /dev/zero | \
grep "SHA256 SHA512 WHIRLPOOL size ;-) ..." | awk '{print $2}' | head -n1)"
grep "BLAKE2B SHA512 size ;-) ..." | awk '{print $2}' | head -n1)"
if [ -n "${ATI_TARBALL}" ]; then
cd $(mktemp -d -t ati-detectXXXX)
@ -257,6 +257,30 @@ start() {
fi
}
handle_broadcom() {
if [ "${NOBINDRIVERS}" = 1 ]; then
einfo "Broadcom wifi devices detected but nobindrivers on command line prevents installing firmware automatically."
return
fi
BROADCOM_READY=""
for mod in ${BROADCOM_DETECTED}; do
einfo "Detected: ${mod} hardware, please stand by..."
TEST_FILE=""
TEST_FILE="$(FETCHCOMMAND="false" RESUMECOMMAND="false" emerge --color=n -f ${mod} --nodeps 2> /dev/zero | \
grep "BLAKE2B SHA512 size ;-) ..." | awk '{print $2}' | head -n1)"
if [ -n "${TEST_FILE}" ]; then
BROADCOM_READY="${BROADCOM_READY} ${mod}"
else
eerror "Missing distfile for ${mod}-firmware"
fi
done
if eval ${run_merge} --nodeps ${BROADCOM_READY}; then
return 0
else
return 1
fi
}
#parse kernel commandline to see what we are doing
if grep -q nobindrivers /proc/cmdline; then
NOBINDRIVERS=1
@ -271,6 +295,25 @@ start() {
run_merge="emerge"
fi
ebegin "Setting up broadcom firmware if needed..."
BROADCOM_DETECTED=""
for mod in b43 b43legacy; do
if grep -Eq "^${mod} " /proc/modules; then
if [ ! -d /lib/firmware/${mod} ]; then
BROADCOM_DETECTED="${BROADCOM_DETECTED} ${mod}"
else
einfo "${mod}-firmware appears to already be installed, skipping"
fi
fi
done
if [ -n "${BROADCOM_DETECTED}" ]; then
if handle_broadcom; then
eend 0
else
eend "Something went wrong"
fi
fi
ebegin "Setting up GPU drivers requested by user, this may take a few minutes"
#check for nvidia GPU
@ -283,7 +326,6 @@ start() {
handle_amd
else
[ "$(eselect opengl show)" != "xorg-x11" ] && eselect opengl set xorg-x11
eend 0
fi
eend 0

2
pentoo/pentoo-livecd/pentoo-livecd-2018.1.ebuild → pentoo/pentoo-livecd/pentoo-livecd-2018.1-r1.ebuild
View file

@ -36,7 +36,7 @@ src_install() {
newsbin "${FILESDIR}"/makemo-2018.0-r1 makemo
newsbin "${FILESDIR}"/livecd-setpass-r1 livecd-setpass
newinitd "${FILESDIR}"/binary-driver-handler.initd-2018.0 binary-driver-handler
newinitd "${FILESDIR}"/binary-driver-handler.initd-2018.1 binary-driver-handler
exeinto /root/Desktop
doexe "${FILESDIR}"/networkmanager.desktop

4
pentoo/pentoo-system/pentoo-system-2018.1-r1.ebuild → pentoo/pentoo-system/pentoo-system-2018.1-r3.ebuild
View file

@ -13,7 +13,7 @@ LICENSE="GPL-3"
SRC_URI="http://dev.pentoo.ch/~zero/distfiles/pentoo-grubtheme.tar.xz"
IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_virtualbox video_cards_vmware"
IUSE="+2fa bindist enlightenment kde livecd livecd-stage1 pax_kernel qemu vendor_drivers_rtl8812au windows-compat +X +xfce ${IUSE_VIDEO_CARDS}"
IUSE="+2fa bindist enlightenment kde livecd livecd-stage1 pax_kernel qemu windows-compat +X +xfce ${IUSE_VIDEO_CARDS}"
S="${WORKDIR}"
@ -45,7 +45,6 @@ PDEPEND="${PDEPEND}
sys-apps/pcmciautils
!arm? ( !livecd-stage1? ( || ( sys-kernel/genkernel sys-kernel/genkernel-next )
|| ( sys-boot/grub:2 sys-boot/grub:0 sys-boot/grub-static sys-boot/systemd-boot )
vendor_drivers_rtl8812au? ( net-wireless/rtl8812au_aircrack-ng )
)
sys-boot/os-prober
sys-boot/syslinux
@ -59,7 +58,6 @@ PDEPEND="${PDEPEND}
!arm? ( app-portage/cpuid2cpuflags )
app-portage/gentoolkit
app-portage/eix
app-portage/porthole
windows-compat? ( app-emulation/wine-vanilla )
dev-python/ipython
pax_kernel? ( sys-apps/elfix )

12
pentoo/pentoo-wireless/pentoo-wireless-2017.3.ebuild → pentoo/pentoo-wireless/pentoo-wireless-2018.1-r1.ebuild
View file

@ -11,7 +11,7 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE_VIDEO_CARDS="video_cards_fglrx video_cards_nvidia"
IUSE="+b43 cuda gps drivers livecd-stage1 minipentoo opencl +wpe ${IUSE_VIDEO_CARDS}"
IUSE="cuda gps +drivers livecd-stage1 minipentoo opencl +wpe ${IUSE_VIDEO_CARDS}"
PDEPEND="
|| ( net-wireless/hostapd[wpe] net-wireless/hostapd[karma_cli] )
@ -26,11 +26,7 @@ PDEPEND="
!minipentoo? (
!livecd-stage1? (
drivers? (
|| ( net-wireless/compat-wireless
net-wireless/compat-wireless-builder
sys-kernel/compat-drivers )
b43? ( net-wireless/b43-openfwwf
net-wireless/broadcom-firmware-downloader )
livecd? ( net-wireless/b43-fwcutter )
net-wireless/orinoco-fwutils
net-wireless/rtl8812au_aircrack-ng
)
@ -46,7 +42,3 @@ PDEPEND="
net-wireless/n4p
)
"
pkg_postinst() {
use !drivers && ewarn "Disabling drivers for pentoo-wireless may make injection impossible and may provide support for fewer wifi cards with more bugs"
}

3
profiles/pentoo/arch/x86/package.accept_keywords
View file

@ -1,3 +1,6 @@
#seems the normal dev-lang/rust won't build
dev-lang/rust-bin
dev-ruby/thor amd64
dev-ruby/crass amd64
dev-ruby/loofah amd64

4
profiles/pentoo/arch/x86/package.mask
View file

@ -1,3 +1,7 @@
=x11-drivers/nvidia-drivers-346.22
#this doesn't build on x86 so help prefer icedtea-bin
dev-java/icedtea
#these just plain don't build on x86
=dev-lang/rust-1.23.0-r1
=dev-lang/rust-1.23.0

5
profiles/pentoo/base/make.defaults
View file

@ -1,4 +1,4 @@
# Copyright 2004-2013 Gentoo Foundation.
# Copyright 2004-2018 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@ -49,8 +49,7 @@ PORTAGE_COMPRESS="xz"
#BINPKG_COMPRESS="xz"
# Env vars to expand into USE vars
USE_EXPAND="${USE_EXPAND} COMPAT_DRIVERS_WIFI COMPAT_DRIVERS_ETHERNET COMPAT_DRIVERS_VARIOUS UNICORN_TARGETS VENDOR_DRIVERS"
VENDOR_DRIVERS="rtl8812au"
USE_EXPAND="${USE_EXPAND} COMPAT_DRIVERS_WIFI COMPAT_DRIVERS_ETHERNET COMPAT_DRIVERS_VARIOUS UNICORN_TARGETS"
#mgorny suggested this speeds up sync, in my testing it makes a rather large difference
PORTAGE_RSYNC_EXTRA_OPTS="--omit-dir-times"

6
profiles/pentoo/base/package.accept_keywords/media-libs
View file

@ -1,3 +1,7 @@
=media-libs/jasper-1.900.1-r6
~media-libs/freetype-2.7.1
#gpd pocket requires at least 1.1.5 but most of my testing was with 1.1.6
~media-libs/alsa-lib-1.1.5
#1.1.6 has different deps for python which breaks old gnuradio deps
#~media-libs/alsa-lib-1.1.6

2
profiles/pentoo/base/package.accept_keywords/www-client
View file

@ -8,7 +8,7 @@ www-plugins/google-talkplugin
=media-libs/libpng-1.6*
=dev-util/cargo-0.24*
=dev-libs/nss-3.35*
=dev-libs/nss-3.36*
=virtual/rust-1.23*
=dev-lang/rust-1.23*
~dev-libs/nspr-4.18

10
profiles/pentoo/base/package.mask
View file

@ -42,3 +42,13 @@ dev-python/pycrypto
#transition from wxGTK 2.8
dev-python/wxpython:2.8
x11-libs/wxGTK:2.8
#force update
<sys-apps/keyutils-1.5.9-r3
<sys-devel/libtool-2.4.3-r2:2
<sys-apps/attr-2.4.47-r2
<sys-fs/udev-init-scripts-27
<dev-lang/perl-5.24
<sys-devel/gcc-6.4.0
<sys-devel/binutils-2.29.1
<sys-devel/binutils-libs-2.29.1

9
profiles/pentoo/base/package.use/sys-apps
View file

@ -5,3 +5,12 @@ sys-apps/hwdata-gentoo binary-drivers
sys-apps/lm_sensors sensord
sys-apps/usermode-utilities fuse
sys-apps/util-linux static-libs
#portage really sucks with python2, significantly more stable to just remove that crap
sys-apps/portage -python_targets_python2_7
app-portage/gentoolkit -python_targets_python2_7
app-portage/porthole -python_targets_python2_7
app-portage/layman -python_targets_python2_7
app-portage/gentoopm -python_targets_python2_7
app-portage/smart-live-rebuild -python_targets_python2_7
dev-java/java-config -python_targets_python2_7