Commit 1c962699 authored by Lionel Landwerlin's avatar Lionel Landwerlin Committed by Peter Korsgaard
Browse files

linux-fusion: bump to 8.1.2 



Signed-off-by: default avatarLionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 56fe2bc6

package/linux-fusion/linux-fusion-8.1.1-missing-include.patch

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
fusiondev.c does not compile due to TASK_INTERRUPTIBLE and other

related constants not being defined.



Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



Index: linux-fusion-8.1.1/linux/drivers/char/fusion/fusiondev.c

===================================================================

--- linux-fusion-8.1.1.orig/linux/drivers/char/fusion/fusiondev.c	2010-07-16 22:49:23.000000000 +0200

+++ linux-fusion-8.1.1/linux/drivers/char/fusion/fusiondev.c	2010-07-16 22:49:39.000000000 +0200

@@ -32,6 +32,7 @@

 #include <linux/proc_fs.h>

 #include <linux/poll.h>

 #include <linux/init.h>

+#include <linux/sched.h>

 #include <asm/io.h>

 #include <asm/uaccess.h>

package/linux-fusion/linux-fusion-8.1.2-fix-warnings-at-link-time.patch

0 → 100644
+40 −0
Original line number Diff line number Diff line 
From 7884688ba7a2e4cb7772cbedb34245a7fc9bf9d9 Mon Sep 17 00:00:00 2001

From: Lionel Landwerlin <llandwerlin@gmail.com>

Date: Wed, 3 Nov 2010 10:25:17 +0100

Subject: [PATCH] Fix warnings at link time



Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>

---

 linux/drivers/char/fusion/entries.c   |    2 +-

 linux/drivers/char/fusion/fusiondev.c |    2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)



diff --git a/linux/drivers/char/fusion/entries.c b/linux/drivers/char/fusion/entries.c

index 11edd43..8d102cf 100644

--- a/linux/drivers/char/fusion/entries.c

+++ b/linux/drivers/char/fusion/entries.c

@@ -28,7 +28,7 @@

 #include "fusiondev.h"

 #include "entries.h"

 

-struct timeval now;

+static struct timeval now;

 

 void

 fusion_entries_init(FusionEntries * entries,

diff --git a/linux/drivers/char/fusion/fusiondev.c b/linux/drivers/char/fusion/fusiondev.c

index 2457bc1..7c7680d 100644

--- a/linux/drivers/char/fusion/fusiondev.c

+++ b/linux/drivers/char/fusion/fusiondev.c

@@ -64,7 +64,7 @@

 MODULE_LICENSE("GPL");

 MODULE_AUTHOR("Denis Oliver Kropp <dok@directfb.org>");

 

-struct proc_dir_entry *proc_fusion_dir;

+static struct proc_dir_entry *proc_fusion_dir;

 

 static int fusion_major = FUSION_MAJOR;

 

-- 

1.6.0.6

package/linux-fusion/linux-fusion.mk

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# linux-fusion

#

#############################################################

LINUX_FUSION_VERSION = 8.1.1

LINUX_FUSION_VERSION = 8.1.2

LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz

LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion

LINUX_FUSION_INSTALL_STAGING = YES
@@ -25,14 +25,14 @@ define LINUX_FUSION_BUILD_CMDS 
	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(LINUX_FUSION_MAKE_OPTS) -C $(@D)

endef



# Only the header file is needed in the staging directory

define LINUX_FUSION_INSTALL_STAGING_CMDS

	install -m 644 $(@D)/linux/include/linux/fusion.h $(STAGING_DIR)/usr/include/linux

	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(LINUX_FUSION_MAKE_OPTS) INSTALL_MOD_PATH=$(STAGING_DIR) -C $(@D) headers_install

endef



define LINUX_FUSION_INSTALL_TARGET_CMDS

	$(MAKE) $(TARGET_CONFIGURE_OPTS) \

		$(LINUX_FUSION_MAKE_OPTS) \

		INSTALL_MOD_PATH=$(TARGET_DIR) \

		-C $(@D) install

	mkdir -p $(LINUX_FUSION_ETC_DIR)

	cp -dpf package/linux-fusion/40-fusion.rules $(LINUX_FUSION_ETC_DIR)