forked from I2P_Developers/i2p.i2p
Improved support for GNU/kFreeBSD
- add kFreeBSD to NBI and CPUID - add kFreeBSD to jcpuid/jbigi build scripts - refresh debian patches to compensate for kFreeBSD changes - i2prouter: Detect kFreeBSD and normalize its name - clean up osid (switching to "elif") and adding support for detecting kFreeBSD - update postinstall.sh; I2P cannot be installed using gij so postinstall.sh will not be run. If/when openjdk finally comes to kFreeBSD, we'll be ready for it.
This commit is contained in:
@@ -357,6 +357,9 @@ case "$DIST_OS" in
|
||||
'unix_sv')
|
||||
DIST_OS="unixware"
|
||||
;;
|
||||
'gnu/kfreebsd')
|
||||
DIST_OS="kfreebsd"
|
||||
;;
|
||||
'os/390')
|
||||
DIST_OS="zos"
|
||||
;;
|
||||
|
||||
@@ -34,6 +34,7 @@ fi
|
||||
|
||||
DARWIN=`echo "$HOST_OS" | grep Darwin`
|
||||
MAC=`echo "$HOST_OS" | grep Mac`
|
||||
KFREEBSD=`echo "$HOST_OS" | grep kFreeBSD`
|
||||
FREEBSD=`echo "$HOST_OS" | grep FreeBSD`
|
||||
LINUX=`echo "$HOST_OS" | grep Linux`
|
||||
SOLARIS=`echo "$HOST_OS" | grep Solaris`
|
||||
@@ -43,25 +44,15 @@ OPENBSD=`echo "$HOST_OS" |grep OpenBSD`
|
||||
|
||||
if [ ! "X$DARWIN" = "X" -o ! "X$MAC" = "X" ]; then
|
||||
echo osx
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ ! "X$FREEBSD" = "X" ]; then
|
||||
elif [ ! "X$KFREEBSD" = "X" ]; then
|
||||
echo kfreebsd
|
||||
elif [ ! "X$FREEBSD" = "X" ]; then
|
||||
echo freebsd
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ ! "X$NETBSD" = "X" ]; then
|
||||
elif [ ! "X$NETBSD" = "X" ]; then
|
||||
echo netbsd
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ ! "X$OPENBSD" = "X" ]; then
|
||||
elif [ ! "X$OPENBSD" = "X" ]; then
|
||||
echo openbsd
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ ! "X$LINUX" = "X" ]; then
|
||||
elif [ ! "X$LINUX" = "X" ]; then
|
||||
|
||||
LINUX_DISTRO=`cat /proc/version`
|
||||
DEBIAN=`echo $LINUX_DISTRO | grep Debian`
|
||||
@@ -73,43 +64,21 @@ if [ ! "X$LINUX" = "X" ]; then
|
||||
|
||||
if [ ! "X$DEBIAN" = "X" ]; then
|
||||
echo debian
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ ! "X$FEDORA" = "X" ]; then
|
||||
elif [ ! "X$FEDORA" = "X" ]; then
|
||||
echo fedora
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ ! "X$GENTOO" = "X" ]; then
|
||||
elif [ ! "X$GENTOO" = "X" ]; then
|
||||
echo gentoo
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ ! "X$MANDRAKE" = "X" ]; then
|
||||
elif [ ! "X$MANDRAKE" = "X" ]; then
|
||||
echo mandrake
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ ! "X$REDHAT" = "X" ]; then
|
||||
elif [ ! "X$REDHAT" = "X" ]; then
|
||||
echo redhat
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ ! "X$SUSE" = "X" ]; then
|
||||
elif [ ! "X$SUSE" = "X" ]; then
|
||||
echo suse
|
||||
exit 0
|
||||
else
|
||||
echo linux
|
||||
fi
|
||||
|
||||
echo linux
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ ! "X$SOLARIS" = "X" -o ! "X$SUNOS" = "X" ]; then
|
||||
elif [ ! "X$SOLARIS" = "X" -o ! "X$SUNOS" = "X" ]; then
|
||||
echo solaris
|
||||
exit 0
|
||||
else
|
||||
echo unknown
|
||||
fi
|
||||
|
||||
echo unknown
|
||||
exit 0
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@ case $HOST_OS in
|
||||
wrapperpath="./lib/wrapper/solaris"
|
||||
cp ${wrapperpath}/libwrapper.so ./lib/
|
||||
;;
|
||||
netbsd|openbsd )
|
||||
netbsd|openbsd|kfreebsd)
|
||||
# FIXME
|
||||
# This isn't displayed when installing, but if we fall back to the "*)"
|
||||
# choice, no cleanup happens and users are advised to copy the wrapper
|
||||
|
||||
Reference in New Issue
Block a user