MT#11263 Remove compatibility code for ngcp-mediaproxy-ng

Change-Id: I08fdf9da836eb46ddc37f6f25837e7852aaa5c1d
changes/73/873/1
Alexander Lutay 10 years ago
parent 772c0ea272
commit d1321a1237

@ -1595,27 +1595,21 @@ EOT
# we require those packages for dkms, so do NOT remove them: # we require those packages for dkms, so do NOT remove them:
# binutils cpp-4.3 gcc-4.3-base linux-kbuild-2.6.32 # binutils cpp-4.3 gcc-4.3-base linux-kbuild-2.6.32
if grml-chroot $TARGET dkms status | grep -q ngcp-rtpengine ; then echo "Processing ngcp-rtpengine dkms package"
rtpengine_name="ngcp-rtpengine" if ! grml-chroot $TARGET dkms status | grep -q "ngcp-rtpengine" ; then
else echo "dkms status failed [checking for ngcp-rtpengine]:" | tee -a /tmp/dkms.log
rtpengine_name="ngcp-mediaproxy-ng"
fi
echo "Identified dkms package ${rtpengine_name}"
if ! grml-chroot $TARGET dkms status | grep -q "${rtpengine_name}" ; then
echo "dkms status failed [checking for ${rtpengine_name}]:" | tee -a /tmp/dkms.log
grml-chroot $TARGET dkms status 2>&1| tee -a /tmp/dkms.log grml-chroot $TARGET dkms status 2>&1| tee -a /tmp/dkms.log
else else
if grml-chroot $TARGET dkms status | grep -v -- '-rt-amd64' | grep -q "^${rtpengine_name}.*: installed" ; then if grml-chroot $TARGET dkms status | grep -v -- '-rt-amd64' | grep -q "^ngcp-rtpengine.*: installed" ; then
echo "${rtpengine_name} kernel package already installed, skipping" | tee -a /tmp/dkms.log echo "ngcp-rtpengine kernel package already installed, skipping" | tee -a /tmp/dkms.log
else else
KERNELHEADERS=$(basename $(ls -d ${TARGET}/usr/src/linux-headers*amd64 | grep -v -- -rt-amd64 | sort -u -r -V | head -1)) KERNELHEADERS=$(basename $(ls -d ${TARGET}/usr/src/linux-headers*amd64 | grep -v -- -rt-amd64 | sort -u -r -V | head -1))
if [ -z "$KERNELHEADERS" ] ; then if [ -z "$KERNELHEADERS" ] ; then
die "Error: no kernel headers found for building ${rtpengine_name} the kernel module." die "Error: no kernel headers found for building ngcp-rtpengine the kernel module."
fi fi
KERNELVERSION=${KERNELHEADERS##linux-headers-} KERNELVERSION=${KERNELHEADERS##linux-headers-}
NGCPVERSION=$(grml-chroot $TARGET dkms status | grep ${rtpengine_name} | awk -F, '{print $2}' | sed 's/:.*//') NGCPVERSION=$(grml-chroot $TARGET dkms status | grep ngcp-rtpengine | awk -F, '{print $2}' | sed 's/:.*//')
grml-chroot $TARGET dkms build -k $KERNELVERSION --kernelsourcedir /usr/src/$KERNELHEADERS \ grml-chroot $TARGET dkms build -k $KERNELVERSION --kernelsourcedir /usr/src/$KERNELHEADERS \
-m $rtpengine_name -v $NGCPVERSION 2>&1 | tee -a /tmp/dkms.log -m $rtpengine_name -v $NGCPVERSION 2>&1 | tee -a /tmp/dkms.log
grml-chroot $TARGET dkms install -k $KERNELVERSION -m $rtpengine_name -v $NGCPVERSION 2>&1 | tee -a /tmp/dkms.log grml-chroot $TARGET dkms install -k $KERNELVERSION -m $rtpengine_name -v $NGCPVERSION 2>&1 | tee -a /tmp/dkms.log
@ -1671,7 +1665,6 @@ EOF
monit \ monit \
mysql \ mysql \
nfs-kernel-server \ nfs-kernel-server \
ngcp-mediaproxy-ng-daemon \
ngcp-rate-o-mat \ ngcp-rate-o-mat \
ngcp-rtpengine-daemon \ ngcp-rtpengine-daemon \
ngcp-sems \ ngcp-sems \

Loading…
Cancel
Save