From bc9ea1ceb8b23b22c6599d4637137df9c2091b9b Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Mon, 21 Oct 2019 20:28:38 +0000 Subject: [PATCH] if_tuntap: remove if_{tun,tap}.ko -> if_tuntap.ko links These drivers have been merged into a single if_tuntap in 13.0. The compatibility links existed only for the interim and will be MFC'd along with the if_tuntap merge shortly. MFC after: never --- sys/modules/if_tuntap/Makefile | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/sys/modules/if_tuntap/Makefile b/sys/modules/if_tuntap/Makefile index c473fa07df40..7a4e61460619 100644 --- a/sys/modules/if_tuntap/Makefile +++ b/sys/modules/if_tuntap/Makefile @@ -5,31 +5,4 @@ KMOD= if_tuntap SRCS= if_tuntap.c opt_inet.h opt_inet6.h -# Symlink for backwards compatibility with systems installed at 12.0 or older -.if ${MACHINE_CPUARCH} != "powerpc" -SYMLINKS= ${KMOD}.ko ${KMODDIR}/if_tun.ko \ - ${KMOD}.ko ${KMODDIR}/if_tap.ko -.else -# Some PPC systems use msdosfs for /boot, which can't handle links or symlinks -afterinstall: alias alias_debug -alias: .PHONY - ${INSTALL} -T release -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}/if_tun.ko - ${INSTALL} -T release -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}/if_tap.ko -.if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG) && \ - "${MK_KERNEL_SYMBOLS}" != "no" -alias_debug: .PHONY - ${INSTALL} -T debug -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ - ${_INSTALLFLAGS} ${PROG}.debug \ - ${DESTDIR}${KERN_DEBUGDIR}${KMODDIR}/if_tun.ko - ${INSTALL} -T debug -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ - ${_INSTALLFLAGS} ${PROG}.debug \ - ${DESTDIR}${KERN_DEBUGDIR}${KMODDIR}/if_tap.ko -.else -alias_debug: .PHONY -.endif -.endif - - .include