summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README2
-rw-r--r--feeds.conf.default12
-rw-r--r--include/feeds.mk4
-rw-r--r--include/kernel-defaults.mk5
-rw-r--r--include/kernel-version.mk18
-rw-r--r--include/kernel.mk2
-rw-r--r--include/ltqtapi.mk6
-rw-r--r--include/prereq-build.mk6
-rw-r--r--include/toplevel.mk2
-rw-r--r--include/version.mk27
-rw-r--r--rules.mk3
-rw-r--r--target/imagebuilder/Config.in1
-rw-r--r--target/imagebuilder/files/Makefile1
-rw-r--r--target/sdk/Makefile4
-rw-r--r--target/toolchain/Makefile10
-rw-r--r--toolchain/Makefile2
-rw-r--r--toolchain/binutils/Makefile1
-rw-r--r--toolchain/gcc/final/Makefile1
-rw-r--r--tools/Makefile4
-rw-r--r--tools/flex/Makefile1
-rw-r--r--tools/lzma/Makefile1
-rw-r--r--tools/mkimage/Makefile4
22 files changed, 61 insertions, 56 deletions
diff --git a/README b/README
index 32e698d..a745843 100644
--- a/README
+++ b/README
@@ -32,4 +32,4 @@ Sunshine!
Your OpenWrt Project
http://openwrt.org
-
+ ..
diff --git a/feeds.conf.default b/feeds.conf.default
index 4d9f020..540e665 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,9 +1,9 @@
-src-git packages https://github.com/openwrt/packages.git
-src-git luci http://git.openwrt.org/project/luci.git
-src-git routing https://github.com/openwrt-routing/packages.git
-src-git telephony http://git.openwrt.org/feed/telephony.git
-src-git management https://github.com/openwrt-management/packages.git
-#src-git oldpackages http://git.openwrt.org/packages.git
+src-git packages https://github.com/openwrt/packages.git;for-14.07
+src-git luci https://github.com/openwrt/luci.git;luci-0.12
+src-git routing https://github.com/openwrt-routing/packages.git;for-14.07
+src-git telephony https://github.com/openwrt/telephony.git;for-14.07
+src-git management https://github.com/openwrt-management/packages.git;for-14.07
+src-git oldpackages http://git.openwrt.org/14.07/packages.git
#src-svn xwrt http://x-wrt.googlecode.com/svn/trunk/package
#src-svn phone svn://svn.openwrt.org/openwrt/feeds/phone
#src-svn efl svn://svn.openwrt.org/openwrt/feeds/efl
diff --git a/include/feeds.mk b/include/feeds.mk
index 97b1449..695b03b 100644
--- a/include/feeds.mk
+++ b/include/feeds.mk
@@ -10,10 +10,12 @@
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_INSTALLED))
+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
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index da06abd..f7e5e8c 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -4,7 +4,7 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
-
+include $(INCLUDE_DIR)/wifi.mk
KERNEL_MAKEOPTS := -C $(LINUX_DIR) \
HOSTCFLAGS="$(HOST_CFLAGS) -Wall -Wmissing-prototypes -Wstrict-prototypes" \
CROSS_COMPILE="$(KERNEL_CROSS)" \
@@ -32,6 +32,7 @@ export HOST_EXTRACFLAGS=-I$(STAGING_DIR_HOST)/include
# defined in quilt.mk
Kernel/Patch:=$(Kernel/Patch/Default)
+WiFi/Patch:=$(WiFi/Patch/Default)
KERNEL_GIT_OPTS:=
ifneq ($(strip $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY)),"")
@@ -47,7 +48,9 @@ ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"")
define Kernel/Prepare/Default
xzcat $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
$(Kernel/Patch)
+ $(call wifi-prepare)
touch $(LINUX_DIR)/.quilt_used
+ ln -sf $(LINUX_DIR) `echo $(LINUX_DIR) | sed 's/linux-[0-9]*\.[0-9]*\.[0-9]*/linux-kernel/g'`
endef
else
define Kernel/Prepare/Default
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 7023ff0..b49033e 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -2,27 +2,9 @@
LINUX_RELEASE?=1
-ifeq ($(LINUX_VERSION),3.3.8)
- LINUX_KERNEL_MD5SUM:=f1058f64eed085deb44f10cee8541d50
-endif
-ifeq ($(LINUX_VERSION),3.6.11)
- LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54
-endif
-ifeq ($(LINUX_VERSION),3.8.13)
- LINUX_KERNEL_MD5SUM:=2af19d06cd47ec459519159cdd10542d
-endif
-ifeq ($(LINUX_VERSION),3.9.11)
- LINUX_KERNEL_MD5SUM:=edbf88eb7f7d34dbd5d3887726790755
-endif
ifeq ($(LINUX_VERSION),3.10.49)
LINUX_KERNEL_MD5SUM:=9774e12764e740d49c80eda77d0ef3eb
endif
-ifeq ($(LINUX_VERSION),3.13.7)
- LINUX_KERNEL_MD5SUM:=370adced5e5c1cb1d0d621c2dae2723f
-endif
-ifeq ($(LINUX_VERSION),3.14.16)
- LINUX_KERNEL_MD5SUM:=469c879236ed694f60b81122e91ca02e
-endif
# disable the md5sum check for unknown kernel versions
LINUX_KERNEL_MD5SUM?=x
diff --git a/include/kernel.mk b/include/kernel.mk
index ae2dcc3..f3aa395 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -51,7 +51,7 @@ else
LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux
- LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.xz
+ LINUX_SOURCE:=linux-$(LINUX_EXT_VERSION).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)
diff --git a/include/ltqtapi.mk b/include/ltqtapi.mk
index f4d06ad..cf8b550 100644
--- a/include/ltqtapi.mk
+++ b/include/ltqtapi.mk
@@ -1,12 +1,16 @@
LTQ_TAPI_BUILD_DEPENDS:=TARGET_lantiq_xway:kmod-ltq-tapi \
TARGET_lantiq_xway:kmod-ltq-vmmc \
+ TARGET_lantiq_xrx200:kmod-ltq-tapi \
+ TARGET_lantiq_xrx200: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_TARGET:=@(TARGET_lantiq_falcon||TARGET_lantiq_xway||TARGET_lantiq_xrx200)
LTQ_TAPI_DEPENDS:=$(LTQ_TAPI_TARGET) \
+TARGET_lantiq_xway:kmod-ltq-tapi \
+TARGET_lantiq_xway:kmod-ltq-vmmc \
+ +TARGET_lantiq_xrx200:kmod-ltq-tapi \
+ +TARGET_lantiq_xrx200:kmod-ltq-vmmc \
+TARGET_lantiq_falcon:kmod-ltq-tapi \
+TARGET_lantiq_falcon:kmod-ltq-vmmc
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index cb23f85..700078e 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -164,9 +164,9 @@ $(eval $(call Require,gnutar, \
Please install GNU tar. \
))
-$(eval $(call RequireCommand,svn, \
- Please install the subversion client. \
-))
+#$(eval $(call RequireCommand,svn, \
+# Please install the subversion client. \
+#))
$(eval $(call RequireCommand,openssl, \
Please install openssl. \
diff --git a/include/toplevel.mk b/include/toplevel.mk
index dcde7e2..6949be3 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -6,7 +6,7 @@
# See /LICENSE for more information.
#
-RELEASE:=Chaos Calmer
+RELEASE:=Barrier Breaker
PREP_MK= OPENWRT_BUILD= QUIET=0
export IS_TTY=$(shell tty -s && echo 1 || echo 0)
diff --git a/include/version.mk b/include/version.mk
index c4747f2..2fd605f 100644
--- a/include/version.mk
+++ b/include/version.mk
@@ -17,31 +17,28 @@ PKG_CONFIG_DEPENDS += \
CONFIG_VERSION_PRODUCT \
CONFIG_VERSION_HWREV \
-qstrip_escape=$(subst ','\'',$(call qstrip,$(1)))
-#'
+VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),14.07)
-VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),$(REVISION))
+VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),Barrier Breaker)
-VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),Bleeding Edge)
-
-VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK))
+VERSION_NICK:=$(call qstrip,$(CONFIG_VERSION_NICK))
VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE))
-VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots/trunk/%T/packages)
+VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/%n/%v/%S/packages)
-VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST))
+VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)
-VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER))
+VERSION_MANUFACTURER:=$(call qstrip,$(CONFIG_VERSION_MANUFACTURER))
VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),OpenWrt)
-VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT))
+VERSION_PRODUCT:=$(call qstrip,$(CONFIG_VERSION_PRODUCT))
VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic)
-VERSION_HWREV:=$(call qstrip_escape,$(CONFIG_VERSION_HWREV))
+VERSION_HWREV:=$(call qstrip,$(CONFIG_VERSION_HWREV))
VERSION_HWREV:=$(if $(VERSION_HWREV),$(VERSION_HWREV),v0)
define taint2sym
@@ -83,5 +80,3 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \
-e 's,%M,$(VERSION_MANUFACTURER),g' \
-e 's,%P,$(VERSION_PRODUCT),g' \
-e 's,%h,$(VERSION_HWREV),g'
-
-VERSION_SED_SCRIPT:=$(subst '\'','\'\\\\\'\'',$(VERSION_SED))
diff --git a/rules.mk b/rules.mk
index a84636a..c9efb9e 100644
--- a/rules.mk
+++ b/rules.mk
@@ -269,6 +269,9 @@ ifeq ($(CONFIG_BUILD_LOG),y)
BUILD_LOG:=1
endif
+export BISON_PKGDATADIR:=$(STAGING_DIR_HOST)/share/bison
+export M4:=$(STAGING_DIR_HOST)/bin/m4
+
define shvar
V_$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
endef
diff --git a/target/imagebuilder/Config.in b/target/imagebuilder/Config.in
index d3bc729..6756c14 100644
--- a/target/imagebuilder/Config.in
+++ b/target/imagebuilder/Config.in
@@ -1,6 +1,5 @@
config IB
bool "Build the OpenWrt Image Builder"
- depends on !TARGET_ROOTFS_INITRAMFS
depends on !PROFILE_KCONFIG
depends on !EXTERNAL_TOOLCHAIN
help
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 222dac4..72a91e0 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -149,6 +149,7 @@ package_postinst: FORCE
IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $$script enable; \
done || true; \
)
+ rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst
$(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg)
build_image: FORCE
diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 828cff5..1c696d5 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -31,8 +31,7 @@ EXCLUDE_DIRS:=*/ccache \
*.install.clean \
*.install.flags \
*.install \
- */doc \
- $(STAGING_SUBDIR_TARGET)/usr/bin
+ */doc
SDK_DIRS = \
$(STAGING_SUBDIR_HOST) \
@@ -109,6 +108,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
cat $(TOPDIR)/feeds.conf.default \
>> $(SDK_BUILD_DIR)/feeds.conf.default
$(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(SDK_BUILD_DIR)/include/version.mk
+ $(SED) '/LINUX_VERMAGIC:=/ { s,unknown,$(LINUX_VERMAGIC),g }' $(SDK_BUILD_DIR)/include/kernel.mk
find $(SDK_BUILD_DIR) -name .git | $(XARGS) rm -rf
find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf
find $(SDK_BUILD_DIR) -name CVS | $(XARGS) rm -rf
diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile
index 20f753a..6e60a08 100644
--- a/target/toolchain/Makefile
+++ b/target/toolchain/Makefile
@@ -19,6 +19,7 @@ PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
TOOLCHAIN_NAME:=OpenWrt-Toolchain-$(BOARD)-for-$(ARCH)$(ARCH_SUFFIX)-gcc-$(GCCV)$(DIR_SUFFIX)
TOOLCHAIN_BUILD_DIR:=$(BUILD_DIR)/$(TOOLCHAIN_NAME)
EXCLUDE_DIRS:=*/ccache \
+ */initial \
*/stamp \
*/stampfiles \
*/man \
@@ -46,6 +47,15 @@ $(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2: clean
ln -sf $(REAL_GNU_TARGET_NAME)-wrapper.sh $(REAL_GNU_TARGET_NAME)-$${app} ; \
done; \
)
+
+ @-( \
+ find \
+ $(TOOLCHAIN_BUILD_DIR)/*/bin \
+ $(TOOLCHAIN_BUILD_DIR)/*/*/bin \
+ $(TOOLCHAIN_BUILD_DIR)/*/libexec \
+ -type f; \
+ ) | xargs strip 2>/dev/null >/dev/null
+
echo REVISION:="$(REVISION)" > $(TOOLCHAIN_BUILD_DIR)/version.mk
find $(TOOLCHAIN_BUILD_DIR) -name .git | $(XARGS) rm -rf
find $(TOOLCHAIN_BUILD_DIR) -name .svn | $(XARGS) rm -rf
diff --git a/toolchain/Makefile b/toolchain/Makefile
index 36c6ed3..7f8d62f 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -74,7 +74,7 @@ endif
# prerequisites for the individual targets
$(curdir)/ := .config prereq
-$(curdir)//prepare = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk
+$(curdir)//prepare = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk $(tools/stamp-install)
$(curdir)//compile = $(1)/prepare
$(curdir)//install = $(1)/compile
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 466b6ac..73c303f 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -89,6 +89,7 @@ define Host/Install
prefix=$(TOOLCHAIN_DIR)/initial \
install
$(call FixupLibdir,$(TOOLCHAIN_DIR)/initial)
+ $(RM) $(TOOLCHAIN_DIR)/initial/lib/libiberty.a
$(CP) $(TOOLCHAIN_DIR)/initial/. $(TOOLCHAIN_DIR)/
$(CP) $(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-readelf $(REAL_STAGING_DIR_HOST)/bin/readelf
endef
diff --git a/toolchain/gcc/final/Makefile b/toolchain/gcc/final/Makefile
index 2c25263..3529616 100644
--- a/toolchain/gcc/final/Makefile
+++ b/toolchain/gcc/final/Makefile
@@ -69,6 +69,7 @@ define Host/Install
done; \
);
$(if $(CONFIG_EXTRA_TARGET_ARCH),$(call SetupExtraArch))
+ $(RM) $(TOOLCHAIN_DIR)/lib/libiberty.a
$(SCRIPT_DIR)/patch-specs.sh "$(TOOLCHAIN_DIR)"
endef
diff --git a/tools/Makefile b/tools/Makefile
index 75d2b0d..13bb028 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -44,7 +44,7 @@ tools-$(CONFIG_USE_SPARSE) += sparse
$(curdir)/bison/compile := $(curdir)/flex/install
$(curdir)/flex/compile := $(curdir)/automake/install
$(curdir)/pkg-config/compile := $(curdir)/sed/install
-$(curdir)/libtool/compile := $(curdir)/sed/install
+$(curdir)/libtool/compile := $(curdir)/sed/install $(curdir)/m4/install
$(curdir)/squashfs/compile := $(curdir)/lzma-old/install
$(curdir)/squashfs4/compile := $(curdir)/xz/install
$(curdir)/quilt/compile := $(curdir)/sed/install $(curdir)/autoconf/install $(curdir)/findutils/install
@@ -71,6 +71,8 @@ $(curdir)/sdcc/compile := $(curdir)/bison/install
$(curdir)/b43-tools/compile := $(curdir)/bison/install
$(curdir)/padjffs2/compile := $(curdir)/findutils/install
$(curdir)/cloog/compile := $(curdir)/ppl/install
+$(curdir)/bc/compile := $(curdir)/bison/install
+$(curdir)/findutils/compile := $(curdir)/bison/install
ifneq ($(CONFIG_CCACHE),)
$(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/install))
diff --git a/tools/flex/Makefile b/tools/flex/Makefile
index d949d4b..90082df 100644
--- a/tools/flex/Makefile
+++ b/tools/flex/Makefile
@@ -18,6 +18,7 @@ HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk
+HOST_CONFIGURE_ARGS += --disable-shared
HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Clean
diff --git a/tools/lzma/Makefile b/tools/lzma/Makefile
index 6e01051..716367a 100644
--- a/tools/lzma/Makefile
+++ b/tools/lzma/Makefile
@@ -28,6 +28,7 @@ endef
define Host/Install
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
$(INSTALL_BIN) $(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone/lzma_alone $(STAGING_DIR_HOST)/bin/lzma
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone/lzma_alone $(STAGING_DIR_HOST)/bin/lzma_alone
endef
define Host/Clean
diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile
index 49eb261..47e918a 100644
--- a/tools/mkimage/Makefile
+++ b/tools/mkimage/Makefile
@@ -7,11 +7,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mkimage
-PKG_VERSION:=2014.07
+PKG_VERSION:=2014.04
PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
-PKG_MD5SUM:=36d4bad687edcafa396fee607e505d4e
+PKG_MD5SUM:=6d2116d1385a66e9a59742caa9d62a54
PKG_CAT:=bzcat
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)
generated by cgit v1.1 at 2024-11-22 05:07:03 +0000