Browse Source

Purge bad merge

RISCi_ATOM 5 years ago
parent
commit
4f8655723c
100 changed files with 0 additions and 4529 deletions
  1. 0 7
      BSDmakefile
  2. 0 33
      Config.in
  3. 0 105
      Makefile
  4. 0 58
      docs/BUILD_HOWTO.md
  5. 0 0
      feeds.conf
  6. 0 166
      include/autotools.mk
  7. 0 72
      include/cmake.mk
  8. 0 51
      include/debug.mk
  9. 0 48
      include/depends.mk
  10. 0 5
      include/device_table.txt
  11. 0 184
      include/download.mk
  12. 0 26
      include/feeds.mk
  13. 0 205
      include/host-build.mk
  14. 0 65
      include/host.mk
  15. 0 289
      include/image.mk
  16. 0 144
      include/kernel-build.mk
  17. 0 174
      include/kernel-defaults.mk
  18. 0 25
      include/kernel-version.mk
  19. 0 231
      include/kernel.mk
  20. 0 12
      include/ltqtapi.mk
  21. 0 382
      include/netfilter.mk
  22. 0 40
      include/nls.mk
  23. 0 33
      include/package-bin.mk
  24. 0 157
      include/package-defaults.mk
  25. 0 91
      include/package-dumpinfo.mk
  26. 0 233
      include/package-ipkg.mk
  27. 0 70
      include/package-version-override.mk
  28. 0 316
      include/package.mk
  29. 0 202
      include/prereq-build.mk
  30. 0 62
      include/prereq.mk
  31. 0 170
      include/quilt.mk
  32. 0 80
      include/scan.mk
  33. 0 23
      include/scons.mk
  34. 0 37
      include/shell.sh
  35. 0 5
      include/site/aarch64-librecmc-linux-gnu
  36. 0 28
      include/site/aarch64-linux
  37. 0 5
      include/site/aarch64_be-librecmc-linux-gnu
  38. 0 28
      include/site/aarch64_be-linux
  39. 0 5
      include/site/arm-librecmc-linux-gnu
  40. 0 5
      include/site/arm-librecmc-linux-gnueabi
  41. 0 5
      include/site/arm-librecmc-linux-musl
  42. 0 5
      include/site/arm-librecmc-linux-muslgnueabi
  43. 0 5
      include/site/arm-librecmc-linux-uclibc
  44. 0 5
      include/site/arm-librecmc-linux-uclibcgnueabi
  45. 0 28
      include/site/arm-linux
  46. 0 5
      include/site/armeb-librecmc-linux-gnu
  47. 0 5
      include/site/armeb-librecmc-linux-gnueabi
  48. 0 5
      include/site/armeb-librecmc-linux-musl
  49. 0 5
      include/site/armeb-librecmc-linux-muslgnueabi
  50. 0 5
      include/site/armeb-librecmc-linux-uclibc
  51. 0 5
      include/site/armeb-librecmc-linux-uclibcgnueabi
  52. 0 28
      include/site/armeb-linux
  53. 0 5
      include/site/avr32-librecmc-linux-gnu
  54. 0 5
      include/site/avr32-librecmc-linux-uclibc
  55. 0 28
      include/site/avr32-linux
  56. 0 5
      include/site/cris-librecmc-linux-gnu
  57. 0 5
      include/site/cris-librecmc-linux-uclibc
  58. 0 28
      include/site/cris-linux
  59. 0 5
      include/site/i486-librecmc-linux-gnu
  60. 0 5
      include/site/i486-librecmc-linux-musl
  61. 0 5
      include/site/i486-librecmc-linux-uclibc
  62. 0 28
      include/site/i486-linux
  63. 0 5
      include/site/i686-librecmc-linux-gnu
  64. 0 5
      include/site/i686-librecmc-linux-musl
  65. 0 5
      include/site/i686-librecmc-linux-uclibc
  66. 0 28
      include/site/i686-linux
  67. 0 78
      include/site/linux
  68. 0 1
      include/site/linux-gnu
  69. 0 1
      include/site/linux-uclibc
  70. 0 5
      include/site/m68k-librecmc-linux-gnu
  71. 0 5
      include/site/m68k-librecmc-linux-uclibc
  72. 0 26
      include/site/m68k-linux
  73. 0 5
      include/site/mips-librecmc-linux-gnu
  74. 0 5
      include/site/mips-librecmc-linux-musl
  75. 0 5
      include/site/mips-librecmc-linux-uclibc
  76. 0 28
      include/site/mips-linux
  77. 0 5
      include/site/mips-linux-gnu
  78. 0 5
      include/site/mips64-librecmc-linux-gnu
  79. 0 5
      include/site/mips64-librecmc-linux-uclibc
  80. 0 28
      include/site/mips64-linux
  81. 0 5
      include/site/mips64el-librecmc-linux-gnu
  82. 0 5
      include/site/mips64el-librecmc-linux-uclibc
  83. 0 28
      include/site/mips64el-linux
  84. 0 5
      include/site/mipsel-librecmc-linux-gnu
  85. 0 5
      include/site/mipsel-librecmc-linux-musl
  86. 0 5
      include/site/mipsel-librecmc-linux-uclibc
  87. 0 5
      include/site/mipsel-librecmc-linux2.4-uclibc
  88. 0 28
      include/site/mipsel-linux
  89. 0 5
      include/site/mipsel-linux-gnu
  90. 0 5
      include/site/mipsel-openwrt-linux2.4-uclibc
  91. 0 5
      include/site/powerpc-librecmc-linux-gnu
  92. 0 5
      include/site/powerpc-librecmc-linux-gnuspe
  93. 0 5
      include/site/powerpc-librecmc-linux-musl
  94. 0 5
      include/site/powerpc-librecmc-linux-uclibc
  95. 0 5
      include/site/powerpc-librecmc-linux-uclibcspe
  96. 0 28
      include/site/powerpc-linux
  97. 0 5
      include/site/sparc-librecmc-linux-gnu
  98. 0 5
      include/site/sparc-librecmc-linux-uclibc
  99. 0 28
      include/site/sparc-linux
  100. 0 0
      include/site/sparc-linux-gnu

+ 0 - 7
BSDmakefile

@@ -1,7 +0,0 @@
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-world ${.TARGETS}:
-	@gmake $@

+ 0 - 33
Config.in

@@ -1,33 +0,0 @@
-# Copyright (C) 2006-2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-mainmenu "libreCMC Configuration"
-
-config MODULES
-	bool
-	default y
-
-config HAVE_DOT_CONFIG
-	bool
-	default y
-
-source "target/Config.in"
-
-source "config/Config-images.in"
-
-source "config/Config-build.in"
-
-source "config/Config-devel.in"
-
-source "toolchain/Config.in"
-
-source "target/imagebuilder/Config.in"
-
-source "target/sdk/Config.in"
-
-source "target/toolchain/Config.in"
-
-source "tmp/.config-package.in"

+ 0 - 105
Makefile

@@ -1,105 +0,0 @@
-# Makefile for libreCMC
-#
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-TOPDIR:=${CURDIR}
-LC_ALL:=C
-LANG:=C
-export TOPDIR LC_ALL LANG
-
-empty:=
-space:= $(empty) $(empty)
-$(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the libreCMC directory must not include any spaces))
-
-world:
-
-include $(TOPDIR)/include/host.mk
-
-ifneq ($(LIBRECMC_BUILD),1)
-  _SINGLE=export MAKEFLAGS=$(space);
-
-  override LIBRECMC_BUILD=1
-  export LIBRECMC_BUILD
-  GREP_OPTIONS=
-  export GREP_OPTIONS
-  include $(TOPDIR)/include/debug.mk
-  include $(TOPDIR)/include/depends.mk
-  include $(TOPDIR)/include/toplevel.mk
-else
-  include rules.mk
-  include $(INCLUDE_DIR)/depends.mk
-  include $(INCLUDE_DIR)/subdir.mk
-  include target/Makefile
-  include package/Makefile
-  include tools/Makefile
-  include toolchain/Makefile
-
-$(toolchain/stamp-install): $(tools/stamp-install)
-$(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install) $(BUILD_DIR)/.prepared
-$(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup)
-$(package/stamp-install): $(package/stamp-compile)
-$(target/stamp-install): $(package/stamp-compile) $(package/stamp-install)
-
-printdb:
-	@true
-
-prepare: $(target/stamp-compile)
-
-clean: FORCE
-	rm -rf $(BUILD_DIR) $(BIN_DIR) $(BUILD_LOG_DIR)
-
-dirclean: clean
-	rm -rf $(STAGING_DIR) $(STAGING_DIR_HOST) $(STAGING_DIR_TOOLCHAIN) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN)
-	rm -rf $(TMP_DIR)
-
-ifndef DUMP_TARGET_DB
-$(BUILD_DIR)/.prepared: Makefile
-	@mkdir -p $$(dirname $@)
-	@touch $@
-
-tmp/.prereq_packages: .config
-	unset ERROR; \
-	for package in $(sort $(prereq-y) $(prereq-m)); do \
-		$(_SINGLE)$(NO_TRACE_MAKE) -s -r -C package/$$package prereq || ERROR=1; \
-	done; \
-	if [ -n "$$ERROR" ]; then \
-		echo "Package prerequisite check failed."; \
-		false; \
-	fi
-	touch $@
-endif
-
-# check prerequisites before starting to build
-prereq: $(target/stamp-prereq) tmp/.prereq_packages
-	@if [ ! -f "$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)" ]; then \
-		echo 'ERROR: Missing site config for target "$(REAL_GNU_TARGET_NAME)" !'; \
-		echo '       The missing file will cause configure scripts to fail during compilation.'; \
-		echo '       Please provide a "$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)" file and restart the build.'; \
-		exit 1; \
-	fi
-
-prepare: .config $(tools/stamp-install) $(toolchain/stamp-install)
-world: prepare $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) FORCE
-	$(_SINGLE)$(SUBMAKE) -r package/index
-
-# update all feeds, re-create index files, install symlinks
-package/symlinks:
-	$(SCRIPT_DIR)/feeds update -a
-	$(SCRIPT_DIR)/feeds install -a
-
-# re-create index files, install symlinks
-package/symlinks-install:
-	$(SCRIPT_DIR)/feeds update -i
-	$(SCRIPT_DIR)/feeds install -a
-
-# remove all symlinks, don't touch ./feeds
-package/symlinks-clean:
-	$(SCRIPT_DIR)/feeds uninstall -a
-
-.PHONY: clean dirclean prereq prepare world package/symlinks package/symlinks-install package/symlinks-clean
-
-endif

+ 0 - 58
docs/BUILD_HOWTO.md

@@ -1,58 +0,0 @@
-# libreCMC build HOWTO
-
-This generic documentation is for building libreCMC firmware images that are for supported target devices. While libreCMC does allow for building for other tagets, not all have been tested to work with libreCMC and are not supported if they are not mentioned on the libreCMC wiki.
-
-libreCMC is licensed under the GPLv2 and contains code from other free software projects. Some code may be licensed under other free software licenses and will be noted. All software is to be distributed under the terms of the GPLv2 or their respective free software licenses.
-
-## What do I need to get started?
-
-* GNU/Linux distro (Trisquel, *buntu, Fedora or others)
-* GNU GCC / GCC-C++
-* flex
-* gawk
-* ncurses-dev (ncurses5-devel, etc..)
-* libghc-zlib-dev
-* patch
-* perl5
-* subversion
-* git-core 
-
-## Building libreCMC
-
-1) Get the latest libreCMC source code:
-
-`git clone git://gitorious.org/librecmc/librecmc.git`
-`git clone http://gitboria.com/RISCi_ATOM/librecmc.git`
-
-or download v1.2.1 :
-
-[librecmc-v1.2.1.tar.bz2](http://downloads.librecmc.org/sources/v1.2.1/librecmc-v1.2.1.tar.bz2)
-
-2) Configure libreCMC for your device. 
-
- `make menuconfig` 
-
- When configuring libreCMC for your device, it is imperative that the right target and profile are selected. Currently, we only _officially_ support the AR71XX target and the TP-Link TL-MR3020 and Netgear WNDR3800. If you want other packages, please keep in mind that these devices don't have very much in terms of flash ROM and your selection of packages may not work properly. Generally, a good default configuration includes:
-
-
- * luci : Collections -> luci  + luci -> protocols -> luci-proto-relayd
- * Networking : wpa-cli + wpa-supplicant + iw
- * Utilities : Editors -> Nano
-
-3) When done configuring, run:
-
- `make`
-
- If the build fails, type:
-
- `make V=s`
-
- if there are missing dependencies in your build environment, please install them and then run `make`.
-
-4) If the build exits without any errors, you should have a new image in:
-
- `$SRC_ROOT/bin/$BUILD_TARGET/librecmc-$BUILD_TARGET-generic-$TARGET_PROFILE-$VERSION-$FS_TYPE-factory.bin`
-
- Where `$BUILD_TARGET = target (ex. ar71xx)`, `$TARGET_PROFILE = device`, `$VERSION = device version (some don't any)`
-
-5) Flash the newly built image (if you are confident). libreCMC project is not responsible for bricked devices.

+ 0 - 0
feeds.conf


+ 0 - 166
include/autotools.mk

