Move licensed content to tgz archives
authorJames W. Mills <jameswmills@ti.com>
Thu, 8 Dec 2011 19:11:06 +0000 (13:11 -0600)
committerJames W. Mills <jameswmills@ti.com>
Thu, 8 Dec 2011 21:44:10 +0000 (15:44 -0600)
This change allows all licensed material to be license-bound, and
prevents any single component from being downloaded without the proper
license agreement.

Change-Id: I353122644b1696438a7c7a33a26d43087e19440a
Signed-off-by: James W. Mills <jameswmills@ti.com>
32 files changed:
Android.mk
omap4/License_for_IMG_SGX_Binary_Image.txt [new file with mode: 0644]
omap4/sgx.tgz [new file with mode: 0644]
omap4/sgx/Android.mk [deleted file]
omap4/sgx/bin/framebuffer_test [deleted file]
omap4/sgx/bin/hal_client_test [deleted file]
omap4/sgx/bin/hal_server_test [deleted file]
omap4/sgx/bin/pvr2d_test [deleted file]
omap4/sgx/bin/pvrsrvctl [deleted file]
omap4/sgx/bin/pvrsrvinit [deleted file]
omap4/sgx/bin/services_test [deleted file]
omap4/sgx/bin/sgx_blit_test [deleted file]
omap4/sgx/bin/sgx_clipblit_test [deleted file]
omap4/sgx/bin/sgx_flip_test [deleted file]
omap4/sgx/bin/sgx_init_test [deleted file]
omap4/sgx/bin/sgx_render_flip_test [deleted file]
omap4/sgx/bin/testwrap [deleted file]
omap4/sgx/bin/texture_benchmark [deleted file]
omap4/sgx/lib/egl/libEGL_POWERVR_SGX540_120.so [deleted file]
omap4/sgx/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so [deleted file]
omap4/sgx/lib/egl/libGLESv2_POWERVR_SGX540_120.so [deleted file]
omap4/sgx/lib/hw/gralloc.omap4.so [deleted file]
omap4/sgx/lib/libIMGegl.so [deleted file]
omap4/sgx/lib/libPVRScopeServices.so [deleted file]
omap4/sgx/lib/libglslcompiler.so [deleted file]
omap4/sgx/lib/libpvr2d.so [deleted file]
omap4/sgx/lib/libpvrANDROID_WSEGL.so [deleted file]
omap4/sgx/lib/libsrv_init.so [deleted file]
omap4/sgx/lib/libsrv_um.so [deleted file]
omap4/sgx/lib/libusc.so [deleted file]
omap4/sgx/updatelibs.sh [deleted file]
untar.sh [new file with mode: 0755]

index 5053e7d64389d3eaa35c6e807277fff9f83898f6..11233d49ea18b778337662d426880dc2b96bcae2 100644 (file)
@@ -1 +1,3 @@
+LOCAL_PATH := $(my-dir)
+$(hide $(shell $(LOCAL_PATH)/untar.sh $(LOCAL_PATH)/omap4 sgx $(LOCAL_PATH)/omap4/sgx.tgz))
 include $(call all-subdir-makefiles)
