summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Auty <ikelos@gentoo.org>2006-03-09 22:42:56 +0000
committerMike Auty <ikelos@gentoo.org>2006-03-09 22:42:56 +0000
commit254add7b8bde8bc0864fdb87b25654ffbd96428c (patch)
tree27757a30f0a8a101d0a4b6eed9ab277626444f82 /app-emulation
parentFix wrong filename (diff)
downloadvmware-254add7b8bde8bc0864fdb87b25654ffbd96428c.tar.gz
vmware-254add7b8bde8bc0864fdb87b25654ffbd96428c.tar.bz2
vmware-254add7b8bde8bc0864fdb87b25654ffbd96428c.zip
Modified the ebuild to have fully customizable groupname.
Cleaned out a few sed commands that didn't actually do anything anymore. Added the missing vmware.xml file to the console ebuild. svn path=/trunk/; revision=4
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/vmware-server-console/Manifest3
-rw-r--r--app-emulation/vmware-server-console/files/vmware.xml48
-rw-r--r--app-emulation/vmware-server/Manifest9
-rw-r--r--app-emulation/vmware-server/vmware-server-1.0.0.20925.ebuild12
4 files changed, 58 insertions, 14 deletions
diff --git a/app-emulation/vmware-server-console/Manifest b/app-emulation/vmware-server-console/Manifest
index 6e74ca7..ef1a32c 100644
--- a/app-emulation/vmware-server-console/Manifest
+++ b/app-emulation/vmware-server-console/Manifest
@@ -4,6 +4,9 @@ SHA256 ff3abe9d58fd673d8f3d2f7e967aa6db426e3e15b4d868dc1483682357a928b8 files/99
MD5 76aa9b71f10b9bce20e6fac37a700533 files/digest-vmware-server-console-1.0.0.20925 313
RMD160 67726db4156fb2350afd153873c7c0b330ac8855 files/digest-vmware-server-console-1.0.0.20925 313
SHA256 f8bb79afe6e035d6f932cc28b91a1c90baac3b6584f1a698539b1d2f43460163 files/digest-vmware-server-console-1.0.0.20925 313
+MD5 aa1b576735134579f04b29763901dc4f files/vmware.xml 1592
+RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware.xml 1592
+SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d files/vmware.xml 1592
MD5 e21d7cdc32de0e18b04c907cc5127aa5 vmware-server-console-1.0.0.20925.ebuild 5089
RMD160 0747a5364883e396ffb2a5f976a69c8b2d4a3d80 vmware-server-console-1.0.0.20925.ebuild 5089
SHA256 60071fa342d4b1063910bc69ab5c61dd70e662ae93ce5b0aa006fc76dc573213 vmware-server-console-1.0.0.20925.ebuild 5089
diff --git a/app-emulation/vmware-server-console/files/vmware.xml b/app-emulation/vmware-server-console/files/vmware.xml
new file mode 100644
index 0000000..8d5e2ef
--- /dev/null
+++ b/app-emulation/vmware-server-console/files/vmware.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-vmware-vm">
+ <comment xml:lang="en">VMware virtual machine</comment>
+ <magic priority="50">
+ <match type="string" value='config.version = "' offset="0:4096"/>
+ </magic>
+ <glob pattern="*.vmx"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmdisk">
+ <comment xml:lang="en">VMware virtual disk</comment>
+ <magic priority="50">
+ <match type="string" value="# Disk DescriptorFile" offset="0"/>
+ <match type="string" value="KDMV" offset="0"/>
+ </magic>
+ <glob pattern="*.vmdk"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-team">
+ <comment xml:lang="en">VMware team</comment>
+ <magic priority="50">
+ <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+ <match type="string" value="&lt;VMTeam&gt;" offset="23:24"/>
+ </match>
+ </magic>
+ <glob pattern="*.vmtm"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-snapshot">
+ <comment xml:lang="en">VMware virtual machine snapshot</comment>
+ <magic priority="50">
+ <match type="string" value="\\0xD0\\0xBE\\0xD0\\0xBE" offset="0"/>
+ </magic>
+ <glob pattern="*.vmsn"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmfoundry">
+ <comment xml:lang="en">VMware virtual machine foundry</comment>
+ <magic priority="50">
+ <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+ <match type="string" value="&lt;VM&gt;" offset="23:24"/>
+ </match>
+ </magic>
+ <glob pattern="*.vmxf"/>
+ </mime-type>
+</mime-info>
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index bad9f07..239bf1e 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -25,15 +25,12 @@ SHA256 b74a8935915a9e8325c675de4f1a0c041870b85c897d55836bd898803c96a9cf files/vm
MD5 a237d4e862ce8615d286c979dd9fd2fd files/vmware-server-1.0.0.20925-vmware-authd-x86 315
RMD160 3624da708d60aa1c1319278553cc96ac07324bb4 files/vmware-server-1.0.0.20925-vmware-authd-x86 315
SHA256 490794ea4c6e35fb4113c8cf17d3872ae5877ddec5f8e0164203e96cf48f5ef2 files/vmware-server-1.0.0.20925-vmware-authd-x86 315
-MD5 9ad902b35b398c644f06182f8a251485 files/vmware-server-1.0.0.20925-vmwaregroup 7
-RMD160 abb01479739e56f24f8014aa71ed280577c1151f files/vmware-server-1.0.0.20925-vmwaregroup 7
-SHA256 982a698aea678befdb27602825fb9a5d38d744f0a6e59585e48381010d52766b files/vmware-server-1.0.0.20925-vmwaregroup 7
MD5 e516aab6d83b21fc44a44fc1394999cf files/vmware.rc 1424
RMD160 f72d33d084de6661231ed3d10599f9d9bb578c21 files/vmware.rc 1424
SHA256 408be40a1e176ef2c74fae1e9cc9dcd716ece187b6b2bcf037892a4f5ae1394b files/vmware.rc 1424
MD5 aa1b576735134579f04b29763901dc4f files/vmware.xml 1592
RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware.xml 1592
SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d files/vmware.xml 1592
-MD5 34208c67191ba56ea69cb4ad3240c385 vmware-server-1.0.0.20925.ebuild 9095
-RMD160 d63c28955083bf9acc438207963bb6c22fd9bee2 vmware-server-1.0.0.20925.ebuild 9095
-SHA256 d6bc1ac0f843ac9d23ae85ffebbc22be1ec0459da13053666901f274efc67c65 vmware-server-1.0.0.20925.ebuild 9095
+MD5 966c816bf0e8e88d8533c664a38cc954 vmware-server-1.0.0.20925.ebuild 8947
+RMD160 a0a5ad77799d241789c7148ad8ffa6d4a935136f vmware-server-1.0.0.20925.ebuild 8947
+SHA256 18d3471cc6fcd7e44ab3c725853cd7ea35b7dc24dbc7762383b581280da4200d vmware-server-1.0.0.20925.ebuild 8947
diff --git a/app-emulation/vmware-server/vmware-server-1.0.0.20925.ebuild b/app-emulation/vmware-server/vmware-server-1.0.0.20925.ebuild
index 71697cb..bbaec02 100644
--- a/app-emulation/vmware-server/vmware-server-1.0.0.20925.ebuild
+++ b/app-emulation/vmware-server/vmware-server-1.0.0.20925.ebuild
@@ -127,7 +127,7 @@ src_install() {
dodir /etc/vmware/
cp -pPR etc/* ${D}/etc/vmware/
- cp ${FILESDIR}/${P}-vmwaregroup ${D}/etc/vmware/vmwaregroup
+ echo "${VMWARE_GROUP}" > ${D}/etc/vmware/vmwaregroup
dodir /etc/vmware/init.d
dodir /etc/vmware/init.d/rc0.d
@@ -139,10 +139,6 @@ src_install() {
dodir /etc/vmware/init.d/rc6.d
dosym /etc/init.d/xinetd /etc/vmware/init.d
cp -pPR installer/services.sh ${D}/etc/vmware/init.d/vmware || die
- dosed 's/mknod -m 600/mknod -m 660/' /etc/vmware/init.d/vmware || die
- dosed '/c 119 "$vHubNr"/ a\
- chown root:vmware /dev/vmnet*\
- ' /etc/vmware/init.d/vmware || die
# This is to fix a problem where if someone merges vmware and then
# before configuring vmware they upgrade or re-merge the vmware
@@ -165,14 +161,14 @@ src_install() {
dodir /etc/vmware
# this makes the vmware-vmx executable only executable by vmware group
- fowners root:vmware ${dir}/sbin/vmware-authd ${dir}/lib/bin{,-debug}/vmware-vmx /etc/vmware \
+ fowners root:${VMWARE_GROUP} ${dir}/sbin/vmware-authd ${dir}/lib/bin{,-debug}/vmware-vmx /etc/vmware \
|| die "Changing permissions"
fperms 4750 ${dir}/lib/bin{,-debug}/vmware-vmx ${dir}/sbin/vmware-authd || die
fperms 770 /etc/vmware || die
# this adds udev rules for vmmon*
dodir /etc/udev/rules.d
- echo 'KERNEL=="vmmon*", GROUP="vmware" MODE=660' > \
+ echo 'KERNEL=="vmmon*", GROUP="'${VMWARE_GROUP}'" MODE=660' > \
${D}/etc/udev/rules.d/60-vmware.rules || die
# Questions:
@@ -228,7 +224,7 @@ pkg_config() {
pkg_postinst() {
update-mime-database /usr/share/mime
- [ -d /etc/vmware ] && chown -R root:vmware /etc/vmware
+ [ -d /etc/vmware ] && chown -R root:${VMWARE_GROUP} /etc/vmware
# This is to fix the problem where the not_configured file doesn't get
# removed when the configuration is run. This doesn't remove the file