@@ -1,166 +0,0 @@
-#
-# Copyright (C) 2007-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2))
-
-# delete *.la-files from staging_dir - we can not yet remove respective lines within all package
-# Makefiles, since backfire still uses libtool v1.5.x which (may) require those files
-define libtool_remove_files
-	find $(1) -name '*.la' | $(XARGS) rm -f;
-endef
-
-
-AM_TOOL_PATHS:= \
-	AUTOM4TE=$(STAGING_DIR_HOST)/bin/autom4te \
-	AUTOCONF=$(STAGING_DIR_HOST)/bin/autoconf \
-	AUTOMAKE=$(STAGING_DIR_HOST)/bin/automake \
-	ACLOCAL=$(STAGING_DIR_HOST)/bin/aclocal \
-	AUTOHEADER=$(STAGING_DIR_HOST)/bin/autoheader \
-	LIBTOOLIZE=$(STAGING_DIR_HOST)/bin/libtoolize \
-	LIBTOOL=$(STAGING_DIR_HOST)/bin/libtool \
-	M4=$(STAGING_DIR_HOST)/bin/m4 \
-	AUTOPOINT=true
-
-# 1: build dir
-# 2: remove files
-# 3: automake paths
-# 4: libtool paths
-# 5: extra m4 dirs
-define autoreconf
-	(cd $(1); \
-		$(patsubst %,rm -f %;,$(2)) \
-		$(foreach p,$(3), \
-			if [ -f $(p)/configure.ac ] || [ -f $(p)/configure.in ]; then \
-				[ -d $(p)/autom4te.cache ] && rm -rf autom4te.cache; \
-				[ -e $(p)/config.rpath ] || \
-						ln -s $(SCRIPT_DIR)/config.rpath $(p)/config.rpath; \
-				touch NEWS AUTHORS COPYING ABOUT-NLS ChangeLog; \
-				$(AM_TOOL_PATHS) $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
-					$(if $(word 2,$(3)),--no-recursive) \
-					-B $(STAGING_DIR_HOST)/share/aclocal \
-					$(patsubst %,-I %,$(5)) \
-					$(patsubst %,-I %,$(4)) $(p) || true; \
-			fi; \
-		) \
-	);
-endef
-
-# 1: build dir
-define patch_libtool
-	@(cd $(1); \
-		for lt in $$$$($$(STAGING_DIR_HOST)/bin/find . -name ltmain.sh); do \
-			lt_version="$$$$($$(STAGING_DIR_HOST)/bin/sed -ne 's,^[[:space:]]*VERSION="\?\([0-9]\.[0-9]\+\).*,\1,p' $$$$lt)"; \
-			case "$$$$lt_version" in \
-				1.5|2.2|2.4) echo "autotools.mk: Found libtool v$$$$lt_version - applying patch to $$$$lt"; \
-					(cd $$$$(dirname $$$$lt) && $$(PATCH) -N -s -p1 < $$(TOPDIR)/tools/libtool/files/libtool-v$$$$lt_version.patch || true) ;; \
-				*) echo "autotools.mk: error: Unsupported libtool version v$$$$lt_version - cannot patch $$$$lt"; exit 1 ;; \
-			esac; \
-		done; \
-	);
-endef
-
-
-PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH)
-PKG_AUTOMAKE_PATHS?=$(CONFIGURE_PATH)
-PKG_MACRO_PATHS?=m4
-PKG_REMOVE_FILES?=aclocal.m4
-
-Hooks/InstallDev/Post += libtool_remove_files
-
-define autoreconf_target
-  $(strip $(call autoreconf, \
-    $(PKG_BUILD_DIR), $(PKG_REMOVE_FILES), \
-    $(PKG_AUTOMAKE_PATHS), $(PKG_LIBTOOL_PATHS), \
-    $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR)/usr/share/aclocal $(PKG_MACRO_PATHS)))
-endef
-
-define patch_libtool_target
-  $(strip $(call patch_libtool, \
-    $(PKG_BUILD_DIR)))
-endef
-
-define gettext_version_target
-  cd $(PKG_BUILD_DIR) && \
-  GETTEXT_VERSION=$(shell $(STAGING_DIR_HOST)/bin/gettext -V | $(STAGING_DIR_HOST)/bin/sed -ne '1s/.* //p') && \
-  $(STAGING_DIR_HOST)/bin/sed \
-  -i $(PKG_BUILD_DIR)/configure.ac \
-  -e "s/AM_GNU_GETTEXT_VERSION(\[.*\])/AM_GNU_GETTEXT_VERSION(\[$$$$GETTEXT_VERSION\])/g" && \
-  $(STAGING_DIR_HOST)/bin/autopoint --force
-endef
-
-ifneq ($(filter patch-libtool,$(PKG_FIXUP)),)
-  Hooks/Configure/Pre += patch_libtool_target
-endif
-
-ifneq ($(filter libtool,$(PKG_FIXUP)),)
-  PKG_BUILD_DEPENDS += libtool libintl libiconv
- ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),)
-  Hooks/Configure/Pre += autoreconf_target
- endif
-endif
-
-ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),)
-  PKG_BUILD_DEPENDS += libtool libintl libiconv
- ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),)
-  Hooks/Configure/Pre += autoreconf_target
- endif
-endif
-
-ifneq ($(filter autoreconf,$(PKG_FIXUP)),)
-  ifeq ($(filter autoreconf,$(Hooks/Configure/Pre)),)
-    Hooks/Configure/Pre += autoreconf_target
-  endif
-endif
-
-ifneq ($(filter gettext-version,$(PKG_FIXUP)),)
-  Hooks/Configure/Pre += gettext_version_target
-endif
-
-
-HOST_FIXUP?=$(PKG_FIXUP)
-HOST_LIBTOOL_PATHS?=$(if $(PKG_LIBTOOL_PATHS),$(PKG_LIBTOOL_PATHS),.)
-HOST_AUTOMAKE_PATHS?=$(if $(PKG_AUTOMAKE_PATHS),$(PKG_AUTOMAKE_PATHS),.)
-HOST_MACRO_PATHS?=$(if $(PKG_MACRO_PATHS),$(PKG_MACRO_PATHS),m4)
-HOST_REMOVE_FILES?=$(PKG_REMOVE_FILES)
-
-define autoreconf_host
-  $(strip $(call autoreconf, \
-    $(HOST_BUILD_DIR), $(HOST_REMOVE_FILES), \
-    $(HOST_AUTOMAKE_PATHS), $(HOST_LIBTOOL_PATHS), \
-    $(HOST_MACRO_PATHS)))
-endef
-
-define patch_libtool_host
-  $(strip $(call patch_libtool, \
-    $(HOST_BUILD_DIR)))
-endef
-
-ifneq ($(filter patch-libtool,$(PKG_FIXUP)),)
-  Hooks/HostConfigure/Pre += patch_libtool_host
-endif
-
-ifneq ($(filter patch-libtool,$(HOST_FIXUP)),)
-  Hooks/HostConfigure/Pre += $(strip $(call patch_libtool,$(HOST_BUILD_DIR)))
-endif
-
-ifneq ($(filter libtool,$(HOST_FIXUP)),)
- ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),)
-  Hooks/HostConfigure/Pre += autoreconf_host
- endif
-endif
-
-ifneq ($(filter libtool-ucxx,$(HOST_FIXUP)),)
- ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),)
-  Hooks/HostConfigure/Pre += autoreconf_host
- endif
-endif
-
-ifneq ($(filter autoreconf,$(HOST_FIXUP)),)
-  ifeq ($(filter autoreconf,$(Hooks/HostConfigure/Pre)),)
-    Hooks/HostConfigure/Pre += autoreconf_host
-  endif
-endif

+ 0 - 72
include/cmake.mk

@@ -1,72 +0,0 @@
-PKG_INSTALL:=1
-
-ifneq ($(findstring c,$(LIBRECMC_VERBOSE)),)
-  MAKE_FLAGS+=VERBOSE=1
-endif
-
-CMAKE_SOURCE_DIR:=.
-
-ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
-  cmake_tool=$(TOOLCHAIN_DIR)/bin/$(1)
-else
-  cmake_tool=$(shell which $(1))
-endif
-
-ifeq ($(CONFIG_CCACHE),)
- CMAKE_C_COMPILER:=$(call cmake_tool,$(TARGET_CC))
- CMAKE_CXX_COMPILER:=$(call cmake_tool,$(TARGET_CXX))
- CMAKE_C_COMPILER_ARG1:=
- CMAKE_CXX_COMPILER_ARG1:=
-else
-  CCACHE:=$(shell which ccache)
-  ifeq ($(CCACHE),)
-    CCACHE:=$(STAGING_DIR_HOST)/bin/ccache
-  endif
-  CMAKE_C_COMPILER:=$(CCACHE)
-  CMAKE_C_COMPILER_ARG1:=$(TARGET_CC_NOCACHE)
-  CMAKE_CXX_COMPILER:=$(CCACHE)
-  CMAKE_CXX_COMPILER_ARG1:=$(TARGET_CXX_NOCACHE)
-endif
-CMAKE_AR:=$(call cmake_tool,$(TARGET_CROSS)ar)
-CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_CROSS)ranlib)
-
-define Build/Configure/Default
-	(cd $(PKG_BUILD_DIR); \
-		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
-		CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
-		cmake \
-			-DCMAKE_SYSTEM_NAME=Linux \
-			-DCMAKE_SYSTEM_VERSION=1 \
-			-DCMAKE_SYSTEM_PROCESSOR=$(ARCH) \
-			-DCMAKE_BUILD_TYPE=Release \
-			-DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
-			-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
-			-DCMAKE_C_COMPILER="$(CMAKE_C_COMPILER)" \
-			-DCMAKE_C_COMPILER_ARG1="$(CMAKE_C_COMPILER_ARG1)" \
-			-DCMAKE_CXX_COMPILER="$(CMAKE_CXX_COMPILER)" \
-			-DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CXX_COMPILER_ARG1)" \
-			-DCMAKE_EXE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
-			-DCMAKE_MODULE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
-			-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
-			-DCMAKE_AR="$(CMAKE_AR)" \
-			-DCMAKE_RANLIB="$(CMAKE_RANLIB)" \
-			-DCMAKE_FIND_ROOT_PATH="$(STAGING_DIR);$(TOOLCHAIN_DIR)" \
-			-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=BOTH \
-			-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
-			-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
-			-DCMAKE_STRIP=: \
-			-DCMAKE_INSTALL_PREFIX=/usr \
-			-DDL_LIBRARY=$(STAGING_DIR) \
-			-DCMAKE_PREFIX_PATH=$(STAGING_DIR) \
-			$(CMAKE_OPTIONS) \
-		$(CMAKE_SOURCE_DIR) \
-	)
-endef
-
-define Build/InstallDev/cmake
-	$(INSTALL_DIR) $(1)
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
-
-Build/InstallDev = $(if $(CMAKE_INSTALL),$(Build/InstallDev/cmake))

+ 0 - 51
include/debug.mk

@@ -1,51 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-# debug flags:
-#
-# d: show subdirectory tree
-# t: show added targets
-# l: show legacy targets
-# r: show autorebuild messages
-# v: verbose (no .SILENCE for common targets)
-
-ifeq ($(DUMP),)
-  ifeq ($(DEBUG),all)
-    build_debug:=dltvr
-  else
-    build_debug:=$(DEBUG)
-  endif
-endif
-
-ifneq ($(DEBUG),)
-
-define debug
-$$(findstring $(2),$$(if $$(DEBUG_SCOPE_DIR),$$(if $$(filter $$(DEBUG_SCOPE_DIR)%,$(1)),$(build_debug)),$(build_debug)))
-endef
-
-define warn
-$$(if $(call debug,$(1),$(2)),$$(warning $(3)))
-endef
-
-define debug_eval
-$$(if $(call debug,$(1),$(2)),$(3))
-endef
-
-define warn_eval
-$(call warn,$(1),$(2),$(3)	$(4))
-$(4)
-endef
-
-else
-
-debug:=
-warn:=
-debug_eval:=
-warn_eval = $(4)
-
-endif
-

+ 0 - 48
include/depends.mk

@@ -1,48 +0,0 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# define a dependency on a subtree
-# parameters:
-#	1: directories/files
-#	2: directory dependency
-#	3: tempfile for file listings
-#	4: find options
-
-DEP_FINDPARAMS := -x "*/.svn*" -x ".*" -x "*:*" -x "*\!*" -x "* *" -x "*\\\#*" -x "*/.*_check" -x "*/.*.swp"
-
-find_md5=$(SH_FUNC) find $(1) -type f $(patsubst -x,-and -not -path,$(DEP_FINDPARAMS) $(2)) | md5s
-
-define rdep
-  .PRECIOUS: $(2)
-  .SILENT: $(2)_check
-
-  $(2): $(2)_check
-
-ifneq ($(wildcard $(2)),)
-  $(2)_check::
-	$(if $(3), \
-		$(call find_md5,$(1),$(4)) > $(3).1; \
-		{ [ \! -f "$(3)" ] || diff $(3) $(3).1 >/dev/null; } && \
-	) \
-	{ \
-		[ -f "$(2)_check.1" ] && mv "$(2)_check.1"; \
-	    $(TOPDIR)/scripts/timestamp.pl $(DEP_FINDPARAMS) $(4) -n $(2) $(1) && { \
-			$(call debug_eval,$(SUBDIR),r,echo "No need to rebuild $(2)";) \
-			touch -r "$(2)" "$(2)_check"; \
-		} \
-	} || { \
-		$(call debug_eval,$(SUBDIR),r,echo "Need to rebuild $(2)";) \
-		touch "$(2)_check"; \
-	}
-	$(if $(3), mv $(3).1 $(3))
-else
-  $(2)_check::
-	$(if $(3), rm -f $(3) $(3).1)
-	$(call debug_eval,$(SUBDIR),r,echo "Target $(2) not built")
-endif
-
-endef
-

+ 0 - 5
include/device_table.txt

@@ -1,5 +0,0 @@
-# minimal device table file for libreCMC
-
-#<name>		<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
-/dev		d	755	0	0	-	-	-	-	-
-/dev/console	c	600	0	0	5	1	0	0	-

+ 0 - 184
include/download.mk

@@ -1,184 +0,0 @@
-#
-# Copyright (C) 2006-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)
-
-# Try to guess the download method from the URL
-define dl_method
-$(strip \
-  $(if $(2),$(2), \
-    $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% @SAVANNAH/% ftp://% http://% https://% file://%,$(1)),default, \
-      $(if $(filter git://%,$(1)),git, \
-        $(if $(filter svn://%,$(1)),svn, \
-          $(if $(filter cvs://%,$(1)),cvs, \
-            $(if $(filter hg://%,$(1)),hg, \
-              $(if $(filter sftp://%,$(1)),bzr, \
-                unknown \
-              ) \
-            ) \
-          ) \
-        ) \
-      ) \
-    ) \
-  ) \
-)
-endef
-
-# code for creating tarballs from cvs/svn/git/bzr/hg/darcs checkouts - useful for mirror support
-dl_pack/bz2=$(TAR) cjf $(1) $(2)
-dl_pack/gz=$(TAR) czf $(1) $(2)
-dl_pack/xz=$(TAR) c $(2) | xz -zc > $(1)
-dl_pack/unknown=echo "ERROR: Unknown pack format for file $(1)"; false
-define dl_pack
-	$(if $(dl_pack/$(call ext,$(1))),$(dl_pack/$(call ext,$(1))),$(dl_pack/unknown))
-endef
-
-define DownloadMethod/unknown
-	@echo "ERROR: No download method available"; false
-endef
-
-define DownloadMethod/default
-	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MD5SUM)" $(foreach url,$(URL),"$(url)")
-endef
-
-define wrap_mirror
-	$(if $(if $(MIRROR),$(filter-out x,$(MIRROR_MD5SUM))),@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_MD5SUM)" || ( $(1) ),$(1))
-endef
-
-define DownloadMethod/cvs
-	$(call wrap_mirror, \
-		echo "Checking out files from the cvs repository..."; \
-		mkdir -p $(TMP_DIR)/dl && \
-		cd $(TMP_DIR)/dl && \
-		rm -rf $(SUBDIR) && \
-		[ \! -d $(SUBDIR) ] && \
-		cvs -d $(URL) export $(VERSION) $(SUBDIR) && \
-		echo "Packing checkout..." && \
-		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
-		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
-		rm -rf $(SUBDIR); \
-	)
-endef
-
-define DownloadMethod/svn
-	$(call wrap_mirror, \
-		echo "Checking out files from the svn repository..."; \
-		mkdir -p $(TMP_DIR)/dl && \
-		cd $(TMP_DIR)/dl && \
-		rm -rf $(SUBDIR) && \
-		[ \! -d $(SUBDIR) ] && \
-		( svn help export | grep -q trust-server-cert && \
-		svn export --non-interactive --trust-server-cert -r$(VERSION) $(URL) $(SUBDIR) || \
-		svn export --non-interactive -r$(VERSION) $(URL) $(SUBDIR) ) && \
-		echo "Packing checkout..." && \
-		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
-		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
-		rm -rf $(SUBDIR); \
-	)
-endef
-
-define DownloadMethod/git
-	$(call wrap_mirror, \
-		echo "Checking out files from the git repository..."; \
-		mkdir -p $(TMP_DIR)/dl && \
-		cd $(TMP_DIR)/dl && \
-		rm -rf $(SUBDIR) && \
-		[ \! -d $(SUBDIR) ] && \
-		git clone $(URL) $(SUBDIR) --recursive && \
-		(cd $(SUBDIR) && git checkout $(VERSION) && git submodule update) && \
-		echo "Packing checkout..." && \
-		rm -rf $(SUBDIR)/.git && \
-		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
-		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
-		rm -rf $(SUBDIR); \
-	)
-endef
-
-define DownloadMethod/bzr
-	$(call wrap_mirror, \
-		echo "Checking out files from the bzr repository..."; \
-		mkdir -p $(TMP_DIR)/dl && \
-		cd $(TMP_DIR)/dl && \
-		rm -rf $(SUBDIR) && \
-		[ \! -d $(SUBDIR) ] && \
-		bzr export -r$(VERSION) $(SUBDIR) $(URL) && \
-		echo "Packing checkout..." && \
-		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
-		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
-		rm -rf $(SUBDIR); \
-	)
-endef
-
-define DownloadMethod/hg
-	$(call wrap_mirror, \
-		echo "Checking out files from the hg repository..."; \
-		mkdir -p $(TMP_DIR)/dl && \
-		cd $(TMP_DIR)/dl && \
-		rm -rf $(SUBDIR) && \
-		[ \! -d $(SUBDIR) ] && \
-		hg clone -r $(VERSION) $(URL) $(SUBDIR) && \
-		find $(SUBDIR) -name .hg | xargs rm -rf && \
-		echo "Packing checkout..." && \
-		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
-		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
-		rm -rf $(SUBDIR); \
-	)
-endef
-
-define DownloadMethod/darcs
-	$(call wrap_mirror, \
-		echo "Checking out files from the darcs repository..."; \
-		mkdir -p $(TMP_DIR)/dl && \
-		cd $(TMP_DIR)/dl && \
-		rm -rf $(SUBDIR) && \
-		[ \! -d $(SUBDIR) ] && \
-		darcs get -t $(VERSION) $(URL) $(SUBDIR) && \
-		find $(SUBDIR) -name _darcs | xargs rm -rf && \
-		echo "Packing checkout..." && \
-		$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
-		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
-		rm -rf $(SUBDIR); \
-	)
-endef
-
-Validate/cvs=VERSION SUBDIR
-Validate/svn=VERSION SUBDIR
-Validate/git=VERSION SUBDIR
-Validate/bzr=VERSION SUBDIR
-Validate/hg=VERSION SUBDIR
-Validate/darcs=VERSION SUBDIR
-
-define Download/Defaults
-  URL:=
-  FILE:=
-  PROTO:=
-  MD5SUM:=
-  SUBDIR:=
-  MIRROR:=1
-  MIRROR_MD5SUM:=x
-  VERSION:=
-endef
-
-define Download
-  $(eval $(Download/Defaults))
-  $(eval $(Download/$(1)))
-  $(foreach FIELD,URL FILE $(Validate/$(call dl_method,$(URL),$(PROTO))),
-    ifeq ($($(FIELD)),)
-      $$(error Download/$(1) is missing the $(FIELD) field.)
-    endif
-  )
-
-  $(foreach dep,$(DOWNLOAD_RDEP),
-    $(dep): $(DL_DIR)/$(FILE)
-  )
-  download: $(DL_DIR)/$(FILE)
-
-  $(DL_DIR)/$(FILE):
-	mkdir -p $(DL_DIR)
-	$(if $(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/unknown))
-
-endef

+ 0 - 26
include/feeds.mk

@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
--include $(TMP_DIR)/.packagefeeds
-
-FEEDS_AVAILABLE:=$(shell $(SCRIPT_DIR)/feeds list -n)
-FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*))
-FEEDS_ENABLED:=$(foreach feed,$(FEEDS_INSTALLED),$(if $(CONFIG_FEED_$(feed)),$(feed)))
-FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_AVAILABLE))
-
-PKG_CONFIG_DEPENDS += \
-	CONFIG_PER_FEED_REPO \
-	CONFIG_PER_FEED_REPO_ADD_DISABLED \
-	CONFIG_PER_FEED_REPO_ADD_COMMENTED \
-	$(foreach feed,$(FEEDS_INSTALLED),CONFIG_FEED_$(feed))
-
-# 1: package name
-define FeedPackageDir
-$(strip $(if $(CONFIG_PER_FEED_REPO), \
-  $(abspath $(PACKAGE_DIR)/$(if $(Package/$(1)/feed),$(Package/$(1)/feed),base)), \
-  $(PACKAGE_DIR)))
-endef

