From 93c039a50c53de6e80ae798f5cbe422187355736 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 11 Jul 2007 13:17:47 +0000 Subject: [PATCH] * merged r21439 from kernel-cleanup2: * updated dfb-linux-fusion (3.2 -> 3.2.3) git-svn-id: svn://svn.opensde.net/opensde/package/trunk@21662 10447126-35f2-4685-b0cf-6dd780d3921f --- video/dfb-linux-fusion/dfb-linux-fusion.conf | 12 ++--- video/dfb-linux-fusion/dfb-linux-fusion.desc | 6 +-- video/dfb-linux-fusion/kernel-version.patch | 53 -------------------- video/dfb-linux-fusion/pkg_linux26_post.conf | 16 ------ video/dfb-linux-fusion/postlinux.conf | 23 --------- 5 files changed, 8 insertions(+), 102 deletions(-) delete mode 100644 video/dfb-linux-fusion/kernel-version.patch delete mode 100644 video/dfb-linux-fusion/pkg_linux26_post.conf delete mode 100644 video/dfb-linux-fusion/postlinux.conf diff --git a/video/dfb-linux-fusion/dfb-linux-fusion.conf b/video/dfb-linux-fusion/dfb-linux-fusion.conf index af7c45f76..367a70a7f 100644 --- a/video/dfb-linux-fusion/dfb-linux-fusion.conf +++ b/video/dfb-linux-fusion/dfb-linux-fusion.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../dfb-linux-fusion/dfb-linux-fusion.conf +# Filename: package/.../dfb-linux-fusion/dfb-linux-fusion.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -10,17 +11,14 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- - -makeopt="" -makeinstopt="" +# --- SDE-COPYRIGHT-NOTE-END --- dfbfusion_setup () { pkginstalled udev && { cat > $root/etc/udev/rules.d/70-dfb-fusion.rules <<-EOT # DirectFB fusion devices -KERNEL="fusion[0-9]*", NAME="fusion/%n", SYMLINK="%k" root,root,0666 +KERNEL="fusion[0-9]*", NAME="fusion/%n", SYMLINK="%k", GROUP="root", MODE="0666" EOT } diff --git a/video/dfb-linux-fusion/dfb-linux-fusion.desc b/video/dfb-linux-fusion/dfb-linux-fusion.desc index d56aeb4f6..5a7210c9f 100644 --- a/video/dfb-linux-fusion/dfb-linux-fusion.desc +++ b/video/dfb-linux-fusion/dfb-linux-fusion.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../dfb-linux-fusion/dfb-linux-fusion.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] [COPY] More information can be found in the files COPYING and README. @@ -33,8 +33,8 @@ [L] GPL [S] Beta -[V] 3.2 +[V] 3.2.3 [P] O -----5---9 136.400 -[D] 460515178 linux-fusion-3.2.tar.gz http://www.directfb.org/downloads/Core/ +[D] 2218598852 linux-fusion-3.2.3.tar.gz http://www.directfb.org/downloads/Core/ diff --git a/video/dfb-linux-fusion/kernel-version.patch b/video/dfb-linux-fusion/kernel-version.patch deleted file mode 100644 index 013443042..000000000 --- a/video/dfb-linux-fusion/kernel-version.patch +++ /dev/null @@ -1,53 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../dfb-linux-fusion/kernel-version.patch -# Copyright (C) 2006 The OpenSDE Project -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- linux-fusion-3.0/Makefile.orig 2006-04-30 13:33:39.000000000 +0200 -+++ linux-fusion-3.0/Makefile 2006-05-03 09:19:50.000000000 +0200 -@@ -1,7 +1,8 @@ --KERNEL_MODLIB = /lib/modules/$(shell uname -r) -+LINUXVERSION ?= $(shell uname -r) -+KERNEL_MODLIB = /lib/modules/$(LINUXVERSION) - KERNEL_BUILD = $(KERNEL_MODLIB)/build - KERNEL_SOURCE = $(KERNEL_MODLIB)/source --KERNEL_PATCHLEVEL = $(shell uname -r | cut -d . -f 2) -+KERNEL_PATCHLEVEL = $(shell echo $(LINUXVERSION) | cut -d . -f 2) - #KERNEL_PATCHLEVEL = $(shell grep 'PATCHLEVEL =' $(KERNEL_BUILD)/Makefile | cut -d ' ' -f 3) - - SUB = linux/drivers/char/fusion -@@ -24,9 +25,6 @@ - SUBDIRS=`pwd`/$(SUB) modules - --install: all -- install -d $(DESTDIR)/usr/include/linux -- install -m 644 linux/include/linux/fusion.h $(DESTDIR)/usr/include/linux -- -+install: - install -d $(DESTDIR)$(KERNEL_MODLIB)/drivers/char/fusion - - ifeq ($(KERNEL_PATCHLEVEL),4) -@@ -36,11 +34,6 @@ - install -m 644 $(SUB)/fusion.ko $(DESTDIR)$(KERNEL_MODLIB)/drivers/char/fusion - rm -f $(DESTDIR)$(KERNEL_MODLIB)/fusion.ko - endif --ifneq ($(strip $(DESTDIR)),) -- /sbin/depmod -ae -b $(DESTDIR) --else -- /sbin/depmod -ae --endif - - - diff --git a/video/dfb-linux-fusion/pkg_linux26_post.conf b/video/dfb-linux-fusion/pkg_linux26_post.conf deleted file mode 100644 index c506b97cf..000000000 --- a/video/dfb-linux-fusion/pkg_linux26_post.conf +++ /dev/null @@ -1,16 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../dfb-linux-fusion/pkg_linux26_post.conf -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- - -var_append lx_3rd_party_modules " " "dfb-linux-fusion" - diff --git a/video/dfb-linux-fusion/postlinux.conf b/video/dfb-linux-fusion/postlinux.conf deleted file mode 100644 index d3737b1b0..000000000 --- a/video/dfb-linux-fusion/postlinux.conf +++ /dev/null @@ -1,23 +0,0 @@ - -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../dfb-linux-fusion/postlinux.conf -# Copyright (C) 2006 The OpenSDE Project -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- SDE-COPYRIGHT-NOTE-END --- - -var_append makeopt " " "CC=$KCC" - -var_append makeopt " " "LINUXVERSION=${lx_kernelrelease} KERNEL_MODLIB=$moduledir" - -var_append makeinstopt " " "LINUXVERSION=${lx_kernelrelease}" -var_append makeinstopt " " "KERNEL_MODLIB=/lib/modules/${lx_kernelrelease}/kernel" -