move ltq-ifxos
authorJohn Crispin <john@openwrt.org>
Sat, 15 Dec 2012 02:00:26 +0000 (02:00 +0000)
committerJohn Crispin <john@openwrt.org>
Sat, 15 Dec 2012 02:00:26 +0000 (02:00 +0000)
SVN-Revision: 34692

package/ltq-ifxos/Makefile [deleted file]
package/ltq-ifxos/patches/100-portability.patch [deleted file]
package/ltq-ifxos/patches/120-fix_smp_lock.patch [deleted file]
package/platform/lantiq/ltq-ifxos/Makefile [new file with mode: 0644]
package/platform/lantiq/ltq-ifxos/patches/100-compat.patch [new file with mode: 0644]

diff --git a/package/ltq-ifxos/Makefile b/package/ltq-ifxos/Makefile
deleted file mode 100644 (file)
index eeca201..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2009-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=lib_ifxos
-PKG_VERSION:=1.5.14
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_RELEASE:=3
-PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
-PKG_MD5SUM:=bc107f9d8ff6bed4c2760a2817bbb029
-PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/ltq-ifxos
-  SUBMENU:=Voice over IP
-  TITLE:=Lantiq OS abstraction library
-  URL:=http://www.lantiq.com/
-  DEPENDS:=@TARGET_lantiq
-  FILES:=$(PKG_BUILD_DIR)/src/drv_ifxos.ko
-  AUTOLOAD:=$(call AutoLoad,10,drv_ifxos)
-endef
-
-CONFIGURE_ARGS += \
-       ARCH=$(LINUX_KARCH) \
-       --enable-linux-26 \
-       --enable-kernelbuild="$(LINUX_DIR)" \
-       --enable-kernelincl="$(LINUX_DIR)/include" \
-       --enable-add_drv_cflags="-fno-pic -mno-abicalls -mlong-calls -G 0"
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR); aclocal && autoconf && automake)
-       $(call Build/Configure/Default)
-endef
-
-ifdef CONFIG_TARGET_lantiq
-  define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/{lib,include/ifxos}
-       $(CP) $(PKG_BUILD_DIR)/src/include/* $(1)/usr/include/ifxos
-       mkdir -p $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/src/libifxos.a $(1)/usr/lib/libifxos.a
-  endef
-endif
-
-$(eval $(call KernelPackage,ltq-ifxos))
diff --git a/package/ltq-ifxos/patches/100-portability.patch b/package/ltq-ifxos/patches/100-portability.patch
deleted file mode 100644 (file)
index d1ce750..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -64,7 +64,7 @@ dnl Set kernel build path
- AC_ARG_ENABLE(kernelbuild,
-       AS_HELP_STRING(--enable-kernelbuild=x,Set the target kernel build path (only for kernel 2.6.x)),
-       [
--              if test -e $enableval/include/linux/autoconf.h; then
-+              if test -e $enableval/include/linux/autoconf.h -o -e $enableval/include/generated/autoconf.h; then
-                       AC_SUBST([KERNEL_BUILD_PATH],[$enableval])
-               else
-                       AC_MSG_ERROR([The kernel build directory is not valid or not configured!])
diff --git a/package/ltq-ifxos/patches/120-fix_smp_lock.patch b/package/ltq-ifxos/patches/120-fix_smp_lock.patch
deleted file mode 100644 (file)
index aea4305..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/linux/ifxos_linux_thread_drv.c
-+++ b/src/linux/ifxos_linux_thread_drv.c
-@@ -34,7 +34,9 @@
- #include <linux/sched.h>
- #include <linux/version.h>
- #include <linux/completion.h>
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
- #include <linux/smp_lock.h>
-+#endif
- #include <linux/signal.h>
diff --git a/package/platform/lantiq/ltq-ifxos/Makefile b/package/platform/lantiq/ltq-ifxos/Makefile
new file mode 100644 (file)
index 0000000..1364849
--- /dev/null
@@ -0,0 +1,51 @@
+# Copyright (C) 2009-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=lib_ifxos
+PKG_VERSION:=1.5.14
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_RELEASE:=3
+PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
+PKG_MD5SUM:=bc107f9d8ff6bed4c2760a2817bbb029
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/ltq-ifxos
+  SECTION:=sys
+  CATEGORY:=Kernel modules
+  SUBMENU:=Libraries
+  TITLE:=Lantiq OS abstraction library
+  URL:=http://www.lantiq.com/
+  DEPENDS:=@TARGET_lantiq
+  FILES:=$(PKG_BUILD_DIR)/src/drv_ifxos.ko
+  AUTOLOAD:=$(call AutoLoad,10,drv_ifxos)
+endef
+
+CONFIGURE_ARGS += \
+       ARCH=$(LINUX_KARCH) \
+       --enable-linux-26 \
+       --enable-kernelbuild="$(LINUX_DIR)" \
+       --enable-kernelincl="$(LINUX_DIR)/include" \
+       --enable-add_drv_cflags="-fno-pic -mno-abicalls -mlong-calls -G 0"
+
+define Build/Configure
+       (cd $(PKG_BUILD_DIR); aclocal && autoconf && automake)
+       $(call Build/Configure/Default)
+endef
+
+ifdef CONFIG_TARGET_lantiq
+  define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib,include/ifxos}
+       $(CP) $(PKG_BUILD_DIR)/src/include/* $(1)/usr/include/ifxos
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/src/libifxos.a $(1)/usr/lib/libifxos.a
+  endef
+endif
+
+$(eval $(call KernelPackage,ltq-ifxos))
diff --git a/package/platform/lantiq/ltq-ifxos/patches/100-compat.patch b/package/platform/lantiq/ltq-ifxos/patches/100-compat.patch
new file mode 100644 (file)
index 0000000..02f2da7
--- /dev/null
@@ -0,0 +1,21 @@
+--- a/configure.in
++++ b/configure.in
+@@ -64,7 +64,7 @@ dnl Set kernel build path
+ AC_ARG_ENABLE(kernelbuild,
+       AS_HELP_STRING(--enable-kernelbuild=x,Set the target kernel build path (only for kernel 2.6.x)),
+       [
+-              if test -e $enableval/include/linux/autoconf.h; then
++              if test -e $enableval/include/linux/autoconf.h -o -e $enableval/include/generated/autoconf.h; then
+                       AC_SUBST([KERNEL_BUILD_PATH],[$enableval])
+               else
+                       AC_MSG_ERROR([The kernel build directory is not valid or not configured!])
+--- a/src/linux/ifxos_linux_thread_drv.c
++++ b/src/linux/ifxos_linux_thread_drv.c
+@@ -34,7 +34,6 @@
+ #include <linux/sched.h>
+ #include <linux/version.h>
+ #include <linux/completion.h>
+-#include <linux/smp_lock.h>
+ #include <linux/signal.h>