+ 0 - 205
include/host-build.mk

@@ -1,205 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
-HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install
-HOST_BUILD_PARALLEL ?=
-
-ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),)
-  HOST_MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j)
-else
-  HOST_MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS)
-endif
-
-ifeq ($(strip $(HOST_BUILD_PARALLEL)),0)
-HOST_JOBS?=-j1
-else
-HOST_JOBS?=$(if $(HOST_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),\
-	$(if $(CONFIG_PKG_BUILD_PARALLEL),$(HOST_MAKE_J),-j1),-j1)
-endif
-
-include $(INCLUDE_DIR)/host.mk
-include $(INCLUDE_DIR)/unpack.mk
-include $(INCLUDE_DIR)/depends.mk
-
-BUILD_TYPES += host
-HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),)))
-HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured
-HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
-HOST_STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.$(PKG_NAME)_installed
-
-override MAKEFLAGS=
-
-include $(INCLUDE_DIR)/download.mk
-include $(INCLUDE_DIR)/quilt.mk
-include $(INCLUDE_DIR)/autotools.mk
-
-Host/Patch:=$(Host/Patch/Default)
-ifneq ($(strip $(HOST_UNPACK)),)
-  define Host/Prepare/Default
-	$(HOST_UNPACK)
-	$(Host/Patch)
-  endef
-endif
-
-define Host/Prepare
-  $(call Host/Prepare/Default)
-endef
-
-HOST_CONFIGURE_VARS = \
-	CC="$(HOSTCC)" \
-	CFLAGS="$(HOST_CFLAGS)" \
-	CPPFLAGS="$(HOST_CPPFLAGS)" \
-	LDFLAGS="$(HOST_LDFLAGS)" \
-	SHELL="$(BASH)"
-
-HOST_CONFIGURE_ARGS = \
-	--target=$(GNU_HOST_NAME) \
-	--host=$(GNU_HOST_NAME) \
-	--build=$(GNU_HOST_NAME) \
-	--program-prefix="" \
-	--program-suffix="" \
-	--prefix=$(STAGING_DIR_HOST) \
-	--exec-prefix=$(STAGING_DIR_HOST) \
-	--sysconfdir=$(STAGING_DIR_HOST)/etc \
-	--localstatedir=$(STAGING_DIR_HOST)/var \
-	--sbindir=$(STAGING_DIR_HOST)/bin
-
-HOST_MAKE_FLAGS =
-
-HOST_CONFIGURE_CMD = $(BASH) ./configure
-
-ifneq ($(HOST_OS),Darwin)
-  ifeq ($(CONFIG_BUILD_STATIC_TOOLS),y)
-    HOST_STATIC_LINKING = -static
-  endif
-endif
-
-define Host/Configure/Default
-	$(if $(HOST_CONFIGURE_PARALLEL),+)(cd $(HOST_BUILD_DIR)/$(3); \
-		if [ -x configure ]; then \
-			$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \
-			$(2) \
-			$(HOST_CONFIGURE_CMD) \
-			$(HOST_CONFIGURE_VARS) \
-			$(HOST_CONFIGURE_ARGS) \
-			$(1); \
-		fi \
-	)
-endef
-
-define Host/Configure
-  $(call Host/Configure/Default)
-endef
-
-define Host/Compile/Default
-	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
-		$(HOST_MAKE_FLAGS) \
-		$(1)
-endef
-
-define Host/Compile
-  $(call Host/Compile/Default)
-endef
-
-define Host/Install/Default
-	$(_SINGLE)$(MAKE) -C $(HOST_BUILD_DIR) install
-endef
-
-define Host/Install
-  $(call Host/Install/Default)
-endef
-
-
-ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),)
-  define HostHost/Autoclean
-    $(call rdep,${CURDIR} $(PKG_FILE_DEPENDS),$(HOST_STAMP_PREPARED))
-    $(if $(if $(Host/Compile),$(filter prepare,$(MAKECMDGOALS)),1),,$(call rdep,$(HOST_BUILD_DIR),$(HOST_STAMP_BUILT)))
-  endef
-endif
-
-define Download/default
-  FILE:=$(PKG_SOURCE)
-  URL:=$(PKG_SOURCE_URL)
-  PROTO:=$(PKG_SOURCE_PROTO)
-  SUBDIR:=$(PKG_SOURCE_SUBDIR)
-  VERSION:=$(PKG_SOURCE_VERSION)
-  MD5SUM:=$(PKG_MD5SUM)
-  MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM)
-endef
-
-define Host/Exports/Default
-  $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR_HOST)/share/aclocal $$(STAGING_DIR_HOST)/share/aclocal-*),-I $$(p))
-  $(1) : export STAGING_PREFIX=$$(STAGING_DIR_HOST)
-  $(1) : export PKG_CONFIG_PATH=$$(STAGING_DIR_HOST)/lib/pkgconfig
-  $(1) : export PKG_CONFIG_LIBDIR=$$(STAGING_DIR_HOST)/lib/pkgconfig
-endef
-Host/Exports=$(Host/Exports/Default)
-
-.NOTPARALLEL:
-
-ifndef DUMP
-  define HostBuild
-  $(if $(HOST_QUILT),$(Host/Quilt))
-  $(if $(if $(PKG_HOST_ONLY),,$(STAMP_PREPARED)),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)))
-  $(if $(DUMP),,$(call HostHost/Autoclean))
-
-  $(HOST_STAMP_PREPARED):
-	@-rm -rf $(HOST_BUILD_DIR)
-	@mkdir -p $(HOST_BUILD_DIR)
-	$(foreach hook,$(Hooks/HostPrepare/Pre),$(call $(hook))$(sep))
-	$(call Host/Prepare)
-	$(foreach hook,$(Hooks/HostPrepare/Post),$(call $(hook))$(sep))
-	touch $$@
-
-  $(call Host/Exports,$(HOST_STAMP_CONFIGURED))
-  $(HOST_STAMP_CONFIGURED): $(HOST_STAMP_PREPARED)
-	$(foreach hook,$(Hooks/HostConfigure/Pre),$(call $(hook))$(sep))
-	$(call Host/Configure)
-	$(foreach hook,$(Hooks/HostConfigure/Post),$(call $(hook))$(sep))
-	touch $$@
-
-  $(call Host/Exports,$(HOST_STAMP_BUILT))
-  $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED)
-		$(foreach hook,$(Hooks/HostCompile/Pre),$(call $(hook))$(sep))
-		$(call Host/Compile)
-		$(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep))
-		touch $$@
-
-  $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE)
-		$(call Host/Install)
-		$(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep))
-		mkdir -p $$(shell dirname $$@)
-		touch $$@
-
-  ifndef STAMP_BUILT
-    prepare: host-prepare
-    compile: host-compile
-    install: host-install
-    clean: host-clean
-    update: host-update
-    refresh: host-refresh
-  endif
-
-  host-prepare: $(HOST_STAMP_PREPARED)
-  host-configure: $(HOST_STAMP_CONFIGURED)
-  host-compile: $(HOST_STAMP_BUILT) $(if $(STAMP_BUILT),$(HOST_STAMP_INSTALLED))
-  host-install: $(HOST_STAMP_INSTALLED)
-  host-clean: FORCE
-	$(call Host/Clean)
-	$(call Host/Uninstall)
-	rm -rf $(HOST_BUILD_DIR) $(HOST_STAMP_INSTALLED) $(HOST_STAMP_BUILT)
-
-  endef
-
-  download:
-  prepare:
-  compile:
-  install:
-  clean:
-
-endif

+ 0 - 65
include/host.mk