diff --git a/omap4/License_for_IMG_SGX_Binary_Image.txt b/omap4/License_for_IMG_SGX_Binary_Image.txt
new file mode 100644 (file)
index 0000000..dad4513
--- /dev/null
@@ -0,0 +1,125 @@
+/*
+ * TECHNOLOGY AND SOFTWARE PUBLICLY AVAILABLE
+ * SOFTWARE LICENSE FOR OMAP(TM) 4 USER SPACE GRAPHICS DRIVER BINARY
+ *
+ * Copyright (c) 2011, Texas Instruments Incorporated.
+ * Portions (c), Imagination Technologies Limited.
+ *
+ * All rights reserved.
+ *
+ * Redistribution:  
+ *
+ * Redistribution and use in binary form, without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * * Redistributions must preserve existing copyright notices and reproduce
+ *   this license (including the above copyright notice and the disclaimer
+ *   below) in the documentation and/or other materials provided with the
+ *   distribution.
+ *
+ * * Neither the name of Texas Instruments Incorporated nor the names of its
+ *   suppliers may be used to endorse or promote products derived from this 
+ *   software without specific prior written permission.
+ *
+ * * No reverse engineering, decompilation, or disassembly of this software
+ *   is permitted.
+ *
+ * Limited patent license:
+ *
+ * Texas Instruments Incorporated (\93TI\94) grants a world-wide, royalty-free, 
+ * non-exclusive license under patents it now or hereafter owns or controls 
+ * to make, have made, use, import, offer to sell and sell ("Utilize") this
+ * software in its current form, but solely to the extent that any such 
+ * patent is necessary to  Utilize the software alone.  The patent license 
+ * shall not apply to any combinations which include this software. No 
+ * hardware per se is licensed hereunder.
+ *
+ * DISCLAIMER:
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Certain third party licenses not included:
+ *
+ * Certain software may (a) require patent licenses from third parties
+ * claiming patent rights covering implementation of the software or (b) be
+ * based on industry recognized standards or software programs published by
+ * industry recognized standards bodies and certain third parties may claim
+ * to own patents or copyrights that cover implementation of those standards.
+ * You acknowledge and agree that (i) this License does not convey a license
+ * to any such third party patents and copyrights, (ii) you are responsible
+ * for any fees or royalties that may be payable to any third party based on
+ * such third party's interests in such software and (iii) you will indemnify
+ * TI against your failure to make any such payments and will defend any
+ * claim, suit or proceeding brought against TI insofar as such claim, suit
+ * or proceeding is based on or arises from such failure.
+ *
+ */
+
+-----------------------------------------------------------------------------
+
+Additional legal notices pertaining to portions of included software:
+
+
+Copyright (c) 2007-2009 The Khronos Group Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+
+
+--------
+
+SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+
+Copyright (C) 2006 Silicon Graphics, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice including the dates of first publication and
+either this permission notice or a reference to
+http://oss.sgi.com/projects/FreeB/ shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Except as contained in this notice, the name of Silicon Graphics, Inc.
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+from Silicon Graphics, Inc.
+#257696v2
diff --git a/omap4/sgx.tgz b/omap4/sgx.tgz
new file mode 100644 (file)
index 0000000..a1ae567
Binary files /dev/null and b/omap4/sgx.tgz differ
diff --git a/omap4/sgx/Android.mk b/omap4/sgx/Android.mk
deleted file mode 100644 (file)
index 7cd8d18..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-define _add-sgx-vendor-lib
-include $$(CLEAR_VARS)
-$(if $(word 2,$1),$(error Invalid SGX module name $1))
-LOCAL_MODULE := $(basename $(notdir $1))
-LOCAL_SRC_FILES := $1
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(suffix $1)
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $$(TARGET_OUT)$(abspath /vendor/$(dir $1))
-LOCAL_STRIP_MODULE := false 
-OVERRIDE_BUILT_MODULE_PATH := $$(TARGET_OUT_INTERMEDIATE_LIBRARIES)
-include $$(BUILD_PREBUILT)
-endef
-
-define _add-sgx-vendor-bin
-include $$(CLEAR_VARS)
-$(if $(word 2,$1),$(error Invalid SGX module name $1))
-LOCAL_MODULE := $(basename $(notdir $1))
-LOCAL_SRC_FILES := $1
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(suffix $1)
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_PATH := $$(TARGET_OUT)$(abspath /vendor/$(dir $1))
-LOCAL_STRIP_MODULE := false
-OVERRIDE_BUILT_MODULE_PATH := $$(TARGET_OUT_INTERMEDIATE_EXECUTABLES)
-include $$(BUILD_PREBUILT)
-endef
-
-
-prebuilt_sgx_vendor_libs := \
-       lib/libIMGegl.so \
-       lib/libglslcompiler.so \
-       lib/libusc.so \
-       lib/libPVRScopeServices.so \
-       lib/libsrv_um.so \
-       lib/hw/gralloc.omap4.so \
-       lib/libpvrANDROID_WSEGL.so \
-       lib/libpvr2d.so \
-       lib/libsrv_init.so \
-       lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so \
-       lib/egl/libGLESv2_POWERVR_SGX540_120.so \
-       lib/egl/libEGL_POWERVR_SGX540_120.so
-
-prebuilt_sgx_vendor_bins := \
-       bin/pvrsrvinit
-
-prebuilt_sgx_modules := \
-  $(foreach _file,$(prebuilt_sgx_vendor_libs) $(prebuilt_sgx_vendor_bins),\
-    $(notdir $(basename $(_file))))
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := ti_omap4_sgx_libs
-LOCAL_MODULE_TAGS := optional
-LOCAL_REQUIRED_MODULES := $(prebuilt_sgx_modules)
-include $(BUILD_PHONY_PACKAGE)
-
-$(foreach _file,$(prebuilt_sgx_vendor_libs),\
-  $(eval $(call _add-sgx-vendor-lib,$(_file))))
-
-$(foreach _file,$(prebuilt_sgx_vendor_bins),\
-  $(eval $(call _add-sgx-vendor-bin,$(_file))))
-
-prebuilt_sgx_modules :=
-prebuilt_sgx_vendor_libs :=
-prebuilt_sgx_vendor_bins :=
-_add-sgx-vendor-lib :=
-_add-sgx-vendor-bin :=
diff --git a/omap4/sgx/bin/framebuffer_test b/omap4/sgx/bin/framebuffer_test
deleted file mode 100755 (executable)
index 9167fd0..0000000
Binary files a/omap4/sgx/bin/framebuffer_test and /dev/null differ
diff --git a/omap4/sgx/bin/hal_client_test b/omap4/sgx/bin/hal_client_test
deleted file mode 100755 (executable)
index 1708226..0000000
Binary files a/omap4/sgx/bin/hal_client_test and /dev/null differ
diff --git a/omap4/sgx/bin/hal_server_test b/omap4/sgx/bin/hal_server_test
deleted file mode 100755 (executable)
index 7ff6b2b..0000000
Binary files a/omap4/sgx/bin/hal_server_test and /dev/null differ
diff --git a/omap4/sgx/bin/pvr2d_test b/omap4/sgx/bin/pvr2d_test
deleted file mode 100755 (executable)
index a638be4..0000000
Binary files a/omap4/sgx/bin/pvr2d_test and /dev/null differ
diff --git a/omap4/sgx/bin/pvrsrvctl b/omap4/sgx/bin/pvrsrvctl
deleted file mode 100755 (executable)
index b119119..0000000
Binary files a/omap4/sgx/bin/pvrsrvctl and /dev/null differ
diff --git a/omap4/sgx/bin/pvrsrvinit b/omap4/sgx/bin/pvrsrvinit
deleted file mode 100755 (executable)
index c6cf3cb..0000000
Binary files a/omap4/sgx/bin/pvrsrvinit and /dev/null differ
diff --git a/omap4/sgx/bin/services_test b/omap4/sgx/bin/services_test
deleted file mode 100755 (executable)
index 4f04adb..0000000
Binary files a/omap4/sgx/bin/services_test and /dev/null differ
diff --git a/omap4/sgx/bin/sgx_blit_test b/omap4/sgx/bin/sgx_blit_test
deleted file mode 100755 (executable)
index 8b9a9f2..0000000
Binary files a/omap4/sgx/bin/sgx_blit_test and /dev/null differ
diff --git a/omap4/sgx/bin/sgx_clipblit_test b/omap4/sgx/bin/sgx_clipblit_test
deleted file mode 100755 (executable)
index 886f183..0000000
Binary files a/omap4/sgx/bin/sgx_clipblit_test and /dev/null differ
diff --git a/omap4/sgx/bin/sgx_flip_test b/omap4/sgx/bin/sgx_flip_test
deleted file mode 100755 (executable)
index 68cdfeb..0000000
Binary files a/omap4/sgx/bin/sgx_flip_test and /dev/null differ
diff --git a/omap4/sgx/bin/sgx_init_test b/omap4/sgx/bin/sgx_init_test
deleted file mode 100755 (executable)
index 1968798..0000000
Binary files a/omap4/sgx/bin/sgx_init_test and /dev/null differ
diff --git a/omap4/sgx/bin/sgx_render_flip_test b/omap4/sgx/bin/sgx_render_flip_test
deleted file mode 100755 (executable)
index 56fffc0..0000000
Binary files a/omap4/sgx/bin/sgx_render_flip_test and /dev/null differ
diff --git a/omap4/sgx/bin/testwrap b/omap4/sgx/bin/testwrap
deleted file mode 100755 (executable)
index 08acd03..0000000
Binary files a/omap4/sgx/bin/testwrap and /dev/null differ
diff --git a/omap4/sgx/bin/texture_benchmark b/omap4/sgx/bin/texture_benchmark
deleted file mode 100755 (executable)
index ea6615b..0000000
Binary files a/omap4/sgx/bin/texture_benchmark and /dev/null differ
diff --git a/omap4/sgx/lib/egl/libEGL_POWERVR_SGX540_120.so b/omap4/sgx/lib/egl/libEGL_POWERVR_SGX540_120.so
deleted file mode 100644 (file)
index 53c25d8..0000000
Binary files a/omap4/sgx/lib/egl/libEGL_POWERVR_SGX540_120.so and /dev/null differ
diff --git a/omap4/sgx/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so b/omap4/sgx/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so
deleted file mode 100644 (file)
index 23f25de..0000000
Binary files a/omap4/sgx/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so and /dev/null differ
diff --git a/omap4/sgx/lib/egl/libGLESv2_POWERVR_SGX540_120.so b/omap4/sgx/lib/egl/libGLESv2_POWERVR_SGX540_120.so
deleted file mode 100644 (file)
index 3873717..0000000
Binary files a/omap4/sgx/lib/egl/libGLESv2_POWERVR_SGX540_120.so and /dev/null differ
diff --git a/omap4/sgx/lib/hw/gralloc.omap4.so b/omap4/sgx/lib/hw/gralloc.omap4.so
deleted file mode 100644 (file)
index 69646ab..0000000
Binary files a/omap4/sgx/lib/hw/gralloc.omap4.so and /dev/null differ
diff --git a/omap4/sgx/lib/libIMGegl.so b/omap4/sgx/lib/libIMGegl.so
deleted file mode 100644 (file)
index f15c576..0000000
Binary files a/omap4/sgx/lib/libIMGegl.so and /dev/null differ
diff --git a/omap4/sgx/lib/libPVRScopeServices.so b/omap4/sgx/lib/libPVRScopeServices.so
deleted file mode 100644 (file)
index 9af53b7..0000000
Binary files a/omap4/sgx/lib/libPVRScopeServices.so and /dev/null differ
diff --git a/omap4/sgx/lib/libglslcompiler.so b/omap4/sgx/lib/libglslcompiler.so
deleted file mode 100644 (file)
index 73753c4..0000000
Binary files a/omap4/sgx/lib/libglslcompiler.so and /dev/null differ
diff --git a/omap4/sgx/lib/libpvr2d.so b/omap4/sgx/lib/libpvr2d.so
deleted file mode 100644 (file)
index 2012c5e..0000000
Binary files a/omap4/sgx/lib/libpvr2d.so and /dev/null differ
diff --git a/omap4/sgx/lib/libpvrANDROID_WSEGL.so b/omap4/sgx/lib/libpvrANDROID_WSEGL.so
deleted file mode 100644 (file)
index 42f8577..0000000
Binary files a/omap4/sgx/lib/libpvrANDROID_WSEGL.so and /dev/null differ
diff --git a/omap4/sgx/lib/libsrv_init.so b/omap4/sgx/lib/libsrv_init.so
deleted file mode 100644 (file)
index 2cf6e5e..0000000
Binary files a/omap4/sgx/lib/libsrv_init.so and /dev/null differ
diff --git a/omap4/sgx/lib/libsrv_um.so b/omap4/sgx/lib/libsrv_um.so
deleted file mode 100644 (file)
index 61fcd0e..0000000
Binary files a/omap4/sgx/lib/libsrv_um.so and /dev/null differ
diff --git a/omap4/sgx/lib/libusc.so b/omap4/sgx/lib/libusc.so
deleted file mode 100644 (file)
index cc42111..0000000
Binary files a/omap4/sgx/lib/libusc.so and /dev/null differ
diff --git a/omap4/sgx/updatelibs.sh b/omap4/sgx/updatelibs.sh
deleted file mode 100755 (executable)
index 7a4b927..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-for a in `find bin lib -type f`; do
-cp ${ANDROID_PRODUCT_OUT}/target/`basename $a` $a 
-done
diff --git a/untar.sh b/untar.sh
new file mode 100755 (executable)
index 0000000..2e5b77f
--- /dev/null
+++ b/untar.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Args
+# $1 - Base path
+# $2 - base directory of the untarred component
+# $3 - name of the component archive
+
+
+if [ -d $1/$2 ]; then
+  echo "Removing $1/$2"
+  rm -rf $1/$2
+fi
+
+tar -C $1 -zxf $3