From 04ed50d2e11b2177cde2d1f9dd03b93850a5d67f Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 5 Aug 2008 20:49:28 +0000 Subject: [PATCH] fix lirc compile and move its build dir to the right place git-svn-id: svn://svn.openwrt.org/openwrt/packages@12158 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- utils/lirc/Makefile | 2 +- utils/lirc/patches/100-kcompat.patch | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 utils/lirc/patches/100-kcompat.patch diff --git a/utils/lirc/Makefile b/utils/lirc/Makefile index d9b011bd2..8fd36897d 100644 --- a/utils/lirc/Makefile +++ b/utils/lirc/Makefile @@ -18,7 +18,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/${PKG_NAME} PKG_MD5SUM:=8e78eeded7b31e5ad02e328970437c0f -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/utils/lirc/patches/100-kcompat.patch b/utils/lirc/patches/100-kcompat.patch new file mode 100644 index 000000000..59073eee3 --- /dev/null +++ b/utils/lirc/patches/100-kcompat.patch @@ -0,0 +1,16 @@ +--- a/drivers/kcompat.h ++++ b/drivers/kcompat.h +@@ -53,7 +53,13 @@ + + #else /* >= 2.6.15 */ + ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) ++#define lirc_class_device_create device_create_drvdata ++#define class_device_destroy device_destroy ++#else + #define lirc_class_device_create class_device_create ++#endif ++ + #define LIRC_DEVFS_PREFIX + + #endif