@@ -1,65 +0,0 @@
-# 
-# Copyright (C) 2007-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-TMP_DIR ?= $(TOPDIR)/tmp
-ifeq ($(if $(TARGET_BUILD),,$(DUMP)),)
-  -include $(TMP_DIR)/.host.mk
-endif
-
-export TAR FIND
-
-ifneq ($(__host_inc),1)
-__host_inc:=1
-
-try-run = $(shell set -e; \
-	TMP_F="$(TMP_DIR)/try-run.$$$$.tmp"; \
-	if ($(1)) >/dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi; \
-	rm -f "$$TMP_F"; \
-)
-
-host-cc-option = $(call try-run, \
-	$(HOSTCC) $(HOST_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP_F",$(1),$(2) \
-)
-
-.PRECIOUS: $(TMP_DIR)/.host.mk
-$(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
-	@mkdir -p $(TMP_DIR)
-	@( \
-		HOST_OS=`uname`; \
-		case "$$HOST_OS" in \
-			Linux) HOST_ARCH=`uname -m`;; \
-			Darwin) HOST_ARCH=`uname -m`;; \
-			*) HOST_ARCH=`uname -p`;; \
-		esac; \
-		GNU_HOST_NAME=`gcc -dumpmachine`; \
-		[ -z "$$GNU_HOST_NAME" -o "$$HOST_OS" = "Darwin" ] && \
-			GNU_HOST_NAME=`$(TOPDIR)/scripts/config.guess`; \
-		echo "HOST_OS:=$$HOST_OS" > $@; \
-		echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \
-		echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \
-		TAR=`which gtar 2>/dev/null`; \
-		[ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which gnutar 2>/dev/null`; \
-		[ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \
-		echo "TAR:=$$TAR" >> $@; \
-		FIND=`which gfind 2>/dev/null`; \
-		[ -n "$$FIND" -a -x "$$FIND" ] || FIND=`which find 2>/dev/null`; \
-		echo "FIND:=$$FIND" >> $@; \
-		echo "BASH:=$(shell which bash)" >> $@; \
-		if $$FIND -L /tmp -maxdepth 0 >/dev/null 2>/dev/null; then \
-			echo "FIND_L=$$FIND -L \$$(1)" >>$@; \
-		else \
-			echo "FIND_L=$$FIND \$$(1) -follow" >> $@; \
-		fi; \
-		PATCH=`which gpatch 2>/dev/null`; \
-		[ -n "$$PATCH" -a -x "$$PATCH" ] || PATCH=`which patch 2>/dev/null`; \
-		echo "PATCH:=$$PATCH" >> $@; \
-		PYTHON=`which python2.7 2>/dev/null`; \
-		[ -n "$$PYTHON" -a -x "$$PYTHON" ] || PYTHON=`which python 2>/dev/null`; \
-		echo "PYTHON:=$$PYTHON" >> $@; \
-	)
-
-endif

+ 0 - 289
include/image.mk

@@ -1,289 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-override TARGET_BUILD=
-include $(INCLUDE_DIR)/prereq.mk
-include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/host.mk
-
-override MAKE:=$(_SINGLE)$(SUBMAKE)
-override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE)
-
-KDIR=$(KERNEL_BUILD_DIR)
-DTS_DIR:=$(LINUX_DIR)/arch/$(ARCH)/boot/dts/
-
-IMG_PREFIX:=librecmc-$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
-
-MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt
-
-ifneq ($(CONFIG_BIG_ENDIAN),)
-  JFFS2OPTS     :=  --big-endian --squash-uids -v
-else
-  JFFS2OPTS     :=  --little-endian --squash-uids -v
-endif
-
-ifeq ($(CONFIG_JFFS2_RTIME),y)
-  JFFS2OPTS += -X rtime
-endif
-ifeq ($(CONFIG_JFFS2_ZLIB),y)
-  JFFS2OPTS += -X zlib
-endif
-ifeq ($(CONFIG_JFFS2_LZMA),y)
-  JFFS2OPTS += -X lzma --compression-mode=size
-endif
-ifneq ($(CONFIG_JFFS2_RTIME),y)
-  JFFS2OPTS += -x rtime
-endif
-ifneq ($(CONFIG_JFFS2_ZLIB),y)
-  JFFS2OPTS += -x zlib
-endif
-ifneq ($(CONFIG_JFFS2_LZMA),y)
-  JFFS2OPTS += -x lzma
-endif
-
-JFFS2OPTS += $(MKFS_DEVTABLE_OPT)
-
-SQUASHFS_BLOCKSIZE := $(CONFIG_TARGET_SQUASHFS_BLOCK_SIZE)k
-SQUASHFSOPT := -b $(SQUASHFS_BLOCKSIZE)
-SQUASHFSOPT += -p '/dev d 755 0 0' -p '/dev/console c 600 0 0 5 1'
-SQUASHFSCOMP := gzip
-LZMA_XZ_OPTIONS := -Xpreset 9 -Xe -Xlc 0 -Xlp 2 -Xpb 2
-ifeq ($(CONFIG_SQUASHFS_LZMA),y)
-  SQUASHFSCOMP := lzma $(LZMA_XZ_OPTIONS)
-endif
-ifeq ($(CONFIG_SQUASHFS_XZ),y)
-  ifneq ($(filter arm x86 powerpc sparc,$(LINUX_KARCH)),)
-    BCJ_FILTER:=-Xbcj $(LINUX_KARCH)
-  endif
-  SQUASHFSCOMP := xz $(LZMA_XZ_OPTIONS) $(BCJ_FILTER)
-endif
-
-JFFS2_BLOCKSIZE ?= 64k 128k
-
-fs-types-$(CONFIG_TARGET_ROOTFS_SQUASHFS) += squashfs
-fs-types-$(CONFIG_TARGET_ROOTFS_JFFS2) += $(addprefix jffs2-,$(JFFS2_BLOCKSIZE))
-fs-types-$(CONFIG_TARGET_ROOTFS_JFFS2_NAND) += $(addprefix jffs2-nand-,$(NAND_BLOCKSIZE))
-fs-types-$(CONFIG_TARGET_ROOTFS_EXT4FS) += ext4
-fs-types-$(CONFIG_TARGET_ROOTFS_ISO) += iso
-fs-subtypes-$(CONFIG_TARGET_ROOTFS_JFFS2) += $(addsuffix -raw,$(addprefix jffs2-,$(JFFS2_BLOCKSIZE)))
-fs-subtypes-$(CONFIG_TARGET_ROOTFS_CPIOGZ) += cpiogz
-fs-subtypes-$(CONFIG_TARGET_ROOTFS_TARGZ) += targz
-
-TARGET_FILESYSTEMS := $(fs-types-y)
-
-define add_jffs2_mark
-	echo -ne '\xde\xad\xc0\xde' >> $(1)
-endef
-
-define toupper
-$(shell echo $(1) | tr '[:lower:]' '[:upper:]')
-endef
-
-# pad to 4k, 8k, 16k, 64k, 128k, 256k and add jffs2 end-of-filesystem mark
-define prepare_generic_squashfs
-	$(STAGING_DIR_HOST)/bin/padjffs2 $(1) 4 8 16 64 128 256
-endef
-
-define Image/BuildKernel/Initramfs
-	cp $(KDIR)/vmlinux-initramfs.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux-initramfs.elf
-	$(call Image/Build/Initramfs)
-endef
-
-define Image/BuildKernel/MkuImage
-	mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \
-		-n '$(call toupper,$(ARCH)) libreCMC Linux-$(LINUX_VERSION)' -d $(4) $(5)
-endef
-
-define Image/BuildKernel/MkFIT
-	$(TOPDIR)/scripts/mkits.sh \
-		-D $(1) -o $(KDIR)/fit-$(1).its -k $(2) -d $(3) -C $(4) -a $(5) -e $(6) \
-		-A $(ARCH) -v $(LINUX_VERSION)
-	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $(KDIR)/fit-$(1).its $(KDIR)/fit-$(1)$(7).itb
-endef
-
-define Image/mkfs/jffs2/sub
-		$(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(3) --pad -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(2) -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/'
-		$(call add_jffs2_mark,$(KDIR)/root.jffs2-$(2))
-endef
-
-define Image/mkfs/jffs2/sub-raw
-		$(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(3) -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(2)-raw -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/'
-endef
-
-define Image/mkfs/jffs2/template
-  Image/mkfs/jffs2-$(1) = $$(call Image/mkfs/jffs2/sub,$(1),$(1),$(JFFS2OPTS))
-  Image/mkfs/jffs2-$(1)-raw = $$(call Image/mkfs/jffs2/sub-raw,$(1),$(1),$(JFFS2OPTS))
-
-endef
-
-define Image/mkfs/jffs2-nand/template
-  Image/mkfs/jffs2-nand-$(1) = \
-	$$(call Image/mkfs/jffs2/sub, \
-		$(word 2,$(subst -, ,$(1))),nand-$(1), \
-			$(JFFS2OPTS) --no-cleanmarkers --pagesize=$(word 1,$(subst -, ,$(1))))
-
-endef
-
-$(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/template,$(S))))
-$(eval $(foreach S,$(NAND_BLOCKSIZE),$(call Image/mkfs/jffs2-nand/template,$(S))))
-
-define Image/mkfs/squashfs
-	$(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1)
-endef
-
-# $(1): board name
-# $(2): rootfs type
-# $(3): kernel image
-ifneq ($(CONFIG_NAND_SUPPORT),)
-   define Image/Build/SysupgradeNAND
-	mkdir -p "$(KDIR_TMP)/sysupgrade-$(1)/"
-	echo "BOARD=$(1)" > "$(KDIR_TMP)/sysupgrade-$(1)/CONTROL"
-	[ -z "$(2)" ] || $(CP) "$(KDIR)/root.$(2)" "$(KDIR_TMP)/sysupgrade-$(1)/root"
-	[ -z "$(3)" ] || $(CP) "$(3)" "$(KDIR_TMP)/sysupgrade-$(1)/kernel"
-	(cd "$(KDIR_TMP)"; $(TAR) cvf \
-		"$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2)-sysupgrade.tar" sysupgrade-$(1))
-   endef
-# $(1) board name
-# $(2) ubinize-image options (e.g. --uboot-env and/or --kernel kernelimage)
-# $(3) rootfstype (e.g. squashfs or ubifs)
-# $(4) options to pass-through to ubinize (i.e. $($(PROFILE)_UBI_OPTS)))
-   define Image/Build/UbinizeImage
-	sh $(TOPDIR)/scripts/ubinize-image.sh $(2) \
-		"$(KDIR)/root.$(3)" \
-		"$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(3)-ubinized.bin" \
-		$(4)
-   endef
-
-endif
-
-ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
-    define Image/mkfs/ubifs/generate
-	$(CP) ./ubinize$(1).cfg $(KDIR)
-	( cd $(KDIR); \
-		$(STAGING_DIR_HOST)/bin/ubinize \
-		$(if $($(PROFILE)_UBI_OPTS), \
-			$(shell echo $($(PROFILE)_UBI_OPTS)), \
-			$(shell echo $(UBI_OPTS)) \
-		) \
-		-o $(KDIR)/root$(1).ubi \
-		ubinize$(1).cfg \
-	)
-    endef
-
-    define Image/mkfs/ubifs
-
-        ifneq ($($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS),)
-		$(STAGING_DIR_HOST)/bin/mkfs.ubifs \
-			$(if $($(PROFILE)_UBIFS_OPTS), \
-				$(shell echo $($(PROFILE)_UBIFS_OPTS)), \
-				$(shell echo $(UBIFS_OPTS)) \
-			) \
-			$(if $(CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP),--space-fixup) \
-			$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--force-compr=none) \
-			$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--force-compr=lzo) \
-			$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--force-compr=zlib) \
-			$(if $(shell echo $(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)),--jrn-size=$(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)) \
-			--squash-uids \
-			-o $(KDIR)/root.ubifs \
-			-d $(TARGET_DIR)
-        endif
-	$(call Image/Build,ubifs)
-
-        ifneq ($($(PROFILE)_UBI_OPTS)$(UBI_OPTS),)
-		$(call Image/mkfs/ubifs/generate,)
-		$(if $(wildcard ./ubinize-overlay.cfg),$(call Image/mkfs/ubifs/generate,-overlay))
-        endif
-	$(call Image/Build,ubi)
-    endef
-endif
-
-define Image/mkfs/cpiogz
-	( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9 >$(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz )
-endef
-
-define Image/mkfs/targz
-	$(TAR) -czpf $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE),-$(PROFILE))-rootfs.tar.gz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
-endef
-
-E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_PARTSIZE)*1024*1024/$(CONFIG_TARGET_EXT4_BLOCKSIZE))))
-
-define Image/mkfs/ext4
-# generate an ext2 fs
-	$(STAGING_DIR_HOST)/bin/genext2fs -U -B $(CONFIG_TARGET_EXT4_BLOCKSIZE) -b $(E2SIZE) -N $(CONFIG_TARGET_EXT4_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext4 -m $(CONFIG_TARGET_EXT4_RESERVED_PCT) $(MKFS_DEVTABLE_OPT)
-# convert it to ext4
-	$(STAGING_DIR_HOST)/bin/tune2fs $(if $(CONFIG_TARGET_EXT4_JOURNAL),-j) -O extents,uninit_bg,dir_index $(KDIR)/root.ext4
-# fix it up
-	$(STAGING_DIR_HOST)/bin/e2fsck -fy $(KDIR)/root.ext4
-endef
-
-define Image/mkfs/prepare/default
-	# Use symbolic permissions to avoid clobbering SUID/SGID/sticky bits
-	- $(FIND) $(TARGET_DIR) -type f -not -perm +0100 -not -name 'ssh_host*' -not -name 'shadow' -print0 | $(XARGS) -0 chmod u+rw,g+r,o+r
-	- $(FIND) $(TARGET_DIR) -type f -perm +0100 -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx
-	- $(FIND) $(TARGET_DIR) -type d -print0 | $(XARGS) -0 chmod u+rwx,g+rx,o+rx
-	$(INSTALL_DIR) $(TARGET_DIR)/tmp $(TARGET_DIR)/overlay
-	chmod 1777 $(TARGET_DIR)/tmp
-endef
-
-define Image/mkfs/prepare
-	$(call Image/mkfs/prepare/default)
-endef
-
-
-define Image/Checksum
-	( cd ${BIN_DIR} ; \
-		$(FIND) -maxdepth 1 -type f \! -name 'md5sums'  -printf "%P\n" | sort | xargs \
-		md5sum --binary > md5sums \
-	)
-endef
-
-define BuildImage/mkfs
-  install: mkfs-$(1)
-  .PHONY: mkfs-$(1)
-  mkfs-$(1): mkfs_prepare
-	$(Image/mkfs/$(1))
-
-endef
-
-define BuildImage
-
-  download:
-  prepare:
-  compile:
-  clean:
-  image_prepare:
-
-  ifeq ($(IB),)
-    .PHONY: download prepare compile clean image_prepare mkfs_prepare kernel_prepare install
-    compile:
-		$(call Build/Compile)
-
-    clean:
-		$(call Build/Clean)
-
-    image_prepare: compile
-		$(call Image/Prepare)
-  endif
-
-  mkfs_prepare: image_prepare
-	$(call Image/mkfs/prepare)
-
-  kernel_prepare: mkfs_prepare
-	$(call Image/BuildKernel)
-	$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Image/BuildKernel/Initramfs))
-	$(call Image/InstallKernel)
-
-  $(foreach fs,$(TARGET_FILESYSTEMS) $(fs-subtypes-y),$(call BuildImage/mkfs,$(fs)))
-
-  install: kernel_prepare
-	$(foreach fs,$(TARGET_FILESYSTEMS),
-		$(call Image/Build,$(fs))
-	)
-	$(call Image/mkfs/ubifs)
-	$(call Image/Checksum)
-
-endef

+ 0 - 144
include/kernel-build.mk

@@ -1,144 +0,0 @@
-#
-# Copyright (C) 2006-2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(INCLUDE_DIR)/host.mk
-include $(INCLUDE_DIR)/prereq.mk
-
-ifneq ($(DUMP),1)
-  all: compile
-endif
-
-export QUILT=1
-STAMP_PREPARED:=$(LINUX_DIR)/.prepared
-STAMP_CONFIGURED:=$(LINUX_DIR)/.configured
-include $(INCLUDE_DIR)/download.mk
-include $(INCLUDE_DIR)/quilt.mk
-include $(INCLUDE_DIR)/kernel-defaults.mk
-
-define Kernel/Prepare
-	$(call Kernel/Prepare/Default)
-endef
-
-define Kernel/Configure
-	$(call Kernel/Configure/Default)
-endef
-
-define Kernel/CompileModules
-	$(call Kernel/CompileModules/Default)
-endef
-
-define Kernel/CompileImage
-	$(call Kernel/CompileImage/Default)
-	$(call Kernel/CompileImage/Initramfs)
-endef
-
-define Kernel/Clean
-	$(call Kernel/Clean/Default)
-endef
-
-define Download/kernel
-  URL:=$(LINUX_SITE)
-  FILE:=$(LINUX_SOURCE)
-  MD5SUM:=$(LINUX_KERNEL_MD5SUM)
-endef
-
-ifdef CONFIG_COLLECT_KERNEL_DEBUG
-  define Kernel/CollectDebug
-	rm -rf $(KERNEL_BUILD_DIR)/debug
-	mkdir -p $(KERNEL_BUILD_DIR)/debug/modules
-	$(CP) $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/debug/
-	-$(CP) \
-		$(STAGING_DIR_ROOT)/lib/modules/$(LINUX_VERSION)-gnu/* \
-		$(KERNEL_BUILD_DIR)/debug/modules/
-	$(FIND) $(KERNEL_BUILD_DIR)/debug -type f | $(XARGS) $(KERNEL_CROSS)strip --only-keep-debug
-	$(TAR) c -C $(KERNEL_BUILD_DIR) debug | bzip2 -c -9 > $(BIN_DIR)/kernel-debug.tar.bz2
-  endef
-endif
-
-define BuildKernel
-  $(if $(QUILT),$(Build/Quilt))
-  $(if $(LINUX_SITE),$(call Download,kernel))
-
-  .NOTPARALLEL:
-
-  $(STAMP_PREPARED): $(if $(LINUX_SITE),$(DL_DIR)/$(LINUX_SOURCE))
-	-rm -rf $(KERNEL_BUILD_DIR)
-	-mkdir -p $(KERNEL_BUILD_DIR)
-	$(Kernel/Prepare)
-	touch $$@
-
-  $(KERNEL_BUILD_DIR)/symtab.h: FORCE
-	rm -f $(KERNEL_BUILD_DIR)/symtab.h
-	touch $(KERNEL_BUILD_DIR)/symtab.h
-	+$(MAKE) $(KERNEL_MAKEOPTS) vmlinux
-	find $(LINUX_DIR) $(STAGING_DIR_ROOT)/lib/modules -name \*.ko | \
-		xargs $(TARGET_CROSS)nm | \
-		awk '$$$$1 == "U" { print $$$$2 } ' | \
-		sort -u > $(KERNEL_BUILD_DIR)/mod_symtab.txt
-	$(TARGET_CROSS)nm -n $(LINUX_DIR)/vmlinux.o | grep ' [rR] __ksymtab' | sed -e 's,........ [rR] __ksymtab_,,' > $(KERNEL_BUILD_DIR)/kernel_symtab.txt
-	grep -Ff $(KERNEL_BUILD_DIR)/mod_symtab.txt $(KERNEL_BUILD_DIR)/kernel_symtab.txt > $(KERNEL_BUILD_DIR)/sym_include.txt
-	grep -Fvf $(KERNEL_BUILD_DIR)/mod_symtab.txt $(KERNEL_BUILD_DIR)/kernel_symtab.txt > $(KERNEL_BUILD_DIR)/sym_exclude.txt
-	( \
-		echo '#define SYMTAB_KEEP \'; \
-		cat $(KERNEL_BUILD_DIR)/sym_include.txt | \
-			awk '{print "KEEP(*(___ksymtab+" $$$$1 ")) \\" }'; \
-		echo; \
-		echo '#define SYMTAB_KEEP_GPL \'; \
-		cat $(KERNEL_BUILD_DIR)/sym_include.txt | \
-			awk '{print "KEEP(*(___ksymtab_gpl+" $$$$1 ")) \\" }'; \
-		echo; \
-		echo '#define SYMTAB_DISCARD \'; \
-		cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \
-			awk '{print "*(___ksymtab+" $$$$1 ") \\" }'; \
-		echo; \
-		echo '#define SYMTAB_DISCARD_GPL \'; \
-		cat $(KERNEL_BUILD_DIR)/sym_exclude.txt | \
-			awk '{print "*(___ksymtab_gpl+" $$$$1 ") \\" }'; \
-		echo; \
-	) > $$@
-
-  $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_KCONFIG_LIST) $(TOPDIR)/.config
-	$(Kernel/Configure)
-	touch $$@
-
-  $(LINUX_DIR)/.modules: $(STAMP_CONFIGURED) $(LINUX_DIR)/.config FORCE
-	$(Kernel/CompileModules)
-	touch $$@
-
-  $(LINUX_DIR)/.image: $(STAMP_CONFIGURED) $(if $(CONFIG_STRIP_KERNEL_EXPORTS),$(KERNEL_BUILD_DIR)/symtab.h) FORCE
-	$(Kernel/CompileImage)
-	$(Kernel/CollectDebug)
-	touch $$@
-	
-  mostlyclean: FORCE
-	$(Kernel/Clean)
-
-  define BuildKernel
-  endef
-
-  download: $(if $(LINUX_SITE),$(DL_DIR)/$(LINUX_SOURCE))
-  prepare: $(STAMP_CONFIGURED)
-  compile: $(LINUX_DIR)/.modules
-	$(MAKE) -C image compile TARGET_BUILD=
-
-  oldconfig menuconfig nconfig: $(STAMP_PREPARED) $(STAMP_CHECKED) FORCE
-	rm -f $(STAMP_CONFIGURED)
-	$(LINUX_RECONF_CMD) > $(LINUX_DIR)/.config
-	$(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@
-	$(LINUX_RECONF_DIFF) $(LINUX_DIR)/.config > $(LINUX_RECONFIG_TARGET)
-
-  install: $(LINUX_DIR)/.image
-	+$(MAKE) -C image compile install TARGET_BUILD=
-
-  clean: FORCE
-	rm -rf $(KERNEL_BUILD_DIR)
-
-  image-prereq:
-	@+$(NO_TRACE_MAKE) -s -C image prereq TARGET_BUILD=
-
-  prereq: image-prereq
-
-endef

+ 0 - 174
include/kernel-defaults.mk

@@ -1,174 +0,0 @@
-#
-# Copyright (C) 2006-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-KERNEL_MAKEOPTS := -C $(LINUX_DIR) \
-	HOSTCFLAGS="$(HOST_CFLAGS) -Wall -Wmissing-prototypes -Wstrict-prototypes" \
-	CROSS_COMPILE="$(KERNEL_CROSS)" \
-	ARCH="$(LINUX_KARCH)" \
-	KBUILD_HAVE_NLS=no \
-	CONFIG_SHELL="$(BASH)" \
-	$(if $(findstring c,$(LIBRECMC_VERBOSE)),V=1,V='')
-
-ifdef CONFIG_STRIP_KERNEL_EXPORTS
-  KERNEL_MAKEOPTS += \
-	EXTRA_LDSFLAGS="-I$(KERNEL_BUILD_DIR) -include symtab.h"
-endif
-
-INITRAMFS_EXTRA_FILES ?= $(GENERIC_PLATFORM_DIR)/image/initramfs-base-files.txt
-
-ifneq (,$(KERNEL_CC))
-  KERNEL_MAKEOPTS += CC="$(KERNEL_CC)"
-endif
-
-ifdef CONFIG_USE_SPARSE
-  KERNEL_MAKEOPTS += C=1 CHECK=$(STAGING_DIR_HOST)/bin/sparse
-endif
-
-export HOST_EXTRACFLAGS=-I$(STAGING_DIR_HOST)/include
-
-# defined in quilt.mk
-Kernel/Patch:=$(Kernel/Patch/Default)
-
-KERNEL_GIT_OPTS:=
-ifneq ($(strip $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY)),"")
-  KERNEL_GIT_OPTS+=--reference $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY)
-endif
-
-ifneq ($(strip $(CONFIG_KERNEL_GIT_BRANCH)),"")
-  KERNEL_GIT_OPTS+=--branch $(CONFIG_KERNEL_GIT_BRANCH)
-endif
-
-ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"")
-  ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"")
-    define Kernel/Prepare/Default
-	xzcat $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
-	$(Kernel/Patch)
-	touch $(LINUX_DIR)/.quilt_used
-    endef
-  else
-    define Kernel/Prepare/Default
-	git clone $(KERNEL_GIT_OPTS) $(CONFIG_KERNEL_GIT_CLONE_URI) $(LINUX_DIR)
-    endef
-  endif
-else
-  define Kernel/Prepare/Default
-	mkdir -p $(KERNEL_BUILD_DIR)
-	if [ -d $(LINUX_DIR) ]; then \
-		rmdir $(LINUX_DIR); \
-	fi
-	ln -s $(CONFIG_EXTERNAL_KERNEL_TREE) $(LINUX_DIR)
-  endef
-endif
-
-ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
-  ifeq ($(strip $(CONFIG_EXTERNAL_CPIO)),"")
-    define Kernel/SetInitramfs/PreConfigure
-	grep -v -e INITRAMFS -e CONFIG_RD_ -e CONFIG_BLK_DEV_INITRD $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
-	echo 'CONFIG_BLK_DEV_INITRD=y' >> $(LINUX_DIR)/.config
-	echo 'CONFIG_INITRAMFS_SOURCE="$(strip $(TARGET_DIR) $(INITRAMFS_EXTRA_FILES))"' >> $(LINUX_DIR)/.config
-    endef
-  else
-    define Kernel/SetInitramfs/PreConfigure
-	grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
-	echo 'CONFIG_INITRAMFS_SOURCE="$(call qstrip,$(CONFIG_EXTERNAL_CPIO))"' >> $(LINUX_DIR)/.config
-    endef
-  endif
-
-  define Kernel/SetInitramfs
-	mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
-	$(call Kernel/SetInitramfs/PreConfigure)
-	echo 'CONFIG_INITRAMFS_ROOT_UID=$(shell id -u)' >> $(LINUX_DIR)/.config
-	echo 'CONFIG_INITRAMFS_ROOT_GID=$(shell id -g)' >> $(LINUX_DIR)/.config
-	echo "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_NONE),CONFIG_INITRAMFS_COMPRESSION_NONE=y,# CONFIG_INITRAMFS_COMPRESSION_NONE is not set)" >> $(LINUX_DIR)/.config
-	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP),CONFIG_INITRAMFS_COMPRESSION_GZIP=y\nCONFIG_RD_GZIP=y,# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set\n# CONFIG_RD_GZIP is not set)" >> $(LINUX_DIR)/.config
-	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2),CONFIG_INITRAMFS_COMPRESSION_BZIP2=y\nCONFIG_RD_BZIP2=y,# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set\n# CONFIG_RD_BZIP2 is not set)" >> $(LINUX_DIR)/.config
-	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZMA),CONFIG_INITRAMFS_COMPRESSION_LZMA=y\nCONFIG_RD_LZMA=y,# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set\n# CONFIG_RD_LZMA is not set)" >> $(LINUX_DIR)/.config
-	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZO),CONFIG_INITRAMFS_COMPRESSION_LZO=y\nCONFIG_RD_LZO=y,# CONFIG_INITRAMFS_COMPRESSION_LZO is not set\n# CONFIG_RD_LZO is not set)" >> $(LINUX_DIR)/.config
-	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_XZ),CONFIG_INITRAMFS_COMPRESSION_XZ=y\nCONFIG_RD_XZ=y,# CONFIG_INITRAMFS_COMPRESSION_XZ is not set\n# CONFIG_RD_XZ is not set)" >> $(LINUX_DIR)/.config
-	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZ4),CONFIG_INITRAMFS_COMPRESSION_LZ4=y\nCONFIG_RD_LZ4=y,# CONFIG_INITRAMFS_COMPRESSION_LZ4 is not set\n# CONFIG_RD_LZ4 is not set)" >> $(LINUX_DIR)/.config
-  endef
-else
-endif
-
-define Kernel/SetNoInitramfs
-	mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
-	grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
-	echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
-endef
-
-define Kernel/Configure/Default
-	$(LINUX_CONF_CMD) > $(LINUX_DIR)/.config.target
-# copy CONFIG_KERNEL_* settings over to .config.target
-	awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target
-	echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target
-	echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target
-	echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> $(LINUX_DIR)/.config.target
-	echo "# CONFIG_KPROBES is not set" >> $(LINUX_DIR)/.config.target
-	$(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override
-	$(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config
-	$(call Kernel/SetNoInitramfs)
-	rm -rf $(KERNEL_BUILD_DIR)/modules
-	$(_SINGLE) [ -d $(LINUX_DIR)/user_headers ] || $(MAKE) $(KERNEL_MAKEOPTS) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install
-	$(SH_FUNC) grep '=[ym]' $(LINUX_DIR)/.config | LC_ALL=C sort | md5s > $(LINUX_DIR)/.vermagic
-endef
-
-define Kernel/Configure/Initramfs
-	$(call Kernel/SetInitramfs)
-endef
-
-define Kernel/CompileModules/Default
-	rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map
-	+$(MAKE) $(KERNEL_MAKEOPTS) modules
-endef
-
-OBJCOPY_STRIP = -R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
-
-# AVR32 uses a non-standard location
-ifeq ($(LINUX_KARCH),avr32)
-IMAGES_DIR:=images
-endif
-
-# AMD64 shares the location with x86
-ifeq ($(LINUX_KARCH),x86_64)
-IMAGES_DIR:=../../x86/boot
-endif
-
-define Kernel/CopyImage
-	$(KERNEL_CROSS)objcopy -O binary $(OBJCOPY_STRIP) -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)$(1)
-	$(KERNEL_CROSS)objcopy $(OBJCOPY_STRIP) -S $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux$(1).elf
-	$(CP) $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux.debug
-ifneq ($(KERNELNAME),)
-	$(foreach k,$(filter-out dtbs,$(KERNELNAME)),$(CP) $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/$(IMAGES_DIR)/$(k) $(KERNEL_BUILD_DIR)/$(k)$(1);)
-endif
-endef
-
-define Kernel/CompileImage/Default
-	rm -f $(TARGET_DIR)/init
-	+$(MAKE) $(KERNEL_MAKEOPTS) $(if $(KERNELNAME),$(KERNELNAME),all) modules
-	$(call Kernel/CopyImage)
-endef
-
-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
-define Kernel/CompileImage/Initramfs
-	$(call Kernel/Configure/Initramfs)
-	$(CP) $(GENERIC_PLATFORM_DIR)/base-files/init $(TARGET_DIR)/init
-	rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio*
-	+$(MAKE) $(KERNEL_MAKEOPTS) $(if $(KERNELNAME),$(KERNELNAME),all) modules
-	$(call Kernel/CopyImage,-initramfs)
-endef
-else
-define Kernel/CompileImage/Initramfs
-endef
-endif
-
-define Kernel/Clean/Default
-	rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.configured
-	rm -f $(LINUX_KERNEL)
-	$(_SINGLE)$(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean
-endef
-
-

+ 0 - 25
include/kernel-version.mk

@@ -1,25 +0,0 @@
-# Use the default kernel version if the Makefile doesn't override it
-
-LINUX_RELEASE?=1
-
-LINUX_VERSION-3.10 = .58
-LINUX_VERSION-3.14 = .26
-LINUX_VERSION-3.18 =
-
-LINUX_KERNEL_MD5SUM-3.10.58 = bca8cde0dddf27d980fe1d393ea743f7
-LINUX_KERNEL_MD5SUM-3.14.26 = 69b27733f335c557946edd58554debb7
-LINUX_KERNEL_MD5SUM-3.18    = 9e854df51ca3fef8bfe566dbd7b89241
-
-ifdef KERNEL_PATCHVER
-  LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
-endif
-
-split_version=$(subst ., ,$(1))
-merge_version=$(subst $(space),.,$(1))
-KERNEL_BASE=$(firstword $(subst -, ,$(LINUX_VERSION)))
-KERNEL=$(call merge_version,$(wordlist 1,2,$(call split_version,$(KERNEL_BASE))))
-KERNEL_PATCHVER ?= $(KERNEL)
-
-# disable the md5sum check for unknown kernel versions
-LINUX_KERNEL_MD5SUM:=$(LINUX_KERNEL_MD5SUM-$(strip $(LINUX_VERSION)))
-LINUX_KERNEL_MD5SUM?=x

+ 0 - 231
include/kernel.mk

@@ -1,231 +0,0 @@
-# 
-# Copyright (C) 2006-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-ifeq ($(__target_inc),)
-  include $(INCLUDE_DIR)/target.mk
-endif
-
-ifeq ($(DUMP),1)
-  KERNEL?=<KERNEL>
-  BOARD?=<BOARD>
-  LINUX_VERSION?=<LINUX_VERSION>
-  LINUX_VERMAGIC?=<LINUX_VERMAGIC>
-else
-  ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
-    export GCC_HONOUR_COPTS=s
-  endif
-
-  LINUX_KMOD_SUFFIX=ko
-
-  ifneq (,$(findstring uml,$(BOARD)))
-    KERNEL_CC?=$(HOSTCC)
-    KERNEL_CROSS?=
-  else
-    KERNEL_CC?=$(TARGET_CC)
-    KERNEL_CROSS?=$(TARGET_CROSS)
-  endif
-
-  ifeq ($(TARGET_BUILD),1)
-    PATCH_DIR ?= ./patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
-    FILES_DIR ?= $(foreach dir,$(wildcard ./files ./files-$(KERNEL_PATCHVER)),"$(dir)")
-  endif
-  KERNEL_BUILD_DIR ?= $(BUILD_DIR)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))
-  LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
-  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1)
-    LINUX_UAPI_DIR=uapi/
-  endif
-  LINUX_VERMAGIC:=$(strip $(shell cat $(LINUX_DIR)/.vermagic 2>/dev/null))
-  LINUX_VERMAGIC:=$(if $(LINUX_VERMAGIC),$(LINUX_VERMAGIC),unknown)
-
-  LINUX_UNAME_VERSION:=$(if $(word 3,$(subst ., ,$(KERNEL_BASE))),$(KERNEL_BASE),$(KERNEL_BASE).0)
-  ifneq ($(findstring -rc,$(LINUX_VERSION)),)
-    LINUX_UNAME_VERSION:=$(LINUX_UNAME_VERSION)-$(strip $(lastword $(subst -, ,$(LINUX_VERSION))))
-  endif
-
-  MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)-gnu
-  TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
-
-  LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux
-
-  LINUX_SOURCE:=linux-libre-$(LINUX_VERSION)-gnu.tar.xz
-  TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,)
-  ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE))$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),)
-      LINUX_SITE:=@KERNEL/linux/kernel/v3.x$(TESTING)
-  endif
-
-  ifneq ($(TARGET_BUILD),1)
-    PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
-  endif
-endif
-
-ifneq (,$(findstring uml,$(BOARD)))
-  LINUX_KARCH=um
-else
-  ifeq (,$(LINUX_KARCH))
-    LINUX_KARCH=$(strip $(subst i386,x86,$(subst armeb,arm,$(subst mipsel,mips,$(subst mips64,mips,$(subst mips64el,mips,$(subst sh2,sh,$(subst sh3,sh,$(subst sh4,sh,$(subst aarch64,arm64,$(subst aarch64_be,arm64,$(ARCH))))))))))))
-  endif
-endif
-
-
-define KernelPackage/Defaults
-  FILES:=
-  AUTOLOAD:=
-endef
-
-define ModuleAutoLoad
-	$(SH_FUNC) \
-	export modules=; \
-	probe_module() { \
-		mods="$$$$$$$$1"; \
-		boot="$$$$$$$$2"; \
-		shift 2; \
-		for mod in $$$$$$$$mods; do \
-			mkdir -p $(2)/etc/modules.d; \
-			echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$(1); \
-		done; \
-		if [ -e $(2)/etc/modules.d/$(1) ]; then \
-			if [ "$$$$$$$$boot" = "1" ]; then \
-				mkdir -p $(2)/etc/modules-boot.d; \
-				ln -s ../modules.d/$(1) $(2)/etc/modules-boot.d/; \
-			fi; \
-			modules="$$$$$$$${modules:+$$$$$$$$modules}"; \
-		fi; \
-	}; \
-	add_module() { \
-		priority="$$$$$$$$1"; \
-		mods="$$$$$$$$2"; \
-		boot="$$$$$$$$3"; \
-		shift 3; \
-		for mod in $$$$$$$$mods; do \
-			mkdir -p $(2)/etc/modules.d; \
-			echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$$$$$$$$priority-$(1); \
-		done; \
-		if [ -e $(2)/etc/modules.d/$$$$$$$$priority-$(1) ]; then \
-			if [ "$$$$$$$$boot" = "1" ]; then \
-				mkdir -p $(2)/etc/modules-boot.d; \
-				ln -s ../modules.d/$$$$$$$$priority-$(1) $(2)/etc/modules-boot.d/; \
-			fi; \
-			modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$priority-$(1)"; \
-		fi; \
-	}; \
-	$(3) \
-	if [ -n "$$$$$$$$modules" ]; then \
-		mkdir -p $(2)/etc/modules.d; \
-		mkdir -p $(2)/CONTROL; \
-		echo "#!/bin/sh" > $(2)/CONTROL/postinst; \
-		echo "[ -z \"\$$$$$$$$IPKG_INSTROOT\" ] || exit 0" >> $(2)/CONTROL/postinst; \
-		echo ". /lib/functions.sh" >> $(2)/CONTROL/postinst; \
-		echo "insert_modules $$$$$$$$modules" >> $(2)/CONTROL/postinst; \
-		chmod 0755 $(2)/CONTROL/postinst; \
-	fi
-endef
-
-ifeq ($(DUMP)$(TARGET_BUILD),)
-  -include $(LINUX_DIR)/.config
-endif
-
-define KernelPackage/depends
-  $(STAMP_BUILT): $(LINUX_DIR)/.config
-  define KernelPackage/depends
-  endef
-endef
-
-define KernelPackage
-  NAME:=$(1)
-  $(eval $(call Package/Default))
-  $(eval $(call KernelPackage/Defaults))
-  $(eval $(call KernelPackage/$(1)))
-  $(eval $(call KernelPackage/$(1)/$(BOARD)))
-
-  define Package/kmod-$(1)
-    TITLE:=$(TITLE)
-    SECTION:=kernel
-    CATEGORY:=Kernel modules
-    DESCRIPTION:=$(DESCRIPTION)
-    EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC))
-    VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE))
-    $(call KernelPackage/$(1))
-    $(call KernelPackage/$(1)/$(BOARD))
-  endef
-
-  ifdef KernelPackage/$(1)/description
-    define Package/kmod-$(1)/description
-$(call KernelPackage/$(1)/description)
-    endef
-  endif
-
-  ifdef KernelPackage/$(1)/config
-    define Package/kmod-$(1)/config
-$(call KernelPackage/$(1)/config)
-    endef
-  endif
-
-  $(call KernelPackage/depends)
-
-  ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m y,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)
-    ifneq ($(if $(SDK),$(filter-out $(LINUX_DIR)/%.ko,$(FILES)),$(strip $(FILES))),)
-      define Package/kmod-$(1)/install
-		  @for mod in $$(FILES); do \
-			if [ -e $$$$$$$$mod ]; then \
-				mkdir -p $$(1)/$(MODULES_SUBDIR) ; \
-				$(CP) -L $$$$$$$$mod $$(1)/$(MODULES_SUBDIR)/ ; \
-			elif [ -e "$(LINUX_DIR)/modules.builtin" ]; then \
-				if grep -q "$$$$$$$${mod##$(LINUX_DIR)/}" "$(LINUX_DIR)/modules.builtin"; then \
-					echo "NOTICE: module '$$$$$$$$mod' is built-in."; \
-				else \
-					echo "ERROR: module '$$$$$$$$mod' is missing." >&2; \
-					exit 1; \
-				fi; \
-			else \
-				echo "WARNING: module '$$$$$$$$mod' missing and modules.builtin not available, assuming built-in." >&2; \
-			fi; \
-		  done;
-		  $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
-		  $(call KernelPackage/$(1)/install,$$(1))
-      endef
-    endif
-  $(if $(CONFIG_PACKAGE_kmod-$(1)),
-    else
-      compile: $(1)-disabled
-      $(1)-disabled:
-		@echo "WARNING: kmod-$(1) is not available in the kernel config - generating empty package" >&2
-
-      define Package/kmod-$(1)/install
-		true
-      endef
-  )
-  endif
-  $$(eval $$(call BuildPackage,kmod-$(1)))
-
-  $$(IPKG_kmod-$(1)): $$(wildcard $$(FILES))
-endef
-
-define AutoLoad
-  add_module "$(1)" "$(2)" "$(3)";
-endef
-
-define AutoProbe
-  probe_module "$(1)" "$(2)";
-endef
-
-version_field=$(if $(word $(1),$(2)),$(word $(1),$(2)),0)
-kernel_version_merge=$$(( ($(call version_field,1,$(1)) << 24) + ($(call version_field,2,$(1)) << 16) + ($(call version_field,3,$(1)) << 8) + $(call version_field,4,$(1)) ))
-
-ifdef DUMP
-  kernel_version_cmp=
-else
-  kernel_version_cmp=$(shell [ $(call kernel_version_merge,$(call split_version,$(2))) $(1) $(call kernel_version_merge,$(call split_version,$(3))) ] && echo 1 )
-endif
-
-CompareKernelPatchVer=$(if $(call kernel_version_cmp,-$(2),$(1),$(3)),1,0)
-
-kernel_patchver_gt=$(call kernel_version_cmp,-gt,$(KERNEL_PATCHVER),$(1))
-kernel_patchver_ge=$(call kernel_version_cmp,-ge,$(KERNEL_PATCHVER),$(1))
-kernel_patchver_eq=$(call kernel_version_cmp,-eq,$(KERNEL_PATCHVER),$(1))
-kernel_patchver_le=$(call kernel_version_cmp,-le,$(KERNEL_PATCHVER),$(1))
-kernel_patchver_lt=$(call kernel_version_cmp,-lt,$(KERNEL_PATCHVER),$(1))
-

+ 0 - 12
include/ltqtapi.mk

@@ -1,12 +0,0 @@
-LTQ_TAPI_BUILD_DEPENDS:=TARGET_lantiq_xway:kmod-ltq-tapi \
-	TARGET_lantiq_xway:kmod-ltq-vmmc \
-	TARGET_lantiq_falcon:kmod-ltq-tapi \
-	TARGET_lantiq_falcon:kmod-ltq-vmmc
-
-LTQ_TAPI_TARGET:=@(TARGET_lantiq_falcon||TARGET_lantiq_xway)
-
-LTQ_TAPI_DEPENDS:=$(LTQ_TAPI_TARGET) \
-	+TARGET_lantiq_xway:kmod-ltq-tapi \
-	+TARGET_lantiq_xway:kmod-ltq-vmmc \
-	+TARGET_lantiq_falcon:kmod-ltq-tapi \
-	+TARGET_lantiq_falcon:kmod-ltq-vmmc

+ 0 - 382
include/netfilter.mk

@@ -1,382 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-ifneq ($(__inc_netfilter),1)
-__inc_netfilter:=1
-
-ifeq ($(NF_KMOD),1)
-P_V4:=ipv4/netfilter/
-P_V6:=ipv6/netfilter/
-P_XT:=netfilter/
-P_EBT:=bridge/netfilter/
-endif
-
-# 1: variable
-# 2: kconfig symbols
-# 3: file list
-# 4: version dependency
-define nf_add
- $(if $(4),ifeq ($$(strip $$(call CompareKernelPatchVer,$$(KERNEL_PATCHVER),$(firstword $(4)),$(lastword $(4)))),1))
-  $(1)-$$($(2)) += $(3)
- $(if $(4),endif)
- KCONFIG_$(1) = $(filter-out $(2),$(KCONFIG_$(1))) $(2)
-endef
-
-
-# core
-
-# kernel only
-$(eval $(if $(NF_KMOD),$(call nf_add,NF_IPT,CONFIG_IP_NF_IPTABLES, $(P_V4)ip_tables),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NF_IPT,CONFIG_NETFILTER_XTABLES, $(P_XT)x_tables),))
-
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_CORE,CONFIG_NETFILTER_XTABLES, $(P_XT)xt_tcpudp),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_CORE,CONFIG_IP_NF_FILTER, $(P_V4)iptable_filter),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_CORE,CONFIG_IP_NF_MANGLE, $(P_V4)iptable_mangle),))
-
-# userland only
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CORE,CONFIG_IP_NF_IPTABLES, xt_standard ipt_icmp xt_tcp xt_udp xt_comment xt_id xt_set xt_SET)))
-
-$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_LIMIT, $(P_XT)xt_limit))
-$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_MAC, $(P_XT)xt_mac))
-$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_MULTIPORT, $(P_XT)xt_multiport))
-$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_COMMENT, $(P_XT)xt_comment))
-$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_ID, $(P_XT)xt_id))
-
-#cluster
-$(eval $(call nf_add,IPT_CLUSTER,CONFIG_NETFILTER_XT_MATCH_CLUSTER, $(P_XT)xt_cluster))
-
-$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_LOG, $(P_XT)xt_LOG, ge 3.4.0))
-$(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_LOG, $(P_V4)ipt_LOG, lt 3.4.0))
-$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_TARGET_TCPMSS, $(P_XT)xt_TCPMSS))
-$(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_REJECT, $(P_V4)ipt_REJECT))
-$(eval $(call nf_add,IPT_CORE,CONFIG_IP_NF_TARGET_REJECT, $(P_V4)nf_reject_ipv4, ge 3.18.0))
-$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MATCH_TIME, $(P_XT)xt_time))
-$(eval $(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MARK, $(P_XT)xt_mark))
-
-# kernel has xt_MARK.ko merged into xt_mark.ko, userspace is still separate
-# userland: xt_MARK.so
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CORE,CONFIG_NETFILTER_XT_MARK, $(P_XT)xt_MARK)))
-
-
-# conntrack
-
-# kernel only
-$(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK,CONFIG_NF_CONNTRACK, $(P_XT)nf_conntrack),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK,CONFIG_NF_CONNTRACK_RTCACHE, $(P_XT)nf_conntrack_rtcache),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK,CONFIG_NF_DEFRAG_IPV4, $(P_V4)nf_defrag_ipv4),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK,CONFIG_NF_CONNTRACK_IPV4, $(P_V4)nf_conntrack_ipv4),))
-
-$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_STATE, $(P_XT)xt_state))
-$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_RAW, $(P_V4)iptable_raw))
-$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_TARGET_NOTRACK, $(P_XT)xt_NOTRACK, lt 3.7.0))
-$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_TARGET_CT, $(P_XT)xt_CT))
-$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_CONNTRACK, $(P_XT)xt_conntrack))
-
-
-# conntrack-extra
-
-$(eval $(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_MATCH_CONNBYTES, $(P_XT)xt_connbytes))
-$(eval $(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_MATCH_CONNLIMIT, $(P_XT)xt_connlimit))
-$(eval $(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_CONNMARK, $(P_XT)xt_connmark))
-$(eval $(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_MATCH_HELPER, $(P_XT)xt_helper))
-$(eval $(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_MATCH_RECENT, $(P_XT)xt_recent))
-
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_CONNMARK, $(P_XT)xt_CONNMARK)))
-
-# extra
-
-$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE, $(if $(NF_KMOD),$(P_XT)xt_addrtype,$(P_XT)ipt_addrtype)))
-$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_OWNER, $(P_XT)xt_owner))
-$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_PHYSDEV, $(P_XT)xt_physdev))
-$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_PKTTYPE, $(P_XT)xt_pkttype))
-$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_QUOTA, $(P_XT)xt_quota))
-
-#$(eval $(call nf_add,IPT_EXTRA,CONFIG_IP_NF_TARGET_ROUTE, $(P_V4)ipt_ROUTE))
-
-
-# filter
-
-$(eval $(call nf_add,IPT_FILTER,CONFIG_NETFILTER_XT_MATCH_LAYER7, $(P_XT)xt_layer7))
-$(eval $(call nf_add,IPT_FILTER,CONFIG_NETFILTER_XT_MATCH_STRING, $(P_XT)xt_string))
-
-
-# ipopt
-
-$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, $(P_XT)xt_dscp))
-$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, $(P_XT)xt_DSCP))
-$(eval $(call nf_add,IPT_HASHLIMIT,CONFIG_NETFILTER_XT_MATCH_HASHLIMIT, $(P_XT)xt_hashlimit)) 
-$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_LENGTH, $(P_XT)xt_length))
-$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_STATISTIC, $(P_XT)xt_statistic))
-$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_TCPMSS, $(P_XT)xt_tcpmss))
-
-$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_CLASSIFY, $(P_XT)xt_CLASSIFY))
-$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_DSCP, $(P_V4)ipt_dscp))
-$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_ECN, $(P_V4)ipt_ECN))
-
-$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_ECN, $(P_XT)xt_ecn))
-
-# userland only
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, xt_tos)))
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, xt_TOS)))
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_HL, ipt_ttl)))
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_HL, ipt_TTL)))
-
-$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_HL, $(P_XT)xt_hl))
-$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_HL, $(P_XT)xt_HL))
-
-# iprange
-$(eval $(call nf_add,IPT_IPRANGE,CONFIG_NETFILTER_XT_MATCH_IPRANGE, $(P_XT)xt_iprange))
-
-#clusterip
-$(eval $(call nf_add,IPT_CLUSTERIP,CONFIG_IP_NF_TARGET_CLUSTERIP, $(P_V4)ipt_CLUSTERIP))
-
-# ipsec
-$(eval $(call nf_add,IPT_IPSEC,CONFIG_IP_NF_MATCH_AH, $(P_V4)ipt_ah))
-$(eval $(call nf_add,IPT_IPSEC,CONFIG_NETFILTER_XT_MATCH_ESP, $(P_XT)xt_esp))
-$(eval $(call nf_add,IPT_IPSEC,CONFIG_NETFILTER_XT_MATCH_POLICY, $(P_XT)xt_policy))
-
-
-# IPv6
-
-# kernel only
-$(eval $(if $(NF_KMOD),$(call nf_add,NF_IPT6,CONFIG_IP6_NF_IPTABLES, $(P_V6)ip6_tables),))
-
-$(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK6,CONFIG_NF_DEFRAG_IPV6, $(P_V6)nf_defrag_ipv6),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK6,CONFIG_NF_CONNTRACK_IPV6, $(P_V6)nf_conntrack_ipv6),))
-
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_FILTER, $(P_V6)ip6table_filter),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MANGLE, $(P_V6)ip6table_mangle),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_QUEUE, $(P_V6)ip6_queue),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_RAW, $(P_V6)ip6table_raw),))
-
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_IPTABLES, ip6t_icmp6)))
-
-
-$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_LOG, $(P_V6)ip6t_LOG))
-$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_REJECT, $(P_V6)ip6t_REJECT))
-$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_TARGET_REJECT, $(P_V6)nf_reject_ipv6, ge 3.18.0))
-
-# ipv6 extra
-$(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_IPV6HEADER, $(P_V6)ip6t_ipv6header))
-$(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_AH, $(P_V6)ip6t_ah))
-$(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_MH, $(P_V6)ip6t_mh))
-$(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_EUI64, $(P_V6)ip6t_eui64))
-$(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_OPTS, $(P_V6)ip6t_hbh))
-$(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_FRAG, $(P_V6)ip6t_frag))
-$(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_RT, $(P_V6)ip6t_rt))
-
-# nat
-
-# kernel only
-$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT, $(P_V4)nf_nat, lt 3.7.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT, $(P_XT)nf_nat, ge 3.7.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_IPV4, $(P_V4)nf_nat_ipv4, ge 3.7.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT6,CONFIG_NF_NAT_IPV6, $(P_V6)nf_nat_ipv6, ge 3.7.0),))
-
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT, $(P_XT)xt_nat, ge 3.7.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NETFILTER_XT_NAT, $(P_XT)xt_nat, ge 3.18.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT, $(P_V4)iptable_nat, lt 3.7.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NF_NAT_IPV4, $(P_V4)iptable_nat, ge 3.7.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_IP_NF_NAT, $(P_V4)iptable_nat, ge 3.18.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_NF_NAT_IPV6, $(P_V6)ip6table_nat, ge 3.7.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_MASQUERADE, $(P_V6)ip6t_MASQUERADE, ge 3.7.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_NPT, $(P_V6)ip6t_NPT, ge 3.7.0),))
-
-# userland only
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_NAT,CONFIG_NF_NAT, ipt_SNAT ipt_DNAT)))
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_NPT, ip6t_DNPT ip6t_SNPT)))
-
-$(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_MASQUERADE, $(P_V4)ipt_MASQUERADE))
-$(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_MASQUERADE, $(P_V4)nf_nat_masquerade_ipv4, ge 3.18.0))
-$(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_REDIRECT, $(P_XT)xt_REDIRECT, ge 3.7.0))
-$(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_REDIRECT, $(P_V4)ipt_REDIRECT, lt 3.7.0))
-
-
-# nat-extra
-
-$(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_NETMAP, $(P_XT)xt_NETMAP, ge 3.7.0))
-$(eval $(call nf_add,IPT_NAT_EXTRA,CONFIG_IP_NF_TARGET_NETMAP, $(P_V4)ipt_NETMAP, lt 3.7.0))
-
-
-# nathelper
-
-$(eval $(call nf_add,NF_NATHELPER,CONFIG_IP_NF_NAT_FTP, $(P_V4)ip_nat_ftp))
-$(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_CONNTRACK_FTP, $(P_XT)nf_conntrack_ftp))
-$(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_CONNTRACK_IRC, $(P_XT)nf_conntrack_irc))
-$(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_NAT_FTP, $(P_XT)nf_nat_ftp, ge 3.7.0))
-$(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_NAT_IRC, $(P_XT)nf_nat_irc, ge 3.7.0))
-$(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_NAT_FTP, $(P_V4)nf_nat_ftp, lt 3.7.0))
-$(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_NAT_IRC, $(P_V4)nf_nat_irc, lt 3.7.0))
-
-
-# nathelper-extra
-
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_BROADCAST, $(P_XT)nf_conntrack_broadcast))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_AMANDA, $(P_XT)nf_conntrack_amanda))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_AMANDA, $(P_XT)nf_nat_amanda, ge 3.7.0))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_AMANDA, $(P_V4)nf_nat_amanda, lt 3.7.0))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CT_PROTO_GRE, $(P_XT)nf_conntrack_proto_gre))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_PROTO_GRE, $(P_V4)nf_nat_proto_gre))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_H323, $(P_XT)nf_conntrack_h323))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_H323, $(P_V4)nf_nat_h323))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_PPTP, $(P_XT)nf_conntrack_pptp))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_PPTP, $(P_V4)nf_nat_pptp))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_SIP, $(P_XT)nf_conntrack_sip))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_SIP, $(P_XT)nf_nat_sip, ge 3.7.0))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_SIP, $(P_V4)nf_nat_sip, lt 3.7.0))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_SNMP, $(P_XT)nf_conntrack_snmp))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_SNMP_BASIC, $(P_V4)nf_nat_snmp_basic))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_TFTP, $(P_XT)nf_conntrack_tftp))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_TFTP, $(P_XT)nf_nat_tftp, ge 3.7.0))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_TFTP, $(P_V4)nf_nat_tftp, lt 3.7.0))
-
-
-# queue
-
-$(eval $(call nf_add,IPT_QUEUE,CONFIG_IP_NF_QUEUE, $(P_V4)ip_queue, lt 3.5.0))
-
-
-# ulog
-
-$(eval $(call nf_add,IPT_ULOG,CONFIG_IP_NF_TARGET_ULOG, $(P_V4)ipt_ULOG))
-
-
-# nflog
-
-$(eval $(call nf_add,IPT_NFLOG,CONFIG_NETFILTER_XT_TARGET_NFLOG, $(P_XT)xt_NFLOG))
-
-
-# nfqueue
-
-$(eval $(call nf_add,IPT_NFQUEUE,CONFIG_NETFILTER_XT_TARGET_NFQUEUE, $(P_XT)xt_NFQUEUE))
-
-
-# debugging
-
-$(eval $(call nf_add,IPT_DEBUG,CONFIG_NETFILTER_XT_TARGET_TRACE, $(P_XT)xt_TRACE))
-
-# tproxy
-
-$(eval $(call nf_add,IPT_TPROXY,CONFIG_NETFILTER_XT_MATCH_SOCKET, $(P_XT)xt_socket))
-$(eval $(call nf_add,IPT_TPROXY,CONFIG_NETFILTER_XT_TARGET_TPROXY, $(P_XT)xt_TPROXY))
-
-# led
-$(eval $(call nf_add,IPT_LED,CONFIG_NETFILTER_XT_TARGET_LED, $(P_XT)xt_LED))
-
-# tee
-
-$(eval $(call nf_add,IPT_TEE,CONFIG_NETFILTER_XT_TARGET_TEE, $(P_XT)xt_TEE))
-
-# u32 
-
-$(eval $(call nf_add,IPT_U32,CONFIG_NETFILTER_XT_MATCH_U32, $(P_XT)xt_u32))
-
-
-# netlink
-
-$(eval $(call nf_add,NFNETLINK,CONFIG_NETFILTER_NETLINK, $(P_XT)nfnetlink))
-
-# nflog
-
-$(eval $(call nf_add,NFNETLINK_LOG,CONFIG_NETFILTER_NETLINK_LOG, $(P_XT)nfnetlink_log))
-
-# nfqueue
-
-$(eval $(call nf_add,NFNETLINK_QUEUE,CONFIG_NETFILTER_NETLINK_QUEUE, $(P_XT)nfnetlink_queue))
-
-#
-# ebtables
-#
-
-$(eval $(if $(NF_KMOD),$(call nf_add,EBTABLES,CONFIG_BRIDGE_NF_EBTABLES, $(P_EBT)ebtables),))
-
-# ebtables: tables
-$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_BROUTE, $(P_EBT)ebtable_broute))
-$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_T_FILTER, $(P_EBT)ebtable_filter))
-$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_T_NAT, $(P_EBT)ebtable_nat))
-
-# ebtables: matches
-$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_802_3, $(P_EBT)ebt_802_3))
-$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_AMONG, $(P_EBT)ebt_among))
-$(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_ARP, $(P_EBT)ebt_arp))
-$(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_IP, $(P_EBT)ebt_ip))
-$(eval $(call nf_add,EBTABLES_IP6,CONFIG_BRIDGE_EBT_IP6, $(P_EBT)ebt_ip6))
-$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_LIMIT, $(P_EBT)ebt_limit))
-$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_MARK, $(P_EBT)ebt_mark_m))
-$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_PKTTYPE, $(P_EBT)ebt_pkttype))
-$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_STP, $(P_EBT)ebt_stp))
-$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_VLAN, $(P_EBT)ebt_vlan))
-
-# targets
-$(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_ARPREPLY, $(P_EBT)ebt_arpreply))
-$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_MARK_T, $(P_EBT)ebt_mark))
-$(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_DNAT, $(P_EBT)ebt_dnat))
-$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_REDIRECT, $(P_EBT)ebt_redirect))
-$(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_SNAT, $(P_EBT)ebt_snat))
-
-# watchers
-$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_LOG, $(P_EBT)ebt_log))
-$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_ULOG, $(P_EBT)ebt_ulog))
-$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_NFLOG, $(P_EBT)ebt_nflog))
-$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_NFQUEUE, $(P_EBT)ebt_nfqueue))
-
-# nftables
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES, $(P_XT)nf_tables, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_INET, $(P_XT)nf_tables_inet, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_EXTHDR, $(P_XT)nft_exthdr, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_META, $(P_XT)nft_meta, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CT, $(P_XT)nft_ct, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_RBTREE, $(P_XT)nft_rbtree, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_HASH, $(P_XT)nft_hash, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_COUNTER, $(P_XT)nft_counter, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LOG, $(P_XT)nft_log, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_LIMIT, $(P_XT)nft_limit, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REJECT, $(P_XT)nft_reject $(P_V4)nft_reject_ipv4 $(P_V6)nft_reject_ipv6, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REJECT_INET, $(P_XT)nft_reject_inet, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_IPV4, $(P_V4)nf_tables_ipv4, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV4, $(P_V4)nft_chain_route_ipv4, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NF_TABLES_IPV6, $(P_V6)nf_tables_ipv6, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_CHAIN_ROUTE_IPV6, $(P_V6)nft_chain_route_ipv6, ge 3.14.0),))
-
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_NAT, $(P_XT)nft_nat, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT,CONFIG_NFT_CHAIN_NAT_IPV4, $(P_V4)nft_chain_nat_ipv4, ge 3.14.0),))
-$(eval $(if $(NF_KMOD),$(call nf_add,NFT_NAT6,CONFIG_NFT_CHAIN_NAT_IPV6, $(P_V6)nft_chain_nat_ipv6, ge 3.14.0),))
-
-# userland only
-IPT_BUILTIN += $(NF_IPT-y) $(NF_IPT-m)
-IPT_BUILTIN += $(IPT_CORE-y) $(IPT_CORE-m)
-IPT_BUILTIN += $(NF_CONNTRACK-y)
-IPT_BUILTIN += $(NF_CONNTRACK6-y)
-IPT_BUILTIN += $(IPT_CONNTRACK-y)
-IPT_BUILTIN += $(IPT_CONNTRACK_EXTRA-y)
-IPT_BUILTIN += $(IPT_EXTRA-y)
-IPT_BUILTIN += $(IPT_FILTER-y)
-IPT_BUILTIN += $(IPT_IPOPT-y)
-IPT_BUILTIN += $(IPT_IPRANGE-y)
-IPT_BUILTIN += $(IPT_CLUSTER-y)
-IPT_BUILTIN += $(IPT_CLUSTERIP-y)
-IPT_BUILTIN += $(IPT_IPSEC-y)
-IPT_BUILTIN += $(IPT_IPV6-y) $(IPT_IPV6-m)
-IPT_BUILTIN += $(NF_NAT-y)
-IPT_BUILTIN += $(NF_NAT6-y)
-IPT_BUILTIN += $(IPT_NAT-y)
-IPT_BUILTIN += $(IPT_NAT6-y)
-IPT_BUILTIN += $(IPT_NAT_EXTRA-y)
-IPT_BUILTIN += $(NF_NATHELPER-y)
-IPT_BUILTIN += $(NF_NATHELPER_EXTRA-y)
-IPT_BUILTIN += $(IPT_ULOG-y)
-IPT_BUILTIN += $(IPT_DEBUG-y)
-IPT_BUILTIN += $(IPT_TPROXY-y)
-IPT_BUILTIN += $(NFNETLINK-y)
-IPT_BUILTIN += $(NFNETLINK_LOG-y)
-IPT_BUILTIN += $(NFNETLINK_QUEUE-y)
-IPT_BUILTIN += $(EBTABLES-y)
-IPT_BUILTIN += $(EBTABLES_IP4-y)
-IPT_BUILTIN += $(EBTABLES_IP6-y)
-IPT_BUILTIN += $(EBTABLES_WATCHERS-y)
-
-endif # __inc_netfilter

+ 0 - 40
include/nls.mk

@@ -1,40 +0,0 @@
-#
-# Copyright (C) 2011-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-# iconv full
-ifeq ($(CONFIG_BUILD_NLS),y)
-	ICONV_PREFIX:=$(STAGING_DIR)/usr/lib/libiconv-full
-	ICONV_FULL:=1
-
-	INTL_PREFIX:=$(STAGING_DIR)/usr/lib/libintl-full
-	INTL_FULL:=1
-
-# iconv stub
-else
-	ICONV_PREFIX:=$(STAGING_DIR)/usr/lib/libiconv-stub
-	ICONV_FULL:=
-
-	INTL_PREFIX:=$(STAGING_DIR)/usr/lib/libintl-stub
-	INTL_FULL:=
-endif
-
-PKG_CONFIG_DEPENDS += CONFIG_BUILD_NLS
-PKG_BUILD_DEPENDS += !BUILD_NLS:libiconv !BUILD_NLS:libintl
-
-ICONV_DEPENDS:=+BUILD_NLS:libiconv-full
-ICONV_CFLAGS:=-I$(ICONV_PREFIX)/include
-ICONV_CPPFLAGS:=-I$(ICONV_PREFIX)/include
-ICONV_LDFLAGS:=-L$(ICONV_PREFIX)/lib
-
-INTL_DEPENDS:=+BUILD_NLS:libintl-full
-INTL_CFLAGS:=-I$(INTL_PREFIX)/include
-INTL_CPPFLAGS:=-I$(INTL_PREFIX)/include
-INTL_LDFLAGS:=-L$(INTL_PREFIX)/lib
-
-TARGET_CFLAGS += $(ICONV_CFLAGS) $(INTL_CFLAGS)
-TARGET_CPPFLAGS += $(ICONV_CFLAGS) $(INTL_CPPFLAGS)
-TARGET_LDFLAGS += $(ICONV_LDFLAGS) $(INTL_LDFLAGS)

+ 0 - 33
include/package-bin.mk

@@ -1,33 +0,0 @@
-# 
-# Copyright (C) 2007-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-ifeq ($(DUMP),)
-  define BuildTarget/bin
-    ifeq ($(if $(VARIANT),$(BUILD_VARIANT)),$(VARIANT))
-    ifdef Package/$(1)/install
-      ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
-        compile: install-bin-$(1)
-      else
-        compile: $(1)-disabled
-        $(1)-disabled:
-		@echo "WARNING: skipping $(1) -- package not selected" >&2
-      endif
-    endif
-    endif
-
-    install-bin-$(1): $(STAMP_BUILT)
-	  rm -rf $(BIN_DIR)/$(1)
-	  $(INSTALL_DIR) $(BIN_DIR)/$(1)
-	  $(call Package/$(1)/install,$(BIN_DIR)/$(1))
-
-    clean-$(1):
-	  rm -rf $(BIN_DIR)/$(1)
-
-    clean: clean-$(1)
-    .PHONY: install-bin-$(1)
-  endef
-endif

+ 0 - 157
include/package-defaults.mk

@@ -1,157 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-PKG_DEFAULT_DEPENDS = +libc +USE_EGLIBC:librt +USE_EGLIBC:libpthread
-
-ifneq ($(PKG_NAME),toolchain)
-  PKG_FIXUP_DEPENDS = $(if $(filter kmod-%,$(1)),$(2),$(PKG_DEFAULT_DEPENDS) $(filter-out $(PKG_DEFAULT_DEPENDS),$(2)))
-else
-  PKG_FIXUP_DEPENDS = $(2)
-endif
-
-define Package/Default
-  CONFIGFILE:=
-  SECTION:=opt
-  CATEGORY:=Extra packages
-  DEPENDS:=
-  MDEPENDS:=
-  CONFLICTS:=
-  PROVIDES:=
-  EXTRA_DEPENDS:=
-  MAINTAINER:=$(PKG_MAINTAINER)
-  SOURCE:=$(patsubst $(TOPDIR)/%,%,$(CURDIR))
-  ifneq ($(PKG_VERSION),)
-    ifneq ($(PKG_RELEASE),)
-      VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
-    else
-      VERSION:=$(PKG_VERSION)
-    endif
-  else
-    VERSION:=$(PKG_RELEASE)
-  endif
-  ABI_VERSION:=
-  ifneq ($(PKG_FLAGS),)
-    PKGFLAGS:=$(PKG_FLAGS)
-  else
-    PKGFLAGS:=
-  endif
-  ifneq ($(ARCH_PACKAGES),)
-    PKGARCH:=$(ARCH_PACKAGES)
-  else
-    PKGARCH:=$(BOARD)
-  endif
-  DEFAULT:=
-  MENU:=
-  SUBMENU:=
-  SUBMENUDEP:=
-  TITLE:=
-  KCONFIG:=
-  BUILDONLY:=
-  HIDDEN:=
-  URL:=
-  VARIANT:=
-  DEFAULT_VARIANT:=
-  USERID:=
-endef
-
-Build/Patch:=$(Build/Patch/Default)
-ifneq ($(strip $(PKG_UNPACK)),)
-  define Build/Prepare/Default
-	$(PKG_UNPACK)
-	$(Build/Patch)
-  endef
-endif
-
-EXTRA_CXXFLAGS = $(EXTRA_CFLAGS)
-DISABLE_NLS:=--disable-nls
-
-CONFIGURE_PREFIX:=/usr
-CONFIGURE_ARGS = \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--program-prefix="" \
-		--program-suffix="" \
-		--prefix=$(CONFIGURE_PREFIX) \
-		--exec-prefix=$(CONFIGURE_PREFIX) \
-		--bindir=$(CONFIGURE_PREFIX)/bin \
-		--sbindir=$(CONFIGURE_PREFIX)/sbin \
-		--libexecdir=$(CONFIGURE_PREFIX)/lib \
-		--sysconfdir=/etc \
-		--datadir=$(CONFIGURE_PREFIX)/share \
-		--localstatedir=/var \
-		--mandir=$(CONFIGURE_PREFIX)/man \
-		--infodir=$(CONFIGURE_PREFIX)/info \
-		$(DISABLE_NLS) \
-		$(DISABLE_LARGEFILE) \
-		$(DISABLE_IPV6)
-
-CONFIGURE_VARS = \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
-		CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CFLAGS)" \
-		CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
-
-CONFIGURE_PATH = .
-CONFIGURE_CMD = ./configure
-
-replace_script=$(FIND) $(1) -name $(2) | $(XARGS) chmod u+w; \
-	       $(FIND) $(1) -name $(2) | $(XARGS) -n1 cp --remove-destination \
-	       $(SCRIPT_DIR)/$(2);
-
-define Build/Configure/Default
-	(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \
-	if [ -x $(CONFIGURE_CMD) ]; then \
-		$(call replace_script,$(PKG_BUILD_DIR)/$(3),config.guess) \
-		$(call replace_script,$(PKG_BUILD_DIR)/$(3),config.sub) \
-		$(CONFIGURE_VARS) \
-		$(2) \
-		$(CONFIGURE_CMD) \
-		$(CONFIGURE_ARGS) \
-		$(1); \
-	fi; \
-	)
-endef
-
-MAKE_VARS = \
-	CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
-	CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)"
-
-MAKE_FLAGS = \
-	$(TARGET_CONFIGURE_OPTS) \
-	CROSS="$(TARGET_CROSS)" \
-	ARCH="$(ARCH)"
-
-MAKE_INSTALL_FLAGS = \
-	$(MAKE_FLAGS) \
-	DESTDIR="$(PKG_INSTALL_DIR)"
-
-MAKE_PATH = .
-
-define Build/Compile/Default
-	+$(MAKE_VARS) \
-	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
-		$(MAKE_FLAGS) \
-		$(1);
-endef
-
-define Build/Install/Default
-	$(MAKE_VARS) \
-	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
-		$(MAKE_INSTALL_FLAGS) \
-		$(if $(1), $(1), install);
-endef
-
-define Build/Dist/Default
-	$(call Build/Compile/Default, DESTDIR="$(PKG_BUILD_DIR)/tmp" CC="$(TARGET_CC)" dist)
-endef
-
-define Build/DistCheck/Default
-	$(call Build/Compile/Default, DESTDIR="$(PKG_BUILD_DIR)/tmp" CC="$(TARGET_CC)" distcheck)
-endef

+ 0 - 91
include/package-dumpinfo.mk

@@ -1,91 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-ifneq ($(DUMP),)
-
-dumpinfo: FORCE
-
-define Config/template
-Preconfig: $(1)
-Preconfig-Type: $(2)
-Preconfig-Default: $(3)
-Preconfig-Label: $(4)
-
-endef
-
-define Config
-  Preconfig/$(1) = $$(call Config/template,$(1),$(2),$(3),$(4))
-  preconfig_$$(1) += $(1)
-endef
-
-define Dumpinfo/Package
-$(info Package: $(1)
-$(if $(MENU),Menu: $(MENU)
-)$(if $(SUBMENU),Submenu: $(SUBMENU)
-)$(if $(SUBMENUDEP),Submenu-Depends: $(SUBMENUDEP)
-)$(if $(DEFAULT),Default: $(DEFAULT)
-)$(if $(findstring $(PREREQ_CHECK),1),Prereq-Check: 1
-)Version: $(VERSION)
-Depends: $(call PKG_FIXUP_DEPENDS,$(1),$(DEPENDS))
-Conflicts: $(CONFLICTS)
-Menu-Depends: $(MDEPENDS)
-Provides: $(PROVIDES)
-$(if $(VARIANT),Build-Variant: $(VARIANT)
-$(if $(DEFAULT_VARIANT),Default-Variant: $(VARIANT)
-))$(if $(PKG_BUILD_DEPENDS),Build-Depends: $(PKG_BUILD_DEPENDS)
-)$(if $(HOST_BUILD_DEPENDS),Build-Depends/host: $(HOST_BUILD_DEPENDS)
-)$(if $(BUILD_TYPES),Build-Types: $(BUILD_TYPES)
-)Section: $(SECTION)
-Category: $(CATEGORY)
-Title: $(TITLE)
-Maintainer: $(MAINTAINER)
-$(if $(USERID),Require-User: $(USERID)
-)Source: $(PKG_SOURCE)
-$(if $(PKG_LICENSE),License: $(PKG_LICENSE)
-)$(if $(PKG_LICENSE_FILES),LicenseFiles: $(PKG_LICENSE_FILES)
-)Type: $(if $(Package/$(1)/targets),$(Package/$(1)/targets),$(if $(PKG_TARGETS),$(PKG_TARGETS),ipkg))
-$(if $(KCONFIG),Kernel-Config: $(KCONFIG)
-)$(if $(BUILDONLY),Build-Only: $(BUILDONLY)
-)$(if $(HIDDEN),Hidden: $(HIDDEN)
-)$(if $(FEED),Feed: $(FEED)
-)Description: $(if $(Package/$(1)/description),$(Package/$(1)/description),$(TITLE))
-$(if $(URL),$(URL)
-)$(MAINTAINER)
-@@
-$(if $(Package/$(1)/config),Config:
-$(Package/$(1)/config)
-@@
-)$(foreach pc,$(preconfig_$(1)),
-$(Preconfig/$(pc))))
-endef
-
-define Feature/Default
-  TARGET_NAME:=
-  TARGET_TITLE:=
-  PRIORITY:=
-  NAME:=
-endef
-
-define Feature
-  $(eval $(Feature/Default))
-  $(eval $(Feature/$(1)))
-  $(if $(DUMP),$(call Dumpinfo/Feature,$(1)))
-endef
-
-define Dumpinfo/Feature
-$(info Feature: $(TARGET_NAME)_$(1)
-Target-Name: $(TARGET_NAME)
-Target-Title: $(TARGET_TITLE)
-Feature-Name: $(NAME)
-$(if $(PRIORITY),Feature-Priority: $(PRIORITY)
-)Feature-Description:
-$(Feature/$(1)/description)
-@@
-)
-endef
-
-endif

+ 0 - 233
include/package-ipkg.mk

@@ -1,233 +0,0 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(INCLUDE_DIR)/feeds.mk
-
-# invoke ipkg-build with some default options
-IPKG_BUILD:= \
-  $(STAGING_DIR_HOST)/bin/ipkg-build -c -o 0 -g 0
-
-IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg
-
-# 1: package name
-# 2: variable name
-# 3: variable suffix
-define BuildIPKGVariable
-ifdef Package/$(1)/$(2)
-  $$(IPKG_$(1)) : VAR_$(2)$(3)=$$(Package/$(1)/$(2))
-  $(call shexport,Package/$(1)/$(2))
-  $(1)_COMMANDS += echo "$$$$$$$$$(call shvar,Package/$(1)/$(2))" > $(2)$(3);
-endif
-endef
-
-PARENL :=(
-PARENR :=)
-
-dep_split=$(subst :,$(space),$(1))
-dep_rem=$(subst !,,$(subst $(strip $(PARENL)),,$(subst $(strip $(PARENR)),,$(word 1,$(call dep_split,$(1))))))
-dep_confvar=$(strip $(foreach cond,$(subst ||, ,$(call dep_rem,$(1))),$(CONFIG_$(cond))))
-dep_pos=$(if $(call dep_confvar,$(1)),$(call dep_val,$(1)))
-dep_neg=$(if $(call dep_confvar,$(1)),,$(call dep_val,$(1)))
-dep_if=$(if $(findstring !,$(1)),$(call dep_neg,$(1)),$(call dep_pos,$(1)))
-dep_val=$(word 2,$(call dep_split,$(1)))
-strip_deps=$(strip $(subst +,,$(filter-out @%,$(1))))
-filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(call dep_if,$(dep)),$(dep)))
-
-define AddDependency
-  $$(if $(1),$$(if $(2),$$(foreach pkg,$(1),$$(IPKG_$$(pkg))): $$(foreach pkg,$(2),$$(IPKG_$$(pkg)))))
-endef
-
-define FixupReverseDependencies
-  DEPS := $$(filter %:$(1),$$(IDEPEND))
-  DEPS := $$(patsubst %:$(1),%,$$(DEPS))
-  DEPS := $$(filter $$(DEPS),$$(IPKGS))
-  $(call AddDependency,$$(DEPS),$(1))
-endef
-
-define FixupDependencies
-  DEPS := $$(filter $(1):%,$$(IDEPEND))
-  DEPS := $$(patsubst $(1):%,%,$$(DEPS))
-  DEPS := $$(filter $$(DEPS),$$(IPKGS))
-  $(call AddDependency,$(1),$$(DEPS))
-endef
-
-ifneq ($(PKG_NAME),toolchain)
-  define CheckDependencies
-	@( \
-		rm -f $(PKG_INFO_DIR)/$(1).missing; \
-		( \
-			export \
-				READELF=$(TARGET_CROSS)readelf \
-				OBJCOPY=$(TARGET_CROSS)objcopy \
-				XARGS="$(XARGS)"; \
-			$(SCRIPT_DIR)/gen-dependencies.sh "$$(IDIR_$(1))"; \
-		) | while read FILE; do \
-			grep -q "$$$$FILE" $(PKG_INFO_DIR)/$(1).provides || \
-				echo "$$$$FILE" >> $(PKG_INFO_DIR)/$(1).missing; \
-		done; \
-		if [ -f "$(PKG_INFO_DIR)/$(1).missing" ]; then \
-			echo "Package $(1) is missing dependencies for the following libraries:" >&2; \
-			cat "$(PKG_INFO_DIR)/$(1).missing" >&2; \
-			false; \
-		fi; \
-	)
-  endef
-endif
-
-_addsep=$(word 1,$(1))$(foreach w,$(wordlist 2,$(words $(1)),$(1)),$(strip $(2) $(w)))
-_cleansep=$(subst $(space)$(2)$(space),$(2)$(space),$(1))
-mergelist=$(call _cleansep,$(call _addsep,$(1),$(comma)),$(comma))
-addfield=$(if $(strip $(2)),$(1): $(2))
-_define=define
-_endef=endef
-
-ifeq ($(DUMP),)
-  define BuildTarget/ipkg
-    PDIR_$(1):=$(call FeedPackageDir,$(1))
-    IPKG_$(1):=$$(PDIR_$(1))/$(1)_$(VERSION)_$(PKGARCH).ipk
-    IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1)
-    KEEP_$(1):=$(strip $(call Package/$(1)/conffiles))
-
-    ifeq ($(BUILD_VARIANT),$$(if $$(VARIANT),$$(VARIANT),$(BUILD_VARIANT)))
-    ifdef Package/$(1)/install
-      ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
-        IPKGS += $(1)
-        compile: $$(IPKG_$(1)) $(PKG_INFO_DIR)/$(1).provides $(STAGING_DIR_ROOT)/stamp/.$(1)_installed
-        ifneq ($(ABI_VERSION),)
-        compile: $(PKG_INFO_DIR)/$(1).version
-        endif
-
-        ifeq ($(CONFIG_PACKAGE_$(1)),y)
-          .PHONY: $(PKG_INSTALL_STAMP).$(1)
-          compile: $(PKG_INSTALL_STAMP).$(1)
-          $(PKG_INSTALL_STAMP).$(1):
-			if [ -f $(PKG_INSTALL_STAMP).clean ]; then \
-				rm -f \
-					$(PKG_INSTALL_STAMP) \
-					$(PKG_INSTALL_STAMP).clean; \
-			fi; \
-			echo "$(1)" >> $(PKG_INSTALL_STAMP)
-        endif
-      else
-        $(if $(CONFIG_PACKAGE_$(1)),$$(info WARNING: skipping $(1) -- package not selected))
-      endif
-    endif
-    endif
-
-    DEPENDS:=$(call PKG_FIXUP_DEPENDS,$(1),$(DEPENDS))
-    IDEPEND_$(1):=$$(call filter_deps,$$(DEPENDS))
-    IDEPEND += $$(patsubst %,$(1):%,$$(IDEPEND_$(1)))
-    $(FixupDependencies)
-    $(FixupReverseDependencies)
-
-    $(eval $(call BuildIPKGVariable,$(1),conffiles))
-    $(eval $(call BuildIPKGVariable,$(1),preinst))
-    $(eval $(call BuildIPKGVariable,$(1),postinst,-pkg))
-    $(eval $(call BuildIPKGVariable,$(1),prerm,-pkg))
-    $(eval $(call BuildIPKGVariable,$(1),postrm))
-
-    $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT)
-	rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
-	mkdir -p $(STAGING_DIR_ROOT)/stamp $(STAGING_DIR_ROOT)/tmp-$(1)
-	$(call Package/$(1)/install,$(STAGING_DIR_ROOT)/tmp-$(1))
-	$(call Package/$(1)/install_lib,$(STAGING_DIR_ROOT)/tmp-$(1))
-	$(call locked,$(CP) $(STAGING_DIR_ROOT)/tmp-$(1)/. $(STAGING_DIR_ROOT)/,root-copy)
-	rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
-	touch $$@
-
-    $(PKG_INFO_DIR)/$(1).version: $$(IPKG_$(1))
-	echo '$(ABI_VERSION)' | cmp -s - $$@ || \
-		echo '$(ABI_VERSION)' > $$@
-
-    Package/$(1)/DEPENDS := $$(call mergelist,$$(filter-out @%,$$(IDEPEND_$(1))))
-    ifneq ($$(EXTRA_DEPENDS),)
-      Package/$(1)/DEPENDS := $$(EXTRA_DEPENDS)$$(if $$(Package/$(1)/DEPENDS),$$(comma) $$(Package/$(1)/DEPENDS))
-    endif
-
-$(_define) Package/$(1)/CONTROL
-Package: $(1)
-Version: $(VERSION)
-$$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
-)$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS))
-)$$(call addfield,Provides,$(PROVIDES)
-)$$(call addfield,Source,$(SOURCE)
-)$$(call addfield,License,$$(PKG_LICENSE)