SOURCES: VMware-player-Makefile.patch (NEW), VMware-player-run_scr...
areq
areq at pld-linux.org
Sat Aug 19 15:53:30 CEST 2006
Author: areq Date: Sat Aug 19 13:53:30 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- copy from workstation
---- Files affected:
SOURCES:
VMware-player-Makefile.patch (NONE -> 1.1) (NEW), VMware-player-run_script.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/VMware-player-Makefile.patch
diff -u /dev/null SOURCES/VMware-player-Makefile.patch:1.1
--- /dev/null Sat Aug 19 15:53:30 2006
+++ SOURCES/VMware-player-Makefile.patch Sat Aug 19 15:53:24 2006
@@ -0,0 +1,199 @@
+diff -urN vmmon-only.org/Makefile vmmon-only/Makefile
+--- vmmon-only.org/Makefile 2004-05-12 16:49:05.732456176 +0200
++++ vmmon-only/Makefile 2004-05-12 16:57:25.454486880 +0200
+@@ -14,9 +14,9 @@
+ VM_UNAME = $(shell uname -r)
+
+ # Header directory for the running kernel
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = /usr/src/linux/include
+
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = .
+
+ DRIVER := vmmon
+
+@@ -44,32 +44,6 @@
+ VM_KBUILD_OUTPUT := $(O)
+ endif
+ endif
+-ifeq ($(VM_KBUILD_OUTPUT),)
+-VM_KBUILD_OUTPUT := $(BUILD_DIR)
+-endif
+-ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes)
+-ifeq ($(call vm_check_file,$(VM_KBUILD_OUTPUT)/.config), no)
+-VM_DUMMY := $(shell echo >&2 '*** Your sources installation is broken:')
+-VM_DUMMY := $(shell echo >&2 '*** $(BUILD_DIR) does not contain .config file')
+-VM_DUMMY := $(shell echo >&2 '*** vmmon/vmnet build may fail, or built vmmon/vmnet may crash.')
+-ifeq ($(call vm_check_file,/boot/vmlinuz.config), yes)
+-VM_DUMMY := $(shell echo >&2 '*** You are apparently use SuSE system. You should copy')
+-VM_DUMMY := $(shell echo >&2 '*** /boot/vmlinuz.config to the $(BUILD_DIR)/.config.')
+-endif
+-VM_DUMMY := $(shell echo >&2)
+-VM_DUMMY := $(shell echo >&2 '*** Hit ENTER to continue, or ^C to stop build.')
+-VM_DUMMY := $(shell read dummy)
+-else
+-ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes)
+-VM_KBUILD := 26
+-else
+-ifeq ($(shell if $(GREP) "^PATCHLEVEL = 4$$" $(BUILD_DIR)/Makefile > /dev/null 2>&1; then echo "yes"; fi), yes)
+-VM_KBUILD := 24
+-endif
+-endif
+-endif
+-endif
+-export VM_KBUILD
+ endif
+
+ ifndef VM_KBUILD_SHOWN
+@@ -90,9 +64,6 @@
+
+ VMCCVER := $(shell $(CC) -dumpversion)
+
+-# If there is no version defined, we are in toplevel pass, not yet in kernel makefiles...
+-ifeq ($(VERSION),)
+-
+ ifeq ($(VM_KBUILD), 24)
+ DRIVER_KO := $(DRIVER).o
+ else
+@@ -105,12 +76,6 @@
+ $(DRIVER): $(DRIVER_KO)
+ cp -f $< $@
+
+-# Pass gcc version down the chain, so we can detect if kernel attempts to use unapproved compiler
+-VM_CCVER := $(VMCCVER)
+-export VM_CCVER
+-VM_CC := $(CC)
+-export VM_CC
+-
+ ifneq ($(FORCE_CC), yes)
+ MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES))
+ endif
+@@ -118,30 +83,9 @@
+ $(DRIVER_KO):
+ make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) modules
+
+-else
+-
+-ifneq ($(VM_CCVER), $(VMCCVER))
+-$(warning *** Inappropriate build environment: you wanted to use gcc \
+- version $(VM_CCVER) while kernel attempts to use gcc version $(VMCCVER).)
+-$(error For proper build you'll have to replace $(CC) with symbolic \
+- link to $(VM_CC))
+-endif
+-
+-endif
+
+ include $(SRCROOT)/Makefile.kernel
+
+-ifdef TOPDIR
+-ifeq ($(VM_KBUILD), 24)
+-
+-O_TARGET := $(DRIVER).o
+-
+-obj-y := $($(DRIVER)-y)
+-
+-include $(TOPDIR)/Rules.make
+-endif
+-endif
+-
+ else
+
+ include $(SRCROOT)/Makefile.normal
+diff -urN vmnet-only.org/Makefile vmnet-only/Makefile
+--- vmnet-only.org/Makefile 2004-05-12 16:49:09.091945456 +0200
++++ vmnet-only/Makefile 2004-05-12 16:49:19.904301728 +0200
+@@ -14,9 +14,9 @@
+ VM_UNAME = $(shell uname -r)
+
+ # Header directory for the running kernel
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = /usr/src/linux/include
+
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = .
+
+ DRIVER := vmnet
+
+@@ -47,29 +47,6 @@
+ ifeq ($(VM_KBUILD_OUTPUT),)
+ VM_KBUILD_OUTPUT := $(BUILD_DIR)
+ endif
+-ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes)
+-ifeq ($(call vm_check_file,$(VM_KBUILD_OUTPUT)/.config), no)
+-VM_DUMMY := $(shell echo >&2 '*** Your sources installation is broken:')
+-VM_DUMMY := $(shell echo >&2 '*** $(BUILD_DIR) does not contain .config file')
+-VM_DUMMY := $(shell echo >&2 '*** vmmon/vmnet build may fail, or built vmmon/vmnet may crash.')
+-ifeq ($(call vm_check_file,/boot/vmlinuz.config), yes)
+-VM_DUMMY := $(shell echo >&2 '*** You are apparently use SuSE system. You should copy')
+-VM_DUMMY := $(shell echo >&2 '*** /boot/vmlinuz.config to the $(BUILD_DIR)/.config.')
+-endif
+-VM_DUMMY := $(shell echo >&2)
+-VM_DUMMY := $(shell echo >&2 '*** Hit ENTER to continue, or ^C to stop build.')
+-VM_DUMMY := $(shell read dummy)
+-else
+-ifeq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes)
+-ifeq ($(shell if $(GREP) "^PATCHLEVEL = 4$$" $(BUILD_DIR)/Makefile > /dev/null 2>&1; then echo "yes"; fi), yes)
+-VM_KBUILD := 24
+-endif
+-else
+-VM_KBUILD := 26
+-endif
+-endif
+-endif
+-export VM_KBUILD
+ endif
+
+ ifndef VM_KBUILD_SHOWN
+@@ -90,9 +67,6 @@
+
+ VMCCVER := $(shell $(CC) -dumpversion)
+
+-# If there is no version defined, we are in toplevel pass, not yet in kernel makefiles...
+-ifeq ($(VERSION),)
+-
+ ifeq ($(VM_KBUILD), 24)
+ DRIVER_KO := $(DRIVER).o
+ else
+@@ -102,41 +76,13 @@
+ auto-build: $(DRIVER_KO)
+ cp -f $< $(SRCROOT)/../$(DRIVER).o
+
+-# Pass gcc version down the chain, so we can detect if kernel attempts to use unapproved compiler
+-VM_CCVER := $(VMCCVER)
+-export VM_CCVER
+-VM_CC := $(CC)
+-export VM_CC
+-
+ MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES))
+
+ $(DRIVER_KO):
+ make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) modules
+
+-else
+-
+-ifneq ($(VM_CCVER), $(VMCCVER))
+-$(warning *** Inappropriate build environment: you wanted to use gcc \
+- version $(VM_CCVER) while kernel attempts to use gcc version $(VMCCVER).)
+-$(error For proper build you'll have to replace $(CC) with symbolic \
+- link to $(VM_CC))
+-endif
+-
+-endif
+-
+ include $(SRCROOT)/Makefile.kernel
+
+-ifdef TOPDIR
+-ifeq ($(VM_KBUILD), 24)
+-
+-O_TARGET := $(DRIVER).o
+-
+-obj-y := $($(DRIVER)-y)
+-
+-include $(TOPDIR)/Rules.make
+-endif
+-endif
+-
+ else
+
+ include $(SRCROOT)/Makefile.normal
================================================================
Index: SOURCES/VMware-player-run_script.patch
diff -u /dev/null SOURCES/VMware-player-run_script.patch:1.1
--- /dev/null Sat Aug 19 15:53:30 2006
+++ SOURCES/VMware-player-run_script.patch Sat Aug 19 15:53:24 2006
@@ -0,0 +1,166 @@
+--- vmware-distrib/bin/vmware 2005-03-23 05:54:18.000000000 -0600
++++ vmware-distrib.new/bin/vmware 2005-04-13 09:35:12.000000000 -0500
+@@ -8,162 +8,7 @@
+ # the VMware software is installed. --hpreg
+ #
+
+-# BEGINNING_OF_DB_DOT_SH
+-#!/bin/sh
+-
+-#
+-# Manage an installer database
+-#
+-
+-# Add an answer to a database in memory
+-db_answer_add() {
+- local dbvar="$1" # IN/OUT
+- local id="$2" # IN
+- local value="$3" # IN
+- local answers
+- local i
+-
+- eval "$dbvar"'_answer_'"$id"'="$value"'
+-
+- eval 'answers="$'"$dbvar"'_answers"'
+- # There is no double quote around $answers on purpose
+- for i in $answers; do
+- if [ "$i" = "$id" ]; then
+- return
+- fi
+- done
+- answers="$answers"' '"$id"
+- eval "$dbvar"'_answers="$answers"'
+-}
+-
+-# Remove an answer from a database in memory
+-db_answer_remove() {
+- local dbvar="$1" # IN/OUT
+- local id="$2" # IN
+- local new_answers
+- local answers
+- local i
+-
+- eval 'unset '"$dbvar"'_answer_'"$id"
+-
+- new_answers=''
+- eval 'answers="$'"$dbvar"'_answers"'
+- # There is no double quote around $answers on purpose
+- for i in $answers; do
+- if [ "$i" != "$id" ]; then
+- new_answers="$new_answers"' '"$i"
+- fi
+- done
+- eval "$dbvar"'_answers="$new_answers"'
+-}
+-
+-# Load all answers from a database on stdin to memory (<dbvar>_answer_*
+-# variables)
+-db_load_from_stdin() {
+- local dbvar="$1" # OUT
+-
+- eval "$dbvar"'_answers=""'
+-
+- # read doesn't support -r on FreeBSD 3.x. For this reason, the following line
+- # is patched to remove the -r in case of FreeBSD tools build. So don't make
+- # changes to it. -- Jeremy Bar
+- while read -r action p1 p2; do
+- if [ "$action" = 'answer' ]; then
+- db_answer_add "$dbvar" "$p1" "$p2"
+- elif [ "$action" = 'remove_answer' ]; then
+- db_answer_remove "$dbvar" "$p1"
+- fi
+- done
+-}
+-
+-# Load all answers from a database on disk to memory (<dbvar>_answer_*
+-# variables)
+-db_load() {
+- local dbvar="$1" # OUT
+- local dbfile="$2" # IN
+-
+- db_load_from_stdin "$dbvar" < "$dbfile"
+-}
+-
+-# Iterate through all answers in a database in memory, calling <func> with
+-# id/value pairs and the remaining arguments to this function
+-db_iterate() {
+- local dbvar="$1" # IN
+- local func="$2" # IN
+- shift 2
+- local answers
+- local i
+- local value
+-
+- eval 'answers="$'"$dbvar"'_answers"'
+- # There is no double quote around $answers on purpose
+- for i in $answers; do
+- eval 'value="$'"$dbvar"'_answer_'"$i"'"'
+- "$func" "$i" "$value" "$@"
+- done
+-}
+-
+-# If it exists in memory, remove an answer from a database (disk and memory)
+-db_remove_answer() {
+- local dbvar="$1" # IN/OUT
+- local dbfile="$2" # IN
+- local id="$3" # IN
+- local answers
+- local i
+-
+- eval 'answers="$'"$dbvar"'_answers"'
+- # There is no double quote around $answers on purpose
+- for i in $answers; do
+- if [ "$i" = "$id" ]; then
+- echo 'remove_answer '"$id" >> "$dbfile"
+- db_answer_remove "$dbvar" "$id"
+- return
+- fi
+- done
+-}
+-
+-# Add an answer to a database (disk and memory)
+-db_add_answer() {
+- local dbvar="$1" # IN/OUT
+- local dbfile="$2" # IN
+- local id="$3" # IN
+- local value="$4" # IN
+-
+- db_remove_answer "$dbvar" "$dbfile" "$id"
+- echo 'answer '"$id"' '"$value" >> "$dbfile"
+- db_answer_add "$dbvar" "$id" "$value"
+-}
+-
+-# Add a file to a database on disk
+-# 'file' is the file to put in the database (it may not exist on the disk)
+-# 'tsfile' is the file to get the timestamp from, '' if no timestamp
+-db_add_file() {
+- local dbfile="$1" # IN
+- local file="$2" # IN
+- local tsfile="$3" # IN
+- local date
+-
+- if [ "$tsfile" = '' ]; then
+- echo 'file '"$file" >> "$dbfile"
+- else
+- date=`date -r "$tsfile" '+%s' 2> /dev/null`
+- if [ "$date" != '' ]; then
+- date=' '"$date"
+- fi
+- echo 'file '"$file$date" >> "$dbfile"
+- fi
+-}
+-
+-# Add a directory to a database on disk
+-db_add_dir() {
+- local dbfile="$1" # IN
+- local dir="$2" # IN
+-
+- echo 'directory '"$dir" >> "$dbfile"
+-}
+-# END_OF_DB_DOT_SH
+-
+-db_load 'vm_db' '/etc/vmware/locations'
++. /etc/vmware/locations
+
+ if [ "vmware" = "vmware-console" ]; then
+ vmware_config_name="vmware-config-console"
================================================================
More information about the pld-cvs-commit
mailing list