From: llandwerlin at gmail.com <llandwerlin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 26/41] linux-fusion: bump to 8.1.1
Date: Wed, 14 Apr 2010 01:05:59 +0200 [thread overview]
Message-ID: <1271199974-30434-27-git-send-email-llandwerlin@gmail.com> (raw)
In-Reply-To: <1271199974-30434-1-git-send-email-llandwerlin@gmail.com>
From: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
.../linux-fusion-8.0.2-cross-compile.patch | 100 --------------------
package/linux-fusion/linux-fusion.mk | 70 +++++---------
2 files changed, 24 insertions(+), 146 deletions(-)
delete mode 100644 package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch
diff --git a/package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch b/package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch
deleted file mode 100644
index 443ddf3..0000000
--- a/package/linux-fusion/linux-fusion-8.0.2-cross-compile.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -urN linux-fusion-8.0.2-0rig//linux/drivers/char/fusion/shmpool.c linux-fusion-8.0.2/linux/drivers/char/fusion/shmpool.c
---- linux-fusion-8.0.2-0rig//linux/drivers/char/fusion/shmpool.c 2008-09-29 12:20:44.000000000 +0200
-+++ linux-fusion-8.0.2/linux/drivers/char/fusion/shmpool.c 2009-01-11 17:00:19.000000000 +0100
-@@ -20,6 +20,8 @@
- #include <linux/slab.h>
- #include <linux/smp_lock.h>
- #include <linux/sched.h>
-+#include <asm/page.h>
-+#include <linux/mm.h>
-
- #include <linux/fusion.h>
-
-@@ -28,8 +30,6 @@
- #include "list.h"
- #include "shmpool.h"
-
--
--
- typedef struct {
- FusionLink link;
- unsigned long next_base;
-diff -urN linux-fusion-8.0.2-0rig//Makefile linux-fusion-8.0.2/Makefile
---- linux-fusion-8.0.2-0rig//Makefile 2008-09-29 12:20:44.000000000 +0200
-+++ linux-fusion-8.0.2/Makefile 2009-01-11 18:07:54.000000000 +0100
-@@ -17,13 +17,15 @@
-
-
- DESTDIR ?= $(SYSROOT)
--
-+HEADERDIR ?= $(SYSROOT)
-+# This location is valid for at least 2.6.27.10
-+KERNEL_FUSION_LIB=$(KERNEL_MODLIB)/kernel/drivers/char/fusion
-
- SUB = linux/drivers/char/fusion
-
- export CONFIG_FUSION_DEVICE=m
-
--
-+ARCH=$(ARCH)
- ifeq ($(DEBUG),yes)
- CPPFLAGS += -DFUSION_DEBUG_SKIRMISH_DEADLOCK
- endif
-@@ -45,25 +47,41 @@
- ln -s Makefile-2.$(K_PATCHLEVEL) $(SUB)/Makefile
- ifeq ($(call check-version,2,6,24),1)
- $(MAKE) -C $(KERNEL_BUILD) \
-- KCPPFLAGS="$(CPPFLAGS) -I`pwd`/linux/include" \
-+ ARCH=$(ARCH) \
-+ CC=$(CROSS_COMPILE)gcc \
-+ AS=$(CROSS_COMPILE)as \
-+ KCPPFLAGS="$(CPPFLAGS) \
-+ -I`pwd`/linux/include \
-+ -I$(KERNEL_SOURCE)/include \
-+ -I$(KERNEL_SOURCE)/arch/$(ARCH)/include" \
- SUBDIRS=`pwd`/$(SUB) modules
- else
- $(MAKE) -C $(KERNEL_BUILD) \
-- CPPFLAGS="$(CPPFLAGS) -D__KERNEL__ -I`pwd`/linux/include -I$(KERNEL_BUILD)/include -I$(KERNEL_SOURCE)/include $(AUTOCONF_H)" \
-+ ARCH=$(ARCH) \
-+ CC=$(CROSS_COMPILE)gcc \
-+ AS=$(CROSS_COMPILE)as \
-+ CPPFLAGS="$(CPPFLAGS) \
-+ -I`pwd`/linux/include \
-+ -I$(KERNEL_BUILD)/include \
-+ -I$(KERNEL_SOURCE)/include \
-+ -I$(KERNEL_SOURCE)/arch/$(ARCH)/include \
-+ $(AUTOCONF_H)" \
- SUBDIRS=`pwd`/$(SUB) modules
- endif
-
--install: all
-+#-D__KERNEL__
-+#-DHAVE_LINUX_CONFIG_H \
-+
-+install: all install-header
- install -d $(DESTDIR)/usr/include/linux
- install -m 644 linux/include/linux/fusion.h $(DESTDIR)/usr/include/linux
--
-- install -d $(DESTDIR)$(KERNEL_MODLIB)/drivers/char/fusion
-+ install -d $(DESTDIR)$(KERNEL_FUSION_LIB)
-
- ifeq ($(K_PATCHLEVEL),4)
-- install -m 644 $(SUB)/fusion.o $(DESTDIR)$(KERNEL_MODLIB)/drivers/char/fusion
-+ install -m 644 $(SUB)/fusion.o $(DESTDIR)$(KERNEL_FUSION_LIB)
- rm -f $(DESTDIR)$(KERNEL_MODLIB)/fusion.o
- else
-- install -m 644 $(SUB)/fusion.ko $(DESTDIR)$(KERNEL_MODLIB)/drivers/char/fusion
-+ install -m 644 $(SUB)/fusion.ko $(DESTDIR)$(KERNEL_FUSION_LIB)
- rm -f $(DESTDIR)$(KERNEL_MODLIB)/fusion.ko
- endif
- ifneq ($(strip $(DESTDIR)),)
-@@ -72,6 +90,8 @@
- /sbin/depmod -ae $(KERNEL_VERSION)
- endif
-
-+install-header:
-+ install -m 644 linux/include/linux/fusion.h $(HEADERDIR)/usr/include/linux
-
-
- clean:
diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index 058e965..abce465 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -3,77 +3,55 @@
# linux-fusion
#
#############################################################
-LINUX_FUSION_VERSION = 8.0.2
+LINUX_FUSION_VERSION = 8.1.1
LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
-LINUX_FUSION_SITE = http://www.directfb.org/downloads/Core/
-LINUX_FUSION_AUTORECONF = NO
+LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
LINUX_FUSION_INSTALL_STAGING = YES
LINUX_FUSION_INSTALL_TARGET = YES
# BR2_LINUX26_VERSION is not really dependable
# LINUX26_VERSION is not yet set.
# Retrieve REAL kernel version from file.
-LINUX_FOR_FUSION=`cat $(BUILD_DIR)/.linux-version`
+LINUX_FOR_FUSION=$(LINUX_VERSION)
+# `cat $(BUILD_DIR)/.linux-version`
+LINUX_FUSION_ETC_DIR=$(TARGET_DIR)/etc/udev/rules.d
-LINUX_FUSION_DIR:=$(BUILD_DIR)/linux-fusion-$(LINUX_FUSION_VERSION)
-LINUX_FUSION_ETC_DIR:=$(TARGET_DIR)/etc/udev/rules.d
+LINUX_FUSION_CAT=$(ZCAT)
-LINUX_FUSION_CAT:=$(ZCAT)
-
-LINUX_FUSION_MAKE_OPTS:= KERNEL_VERSION=$(LINUX_FOR_FUSION)
+LINUX_FUSION_MAKE_OPTS = KERNEL_VERSION=$(LINUX_FOR_FUSION)
LINUX_FUSION_MAKE_OPTS += KERNEL_BUILD=$(BUILD_DIR)/linux-$(LINUX_FOR_FUSION)
LINUX_FUSION_MAKE_OPTS += KERNEL_SOURCE=$(BUILD_DIR)/linux-$(LINUX_FOR_FUSION)
LINUX_FUSION_MAKE_OPTS += SYSROOT=$(STAGING_DIR)
-LINUX_FUSION_MAKE_OPTS += ARCH=$(BR2_ARCH)
+LINUX_FUSION_MAKE_OPTS += ARCH=$(KERNEL_ARCH)
LINUX_FUSION_MAKE_OPTS += CROSS_COMPILE=$(TARGET_CROSS)
LINUX_FUSION_MAKE_OPTS += KERNEL_MODLIB=/lib/modules/$(LINUX_FOR_FUSION)
LINUX_FUSION_MAKE_OPTS += DESTDIR=$(BUILD_DIR)/root
LINUX_FUSION_MAKE_OPTS += HEADERDIR=$(STAGING_DIR)
-#LINUX_FUSION_MAKE_OPTS +=
+#LINUX_FUSION_MAKE_OPTS +=
#LINUX_FUSION_MAKE_OPTS += __KERNEL__=$(LINUX26_VERSION)
-$(DL_DIR)/$(LINUX_FUSION_SOURCE):
- $(call DOWNLOAD,$(LINUX_FUSION_SITE),$(LINUX_FUSION_SOURCE))
-
-$(LINUX_FUSION_DIR)/.unpacked: $(DL_DIR)/$(LINUX_FUSION_SOURCE)
- $(LINUX_FUSION_CAT) $(DL_DIR)/$(LINUX_FUSION_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(LINUX_FUSION_DIR) package/linux-fusion/ linux-fusion\*.patch
- touch $@
-$(LINUX_FUSION_DIR)/.install: $(LINUX_FUSION_DIR)/.unpacked
+define LINUX_FUSION_INSTALL_STAGING_CMDS
mkdir -p $(STAGING_DIR)/lib/modules/$(LINUX_FOR_FUSION)/source/include/linux
- echo "LINUX=$(LINUX26_VERSION)"
$(MAKE) $(TARGET_CONFIGURE_OPTS) \
$(LINUX_FUSION_MAKE_OPTS) \
- -C $(LINUX_FUSION_DIR) install
- rm -f $(TARGET_DIR)/usr/include/linux/fusion.h
+ 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)
- touch $@
-
-
-linux-fusion-source: $(DL_DIR)/$(LINUX_FUSION_SOURCE)
+endef
-linux-fusion-unpacked: $(LINUX_FUSION_DIR)/.unpacked
-
-linux-fusion: linux26 $(LINUX_FUSION_DIR)/.install
-
-linux-fusion-clean:
- -$(MAKE) -C $(LINUX_FUSION_DIR) clean
- rm -f $(STAGING_DIR)/usr/include/linux/fusion.h
- rm -rf $(TARGET_DIR)/lib/modules/$(LINUX_FOR_FUSION)/drivers/char/fusion
- rm -f $(LINUX_FUSION_DIR)/.install
-
-linux-fusion-dirclean:
- rm -rf $(LINUX_FUSION_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LINUX_FUSION),y)
-TARGETS+=linux-fusion
-endif
+define LINUX_FUSION_UNINSTALL_TARGET_UDEV
+ rm -f $(LINUX_FUSION_ETC_DIR)/40-fusion.rules
+endef
+$(eval $(call GENTARGETS,package,linux-fusion))
--
1.7.0.4
next prev parent reply other threads:[~2010-04-13 23:05 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-13 23:05 [Buildroot] [pull request] Pull request for various bumps llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 01/41] package: Force copy of .la files at the post install hook (readonly files might be problematic) llandwerlin at gmail.com
2010-04-14 13:11 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 02/41] ncurses: convert to autotools infrastructure llandwerlin at gmail.com
2010-04-14 7:41 ` Peter Korsgaard
2010-04-14 8:39 ` Lionel Landwerlin
2010-04-14 13:15 ` Thomas Petazzoni
2010-04-14 13:17 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 03/41] ncurses: fix path to patch ncurses5-config llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 04/41] lua: conversion to new package infrastructure llandwerlin at gmail.com
2010-04-14 13:19 ` Thomas Petazzoni
2010-04-14 15:25 ` Thomas Petazzoni
2010-04-14 17:24 ` Peter Korsgaard
2010-04-13 23:05 ` [Buildroot] [PATCH 05/41] package: Add $(HOST_DIR)/usr/lib to LD_LIBRARY_PATH for host but not target llandwerlin at gmail.com
2010-04-14 13:26 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 06/41] Rework icu package on top of the generic infrastructure llandwerlin at gmail.com
2010-04-14 15:18 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 07/41] external toolchain: fix strip of libraries llandwerlin at gmail.com
2010-04-14 13:41 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 08/41] ext-toolchain: remove pkgconfig files from the external toolchain llandwerlin at gmail.com
2010-04-14 13:42 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 09/41] scripts: force copy of files to erase already present and readonly files llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 10/41] package: added PKG_CONF_ENV variables to host packages llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 11/41] sysstat: drop target installation option (it's on by default) llandwerlin at gmail.com
2010-04-14 13:59 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 12/41] directfb: bump to 1.4.3 llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 13/41] package: added lirc llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 14/41] directfb: added support for lirc llandwerlin at gmail.com
2010-04-14 7:45 ` Peter Korsgaard
2010-04-14 14:02 ` Thomas Petazzoni
2010-04-13 23:05 ` [Buildroot] [PATCH 15/41] directfb: added directfb tests installation option llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 16/41] directfb: drop forced linux-fusion with multiapp llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 17/41] pixman: disable GTK+ tests, let the others => remove patch to disable tests llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 18/41] cairo: bump to 1.8.10 llandwerlin at gmail.com
2010-04-14 7:54 ` Peter Korsgaard
2010-04-13 23:05 ` [Buildroot] [PATCH 19/41] cairo: drop target installation option (it's on by default) llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 20/41] systat: bump to 9.0.6 llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 21/41] automake: bump to 1.11 llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 22/41] libtool: added LIBTOOLIZE variable to point on $(HOST_DIR)/usr/bin/libtoolize llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 23/41] autoconf: added AUTOHEADER variable llandwerlin at gmail.com
2010-04-14 8:18 ` Peter Korsgaard
2010-04-14 8:37 ` Lionel Landwerlin
2010-04-14 9:44 ` Peter Korsgaard
2010-04-14 9:48 ` Lionel Landwerlin
2010-04-13 23:05 ` [Buildroot] [PATCH 24/41] target: Added ttyAS[0-3] devices llandwerlin at gmail.com
2010-04-13 23:05 ` [Buildroot] [PATCH 25/41] openssh: added empty login option llandwerlin at gmail.com
2010-04-14 7:51 ` Peter Korsgaard
2010-04-13 23:05 ` llandwerlin at gmail.com [this message]
2010-04-14 8:16 ` [Buildroot] [PATCH 26/41] linux-fusion: bump to 8.1.1 Peter Korsgaard
2010-04-14 8:35 ` Lionel Landwerlin
2010-04-13 23:06 ` [Buildroot] [PATCH 27/41] linux-fusion: drop target installation option (it's on by default) llandwerlin at gmail.com
2010-04-14 8:16 ` Peter Korsgaard
2010-04-13 23:06 ` [Buildroot] [PATCH 28/41] valgrind: conversion to autotool infrastructure llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 29/41] valgrind: bump to 3.5.0 llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 30/41] webkit: setup icu-config util path llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 31/41] webkit: drop target installation option (it's on by default) llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 32/41] package: add libgnutls package llandwerlin at gmail.com
2010-04-14 7:56 ` Peter Korsgaard
2010-04-14 15:26 ` Thomas Petazzoni
2010-04-13 23:06 ` [Buildroot] [PATCH 33/41] libsoup: bump to 2.28.2 llandwerlin at gmail.com
2010-04-14 7:58 ` Peter Korsgaard
2010-05-04 22:15 ` Sven Neumann
2010-04-13 23:06 ` [Buildroot] [PATCH 34/41] libsoup: drop target installation option (it's on by default) llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 35/41] package: add libgail package llandwerlin at gmail.com
2010-04-14 8:13 ` Peter Korsgaard
2010-04-14 8:33 ` Lionel Landwerlin
2010-04-13 23:06 ` [Buildroot] [PATCH 36/41] libgtk2: force to compile png loader in gdk-pixbuf llandwerlin at gmail.com
2010-04-14 8:00 ` Peter Korsgaard
2010-04-13 23:06 ` [Buildroot] [PATCH 37/41] libglib2: bump to 2.24.0 llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 38/41] atk: bump to 1.30 llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 39/41] autoconf: added missing AUTOMAKE variable setting llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 40/41] pango: bump to 1.28 llandwerlin at gmail.com
2010-04-13 23:06 ` [Buildroot] [PATCH 41/41] webkit: bump to 1.2.0 llandwerlin at gmail.com
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1271199974-30434-27-git-send-email-llandwerlin@gmail.com \
--to=llandwerlin@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox