Skip to content

Commit

Permalink
net-misc/openconnect: Make CONFIG_TUN check non-fatal
Browse files Browse the repository at this point in the history
Also move the check to pkg_pretend, and remove the custom error messaging.

Package-Manager: portage-2.2.20
  • Loading branch information
floppym committed Sep 2, 2015
1 parent bcede9e commit 10af1d2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 27 deletions.
2 changes: 1 addition & 1 deletion net-misc/openconnect/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<maintainer>
<email>[email protected]</email>
<name>Matthew Schultz</name>
<description>Proxied maintainer. Assign bugs to him.</description>
<description>Proxied maintainer. Copy on bugs.</description>
</maintainer>
<use>
<flag name='gssapi'>Build GSSAPI support.</flag>
Expand Down
30 changes: 4 additions & 26 deletions net-misc/openconnect/openconnect-7.06-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,10 @@ DEPEND="${DEPEND}
java? ( >=virtual/jdk-1.6 )
nls? ( sys-devel/gettext )"

tun_tap_check() {
ebegin "Checking for TUN/TAP support"
if { ! linux_chkconfig_present TUN; }; then
eerror "Please enable TUN/TAP support in your kernel config, found at:"
eerror
eerror " Device Drivers --->"
eerror " [*] Network device support --->"
eerror " <*> Universal TUN/TAP device driver support"
eerror
eerror "and recompile your kernel ..."
die "no CONFIG_TUN support detected!"
fi
eend $?
CONFIG_CHECK="~TUN"

pkg_pretend() {
check_extra_config
}

pkg_setup() {
Expand All @@ -66,19 +57,6 @@ pkg_setup() {
if use doc; then
python-any-r1_pkg_setup
fi

if use kernel_linux; then
get_version
if linux_config_exists; then
tun_tap_check
else
ewarn "Was unable to determine your kernel .config"
ewarn "Please note that OpenConnect requires CONFIG_TUN to be set in your"
ewarn "kernel .config, Without it, it will not work correctly."
# We don't die here, so it's possible to compile this package without
# kernel sources available. Required for cross-compilation.
fi
fi
}

src_configure() {
Expand Down

0 comments on commit 10af1d2

Please sign in to comment.