From cec4e04bcce665983ac35bd016b4cc585e98000c Mon Sep 17 00:00:00 2001 From: blogic Date: Sat, 15 Dec 2012 02:00:26 +0000 Subject: [lantiq] move ltq-ifxos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34692 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/ltq-ifxos/Makefile | 51 ---------------------- package/ltq-ifxos/patches/100-portability.patch | 11 ----- package/ltq-ifxos/patches/120-fix_smp_lock.patch | 12 ----- package/platform/lantiq/ltq-ifxos/Makefile | 51 ++++++++++++++++++++++ .../lantiq/ltq-ifxos/patches/100-compat.patch | 21 +++++++++ 5 files changed, 72 insertions(+), 74 deletions(-) delete mode 100644 package/ltq-ifxos/Makefile delete mode 100644 package/ltq-ifxos/patches/100-portability.patch delete mode 100644 package/ltq-ifxos/patches/120-fix_smp_lock.patch create mode 100644 package/platform/lantiq/ltq-ifxos/Makefile create mode 100644 package/platform/lantiq/ltq-ifxos/patches/100-compat.patch diff --git a/package/ltq-ifxos/Makefile b/package/ltq-ifxos/Makefile deleted file mode 100644 index eeca2010a0..0000000000 --- a/package/ltq-ifxos/Makefile +++ /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 - -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 index d1ce7503a2..0000000000 --- a/package/ltq-ifxos/patches/100-portability.patch +++ /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 index aea4305a90..0000000000 --- a/package/ltq-ifxos/patches/120-fix_smp_lock.patch +++ /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 - #include - #include -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)) - #include -+#endif - #include - - diff --git a/package/platform/lantiq/ltq-ifxos/Makefile b/package/platform/lantiq/ltq-ifxos/Makefile new file mode 100644 index 0000000000..1364849bc6 --- /dev/null +++ b/package/platform/lantiq/ltq-ifxos/Makefile @@ -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 + +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 index 0000000000..02f2da728e --- /dev/null +++ b/package/platform/lantiq/ltq-ifxos/patches/100-compat.patch @@ -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 + #include + #include +-#include + #include + + -- cgit v1.2.3