diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/nvidia-drivers | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/nvidia-drivers')
| -rw-r--r-- | packages/nvidia-drivers/files/nvaudio-remap_page_range.patch | 27 | ||||
| -rw-r--r-- | packages/nvidia-drivers/files/nvidia-oe-conftest.patch | 60 | ||||
| -rw-r--r-- | packages/nvidia-drivers/nvidia-display_1.0-8756.bb | 48 | ||||
| -rw-r--r-- | packages/nvidia-drivers/nvidia-drivers.inc | 53 | ||||
| -rw-r--r-- | packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb | 71 |
5 files changed, 0 insertions, 259 deletions
diff --git a/packages/nvidia-drivers/files/nvaudio-remap_page_range.patch b/packages/nvidia-drivers/files/nvaudio-remap_page_range.patch deleted file mode 100644 index e653d43a76..0000000000 --- a/packages/nvidia-drivers/files/nvaudio-remap_page_range.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- NFORCE-Linux-x86-1.0-0310-pkg1/nvsound/main/Makefile.kbuild.sav 2006-05-16 09:44:26.000000000 -0600 -+++ NFORCE-Linux-x86-1.0-0310-pkg1/nvsound/main/Makefile.kbuild 2006-05-16 09:48:57.000000000 -0600 -@@ -48,16 +48,16 @@ - EXTRA_LDFLAGS := -d - - # Figure out how many args remap_page_ranges() wants or new remap call --ifeq ($(shell sh $(src)/conftest.sh "$(CC)" "$(KERNEL_SOURCES)" "$(KERNEL_OUTPUT)" remap_pfn_range), 1) -+#ifeq ($(shell sh $(src)/conftest.sh "$(CC)" "$(KERNEL_SOURCES)" "$(KERNEL_OUTPUT)" remap_pfn_range), 1) - EXTRA_CFLAGS += -DNV_REMAP_PFN_RANGE_PRESENT --else -- REMAP_PAGE_RANGE := $(shell sh $(src)/conftest.sh "$(CC)" "$(KERNEL_SOURCES)" "$(KERNEL_OUTPUT)" remap_page_range) -- -- ifeq ($(REMAP_PAGE_RANGE),5) -- EXTRA_CFLAGS += -DREMAP_NEW -- endif -+#else -+# REMAP_PAGE_RANGE := $(shell sh $(src)/conftest.sh "$(CC)" "$(KERNEL_SOURCES)" "$(KERNEL_OUTPUT)" remap_page_range) - --endif -+# ifeq ($(REMAP_PAGE_RANGE),5) -+# EXTRA_CFLAGS += -DREMAP_NEW -+# endif -+# -+#endif - - PATCHLEVEL ?= $(shell sh ./conftest.sh "$(CC)" "$(KERNEL_SOURCES)" "$(KERNEL_OUTPUT)" kernel_patch_level) - ifeq ($(PATCHLEVEL), 4) diff --git a/packages/nvidia-drivers/files/nvidia-oe-conftest.patch b/packages/nvidia-drivers/files/nvidia-oe-conftest.patch deleted file mode 100644 index 6eae764d1c..0000000000 --- a/packages/nvidia-drivers/files/nvidia-oe-conftest.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- ../../../temp/NVIDIA-Linux-x86-1.0-8756-pkg1/usr/src/nv/Makefile.kbuild 2006-03-29 16:02:20.000000000 -0700 -+++ nv/Makefile.kbuild 2006-04-26 13:50:47.249353208 -0600 -@@ -28,7 +28,7 @@ - # Christian Zander (zander@mail.minion.de) (enhancements) - # - --all: install -+all: module - install: package-install - - # -@@ -310,19 +310,17 @@ - # sufficient privileges. Rebuild the module dependency file. - # - --module-install: suser-sanity-check module -+module-install: module - @mkdir -p $(MODULE_ROOT)/video; \ -- install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video; \ -- PATH="$(PATH):/bin:/sbin" depmod -ae; -+ install -m 0664 $(MODULE_OBJECT) $(MODULE_ROOT)/video; \ -+ #PATH="$(PATH):/bin:/sbin" depmod -ae; - - # - # This target builds, then installs, then creates device nodes and inserts - # the module, if successful. - # - --package-install: module-install rmmod-sanity-check -- PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && \ -- echo "$(MODULE_OBJECT) installed successfully."; -+package-install: module-install - - # - # Build an object file suitable for further processing by the installer and ---- ../../../temp/NVIDIA-Linux-x86-1.0-8756-pkg1/usr/src/nv/Makefile.nvidia 2006-03-29 16:02:20.000000000 -0700 -+++ nv/Makefile.nvidia 2006-04-26 13:52:19.573317832 -0600 -@@ -102,7 +102,7 @@ - - VERSION_HDR=nv_compiler.h - --all: install -+all: module - - install: package-install - -@@ -123,11 +123,9 @@ - mdl: gcc-sanity-check rivafb-sanity-check $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE) - $(LD) -r -o nvidia.o $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE) - --package-install: module suser-sanity-check rmmod-sanity-check -+package-install: module - mkdir -p $(MODULE_ROOT)/video && \ -- install -m 0664 -o root -g root nvidia.o $(MODULE_ROOT)/video/nvidia.o$(O) && \ -- PATH="$(PATH):/bin:/sbin" depmod -a && \ -- PATH="$(PATH):/bin:/sbin" modprobe nvidia && \ -+ install -m 0664 nvidia.o $(MODULE_ROOT)/video/nvidia.o$(O) && \ - echo "nvidia.o installed successfully."; \ - - $(VERSION_HDR): diff --git a/packages/nvidia-drivers/nvidia-display_1.0-8756.bb b/packages/nvidia-drivers/nvidia-display_1.0-8756.bb deleted file mode 100644 index a255025e0c..0000000000 --- a/packages/nvidia-drivers/nvidia-display_1.0-8756.bb +++ /dev/null @@ -1,48 +0,0 @@ -# nvidia-display .bb build file -# Copyright (C) 2005-2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see /COPYING) - -require nvidia-drivers.inc - -PKG_BASENAME="NVIDIA-Linux-${NVIDIA_ARCH}-${PV}-${NVIDIA_PKGRUN}" - -SRC_URI="http://download.nvidia.com/XFree86/Linux-${NVIDIA_ARCH}/${PV}/${PKG_BASENAME}.run \ - file://nvidia-oe-conftest.patch;patch=1" - -S="${WORKDIR}/${PKG_BASENAME}/usr/src/nv" - -EXTRA_OEMAKE=" KERNEL_SOURCES=${STAGING_KERNEL_DIR} KERNEL_MODLIB=${STAGING_KERNEL_DIR} KERNEL_UNAME=${KERNEL_VERSION} PATCHLEVEL=${KERNEL_PATCHLEVEL} MODULE_ROOT=${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers IGNORE_CC_MISMATCH=1" - -FILES_${PN} += " /usr/lib /usr/bin /usr/share" - -do_configure() { - rm -f ${S}/makefile - if [ "${KERNEL_PATCHLEVEL}" != "4" ] ; then - ln -sf Makefile.kbuild ${S}/Makefile - else - ln -sf Makefile.nvidia ${S}/Makefile - fi -} - -do_install() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" install - - install -d ${D}/usr - for dir in bin include lib share ; do - cp -pPR ${WORKDIR}/${PKG_BASENAME}/usr/$dir ${D}/usr/ - done - - #X11R7.0 style... - install -d ${D}/usr/lib/xorg/ - cp ${WORKDIR}/${PKG_BASENAME}/usr/X11R6/lib/lib* ${D}/usr/lib/ - cp -pPR ${WORKDIR}/${PKG_BASENAME}/usr/X11R6/lib/modules ${D}/usr/lib/xorg/ - ln -s libglx.so.1.0.8756 ${D}/usr/lib/xorg/modules/extensions/libglx.so - -} - -do_stage() { - #Not sure what we need here. This looks like it provides GL - : -} - diff --git a/packages/nvidia-drivers/nvidia-drivers.inc b/packages/nvidia-drivers/nvidia-drivers.inc deleted file mode 100644 index fbb28cb01d..0000000000 --- a/packages/nvidia-drivers/nvidia-drivers.inc +++ /dev/null @@ -1,53 +0,0 @@ -# nvidia-display .bb build file -# Copyright (C) 2005-2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see /COPYING) - -HOMEPAGE="http://www.nvidia.com/object/unix.html" -DESCRIPTION="NVidia Graphics Driver Binary" -LICENSE = "NVIDIA" - -inherit module -INHIBIT_PACKAGE_STRIP="1" - -def nvidia_pkgrun(d): - import bb, re - arch = bb.data.getVar('TARGET_ARCH', d, 1) - pkgrun = "pkg2" - if re.match("^i.86$", arch): - pkgrun = "pkg1" - return pkgrun - -def nvidia_arch(d): - import bb, re - arch = bb.data.getVar('TARGET_ARCH', d, 1) - if re.match("^i.86$", arch): - arch = "x86" - return arch - -def get_kernelpatchlevel(p): - import re - r = re.compile("[0-9]+\.([0-9]+).*") - m = r.match(p); - if m: - return m.group(1) - return None - -NVIDIA_ARCH := "${@nvidia_arch(d)}" -NVIDIA_PKGRUN := "${@nvidia_pkgrun(d)}" - -COMPATIBLE_HOST = '.*86.*-linux' - -KERNEL_PATCHLEVEL = "${@get_kernelpatchlevel('${KERNEL_VERSION}')}" -EXTRA_OEMAKE=" KERNEL_SOURCES=${STAGING_KERNEL_DIR} KERNEL_MODLIB=${STAGING_KERNEL_DIR} KERNEL_UNAME=${KERNEL_VERSION} PATCHLEVEL=${KERNEL_PATCHLEVEL} MODULE_ROOT=${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers IGNORE_CC_MISMATCH=1" - -PKG_BASENAME="NVIDIA-Linux-${NVIDIA_ARCH}-${PV}-${NVIDIA_PKGRUN}" - -nvidia_do_unpack() { - sh ${PKG_BASENAME}.run -x -} - -python do_unpack() { - bb.build.exec_func('base_do_unpack', d) - bb.build.exec_func('nvidia_do_unpack', d) -} - diff --git a/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb b/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb deleted file mode 100644 index 0005b24d39..0000000000 --- a/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb +++ /dev/null @@ -1,71 +0,0 @@ -# nvidia-display .bb build file -# Copyright (C) 2005-2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see /COPYING) - -require nvidia-drivers.inc - -PKG_BASENAME="NFORCE-Linux-${NVIDIA_ARCH}-${PV}-${NVIDIA_PKGRUN}" - -SRC_URI="http://download.nvidia.com/XFree86/nforce/${PV}/NFORCE-Linux-${NVIDIA_ARCH}-${PV}-${NVIDIA_PKGRUN}.run \ - file://nvaudio-remap_page_range.patch;patch=1" - -S="${WORKDIR}/${PKG_BASENAME}" - -EXTRA_OEMAKE=" KERNEL_SOURCES=${STAGING_KERNEL_DIR} TARGET_KERNEL=${KERNEL_VERSION} INSTROOT=${D} IGNORE_CC_MISMATCH=1" - -FILES_${PN} += " /usr/lib /usr/bin" - -do_compile() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - - cd nvnet - oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ - KERNEL_SRC=${STAGING_KERNEL_DIR} \ - KERNEL_VERSION=${KERNEL_VERSION} \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - ${MAKE_TARGETS} - - cd ../nvsound/main - oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ - KERNEL_SRC=${STAGING_KERNEL_DIR} \ - KERNEL_VERSION=${KERNEL_VERSION} \ - CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ - ${MAKE_TARGETS} - -} - -do_configure() { - rm -f ${S}/nvnet/makefile - rm -f ${S}/nvsound/main/makefile - - if [ "${KERNEL_PATCHLEVEL}" != "4" ] ; then - ln -sf Makefile.kbuild ${S}/nvnet/Makefile - ln -sf Makefile.kbuild ${S}/nvsound/main/Makefile - else - ln -sf Makefile.nvidia ${S}/nvnet/Makefile - ln -sf Makefile.nvidia ${S}/nvsound/main/Makefile - fi -} - - -do_install() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - - cd nvnet - oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" install - - cd ../nvsound/main - oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" install - - install -d ${D}/usr - for dir in usr/bin nvsound/lib ; do - cp -pPR ${S}/$dir ${D}/usr/ - done - -} - -do_stage() { - install -d ${STAGING_LIBDIR} - oe_libinstall -a -C ${S}/nvsound/lib libnvalut ${STAGING_LIBDIR} - oe_libinstall -a -C ${S}/nvsound/lib libnvopenal ${STAGING_LIBDIR} -} |
