cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deal with minor number changes in CURRENT.

Browse Source 
PR:	48608
Submitted by:		Per Hedeland <per@hedeland.org>
This commit is contained in:
Martin Blapp 2003-04-13 09:55:44 +00:00
parent d501e989d5
commit 03b57d00e7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=78857
5 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
emulators/vmware2/Makefile
View File

@ -67,11 +67,18 @@ BROKEN= "Kernel source files required"
.include "${WRKDIRPREFIX}${.CURDIR}/work/Makefile.inc.net"
.endif
.if ${OSVERSION} < 500023
VMNET1_MINOR= 0x00010001
.else
VMNET1_MINOR= 0x00800001
.endif
SCRIPTS_ENV+= LINUXBASE="${LINUXBASE}" \
VMNET_HOST_IP="${VMNET_HOST_IP}" \
VMNET_NETMASK="${VMNET_NETMASK}"
VMNET_NETMASK="${VMNET_NETMASK}" \
VMNET1_MINOR="${VMNET1_MINOR}"
MAKE_ARGS= KMODDIR="${VMDIR}/lib/modules"
PLIST_SUB= LINUXBASE="${LINUXBASE}"
PLIST_SUB= LINUXBASE="${LINUXBASE}" VMNET1_MINOR="${VMNET1_MINOR}"
post-extract:
.for m in ${MODULES}
@ -125,6 +132,7 @@ post-patch:
${CAT} ${FILESDIR}/hostif_c.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
${CAT} ${FILESDIR}/vm_types_h.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
.endif
${CAT} ${FILESDIR}/vmnet-only+Makefile.patch | (cd ${WRKSRC} && patch) > /dev/null 2>&1
setoptions:
${SED} -e 's;@@PREFIX@@;${PREFIX};' \
@ -182,10 +190,6 @@ pre-install: setoptions
post-install:
${LN} -sf ${PREFIX}/etc/vmware /etc/
.if ${OSVERSION} >= 500100
${RM} -f ${LINUXBASE}/dev/vmnet1
${LN} -sf /dev/vmnet1 ${LINUXBASE}/dev/vmnet1
.endif
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>

18
emulators/vmware2/files/vmnet-only+Makefile.patch Normal file
View File

@ -0,0 +1,18 @@
--- vmnet-only/freebsd/Makefile.orig Sun Apr 13 11:38:03 2003
+++ vmnet-only/freebsd/Makefile Sun Apr 13 11:38:47 2003
@@ -63,15 +63,5 @@
echo -n >/dev/${IFACE}
-ifconfig ${IFACE} inet ${IFADDR} netmask 255.255.255.0
-afterinstall: device
-
-device:
- rm -f /dev/${DEVNAME}*
- ln -s /dev/${DEVNAME}0 /dev/${DEVNAME}
- for d in ${NDEVICES}; do \
- mknod /dev/${DEVNAME}$$d c ${CDEV_MAJOR} `expr 65536 + $$d`; \
- done
-
-
.include <bsd.kmod.mk>

2
emulators/vmware2/files/vmware.sh
View File

@ -53,6 +53,8 @@ start)
echo "Your VMware installation seems broken. Please reinstall VMware port." >&2
exit 255
fi
(echo -n > $dev_vmnet1) 2>/dev/null || \
echo -n > /dev/vmnet1 2>&1
echo -n > /dev/vmnet1 2>&1 || true
echo -n > $dev_vmnet1 2>&1
ifconfig vmnet1 $host_ip netmask $netmask

2
emulators/vmware2/pkg-plist
View File

@ -122,7 +122,7 @@ share/doc/vmware/SAMBA-LICENSE
@exec mknod %%LINUXBASE%%/dev/hdb b 0 0x0001000a
@exec ln -sf %D/etc/vmware /etc/
@exec mknod %%LINUXBASE%%/dev/vmmon c 200 0
@exec mknod %%LINUXBASE%%/dev/vmnet1 c 149 65537
@exec mknod %%LINUXBASE%%/dev/vmnet1 c 149 %%VMNET1_MINOR%%
@unexec rm -f /etc/vmware %%LINUXBASE%%/dev/vmmon %%LINUXBASE%%/dev/vmnet1 %%LINUXBASE%%/bin/df %%LINUXBASE%%/dev/tty[0-9]* %%LINUXBASE%%/dev/hd? %%LINUXBASE%%/dev/null
@dirrm etc/vmware
@dirrm lib/vmware/bin

2
emulators/vmware2/scripts/pre-install
View File

@ -18,7 +18,7 @@ ln -s ${linux_dev}/tty1 ${linux_dev}/tty0
mknod ${linux_dev}/null c 2 2
chmod 666 ${linux_dev}/null
echo Creating vmnet1 node
mknod /compat/linux/dev/vmnet1 c 149 65537
mknod /compat/linux/dev/vmnet1 c 149 ${VMNET1_MINOR}
echo Creating $linux_dev/hd\?
mknod ${linux_dev}/hda b 0 0x00010002
mknod ${linux_dev}/hdb b 0 0x0001000a