This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

trunk(root) - sync with lede

  • Loading branch information...
zyxmon committed Apr 4, 2017
1 parent d6ecfaa commit bab40e475cc13b456b1bbef45f6f381f9e86f6ce
Showing with 11 additions and 12 deletions.
  1. +4 −7 LastSync.txt
  2. +3 −2 Makefile
  3. +4 −3 rules.mk
View
@@ -1,8 +1,5 @@
commit 2711b94932a01ecd00ee9cfba7dcbb1cf4fe2517
Author: Alexander Couzens <lynxis@fe80.eu>
Date: Sat Jan 28 17:23:16 2017 +0100
lantiq: fix unaligned access in xrx200_poll_rx()
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
commit cffeb31107e27a48ddaf4953590acdefc66f2de9
Author: Felix Fietkau <nbd@nbd.name>
Date: Mon Apr 3 15:08:28 2017 +0200
mac80211: backport an upstream fix for queue start/stop handling
View
@@ -18,7 +18,7 @@ $(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the LEDE direct
world:
include $(TOPDIR)/include/host.mk
export PATH:=$(TOPDIR)/staging_dir/host/bin:$(PATH)
ifneq ($(OPENWRT_BUILD),1)
_SINGLE=export MAKEFLAGS=$(space);
@@ -95,9 +95,10 @@ headers: FORCE
tar -czf $(BIN_DIR)/include.tar.gz -C $(STAGING_DIR)/opt/include .
prepare: .config $(tools/stamp-compile) $(toolchain/stamp-compile)
$(_SINGLE)$(SUBMAKE) -r diffconfig
world: prepare $(target/stamp-compile) $(package/stamp-compile) FORCE
$(_SINGLE)$(SUBMAKE) -r package/index
$(_SINGLE)$(SUBMAKE) -r diffconfig
$(_SINGLE)$(SUBMAKE) -r checksum
$(_SINGLE)$(SUBMAKE) -r headers
View
@@ -29,7 +29,7 @@ empty:=
space:= $(empty) $(empty)
comma:=,
merge=$(subst $(space),,$(1))
confvar=$(call merge,$(foreach v,$(1),$(if $($(v)),y,n)))
confvar=$(shell echo '$(foreach v,$(1),$(v)=$(subst ','\'',$($(v))))' | $(STAGING_DIR_HOST)/bin/mkhash md5)
strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1))
paren_left = (
@@ -101,7 +101,7 @@ ifdef CONFIG_MIPS64_ABI
endif
endif
DEFAULT_SUBDIR_TARGETS:=clean download prepare compile install update refresh prereq dist distcheck configure check check-depends
DEFAULT_SUBDIR_TARGETS:=clean download prepare compile update refresh prereq dist distcheck configure check check-depends
define DefaultTargets
$(foreach t,$(DEFAULT_SUBDIR_TARGETS) $(1),
@@ -117,6 +117,7 @@ BIN_DIR:=$(OUTPUT_DIR)/targets/$(BOARD)/$(SUBTARGET)
INCLUDE_DIR:=$(TOPDIR)/include
SCRIPT_DIR:=$(TOPDIR)/scripts
BUILD_DIR_BASE:=$(TOPDIR)/build_dir
# Entware keeps LIBCV (LIBC version) as a suffix in directory names! Lede has removed it....
ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
GCCV:=$(call qstrip,$(CONFIG_GCC_VERSION))
LIBC:=$(call qstrip,$(CONFIG_LIBC))
@@ -140,7 +141,7 @@ else
endif
#ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),)
# iremap = -iremap $(1):$(2)
# iremap = -iremap$(1):$(2)
#endif
PACKAGE_DIR:=$(BIN_DIR)/packages

0 comments on commit bab40e4

Please sign in to comment.