Skip to content

GitLab

Commit 989c6f7c authored by David Johnson's avatar David Johnson
Browse files
Options

Install fedora stuff on CentOS for now.

parent a88d516e
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 7 deletions
tmcd/GNUmakefile.in
View file @ 989c6f7c
...@@ -72,6 +72,9 @@ endif ...@@ -72,6 +72,9 @@ endif
ifeq ($(findstring fedora,$(MDSUBDIR)),fedora) ifeq ($(findstring fedora,$(MDSUBDIR)),fedora)
MDSUBDIR = fedora MDSUBDIR = fedora
endif endif
ifeq ($(findstring centos,$(MDSUBDIR)),centos)
MDSUBDIR = fedora
endif
ifeq ($(MDSUBDIR),stargate1) ifeq ($(MDSUBDIR),stargate1)
MDSUBDIR = linux-sg MDSUBDIR = linux-sg
endif endif
......
utils/osstuff.sh
View file @ 989c6f7c
...@@ -30,14 +30,20 @@ Linux) ...@@ -30,14 +30,20 @@ Linux)
rel=`grep DISTRIB_RELEASE /etc/lsb-release | awk -F = '{ print $2; }'` rel=`grep DISTRIB_RELEASE /etc/lsb-release | awk -F = '{ print $2; }'`
fi fi
if [ -z "$dist" -a -r /etc/redhat-release ]; then if [ -z "$dist" -a -r /etc/redhat-release ]; then
rel=`grep 'Red Hat' /etc/redhat-release | sed -e 's/Red Hat Linux release \([0-9]\(\.[0-9]\)\?\).*/\1/'` trel=`grep 'Red Hat' /etc/redhat-release | sed -e 's/Red Hat Linux release \([0-9]\(\.[0-9]\)\?\).*/\1/'`
if [ -n "$rel" ]; then if [ -n "$trel" ]; then
dist="Redhat" dist="Redhat"
else rel=$trel
rel=`grep 'Fedora' /etc/redhat-release | sed -e 's/Fedora .*release \([0-9]\).*/\1/'` fi
if [ -n "$rel" ]; then trel=`grep 'Fedora' /etc/redhat-release | sed -e 's/Fedora .*release \([0-9.]\+\).*/\1/'`
dist="Fedora" if [ -n "$trel" ]; then
fi dist="Fedora"
rel=$trel
fi
trel=`grep 'CentOS' /etc/redhat-release | sed -e 's/CentOS .*release \([0-9.]\+\).*/\1/'`
if [ -n "$trel" ]; then
dist="CentOS"
rel=$trel
fi fi
fi fi
# XXX hack check for stargate # XXX hack check for stargate
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment