Skip to content
This repository has been archived by the owner on Feb 26, 2020. It is now read-only.

Gentoo Linux is detected as Ubuntu Linux #86

Closed
wants to merge 2 commits into from
Closed

Gentoo Linux is detected as Ubuntu Linux #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6352774
Fix distribution detection
ryao Feb 23, 2012
b0065fd
Fix distribution detection so that Ubuntu does not identify as Debian
ryao Feb 25, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions config/spl-build.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,8 @@ AC_DEFUN([SPL_AC_DEFAULT_PACKAGE], [
VENDOR=redhat ;
elif test -f /etc/fedora-release ; then
VENDOR=fedora ;
elif test -f /etc/arch-release ; then
VENDOR=arch ;
elif test -f /etc/gentoo-release ; then
VENDOR=gentoo ;
elif test -f /etc/lsb-release ; then
VENDOR=ubuntu ;
elif test -f /etc/debian_version ; then
Expand All @@ -385,8 +385,10 @@ AC_DEFUN([SPL_AC_DEFAULT_PACKAGE], [
VENDOR=sles ;
elif test -f /etc/slackware-version ; then
VENDOR=slackware ;
elif test -f /etc/gentoo-release ; then
VENDOR=gentoo ;
elif test -f /etc/arch-release ; then
VENDOR=arch ;
elif test -f /etc/lunar.release ; then
VENDOR=lunar ;
else
VENDOR= ;
fi
Expand All @@ -395,12 +397,14 @@ AC_DEFUN([SPL_AC_DEFAULT_PACKAGE], [

AC_MSG_CHECKING([default package type])
case "$VENDOR" in
fedora) DEFAULT_PACKAGE=rpm ;;
redhat) DEFAULT_PACKAGE=rpm ;;
sles) DEFAULT_PACKAGE=rpm ;;
fedora) DEFAULT_PACKAGE=rpm ;;
ubuntu) DEFAULT_PACKAGE=deb ;;
debian) DEFAULT_PACKAGE=deb ;;
sles) DEFAULT_PACKAGE=rpm ;;
slackware) DEFAULT_PACKAGE=tgz ;;
gentoo) DEFAULT_PACKAGE=tgz ;;
lunar) DEFAULT_PACKAGE=tgz ;;
arch) DEFAULT_PACKAGE=arch;;
*) DEFAULT_PACKAGE=rpm ;;
esac
Expand Down
10 changes: 6 additions & 4 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11493,8 +11493,8 @@ $as_echo_n "checking linux distribution... " >&6; }
VENDOR=redhat ;
elif test -f /etc/fedora-release ; then
VENDOR=fedora ;
elif test -f /etc/arch-release ; then
VENDOR=arch ;
elif test -f /etc/gentoo-release ; then
VENDOR=gentoo ;
elif test -f /etc/lsb-release ; then
VENDOR=ubuntu ;
elif test -f /etc/debian_version ; then
Expand All @@ -11503,8 +11503,10 @@ $as_echo_n "checking linux distribution... " >&6; }
VENDOR=sles ;
elif test -f /etc/slackware-version ; then
VENDOR=slackware ;
elif test -f /etc/gentoo-release ; then
VENDOR=gentoo ;
elif test -f /etc/arch-release ; then
VENDOR=arch ;
elif test -f /etc/lunar.release ; then
VENDOR=lunar ;
else
VENDOR= ;
fi
Expand Down