Skip to content
Permalink
Browse files

sync with owrt 12.2018

  • Loading branch information...
zyxmon committed Dec 6, 2018
1 parent e4c2855 commit 676470725e3cd6f1a04d08f36df79fc504e04f68
Showing with 18 additions and 7 deletions.
  1. +13 −6 LastSync.txt
  2. +3 −1 Makefile
  3. +2 −0 rules.mk
@@ -1,8 +1,15 @@
commit dc9388ac5506f2d0ea0fee6967c003b9129c8ca5
Author: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Date: Mon Aug 27 15:52:55 2018 +0700
commit 8ad45992acab9a2dead144d5b387fbe132ce59c1
Author: Marek Lindner <mareklindner@neomailbox.ch>
Date: Sun Dec 2 22:02:04 2018 +0800

iproute2: update cake man page
ipq40xx: fix openmesh sysupgrade with tar content out of order

CAKE supports overriding of its internal classification of
packets through the tc filter mechanism.
The tar extraction depends on the order in which the files
are added to the tar file. Since the order is not guaranteed
and depends on the host system, the combined mtd write fails
with sysupgrade images built on some systems.
Fix by changing to tar file order independent mtd write.

Fixes: 86e18f6706e1 ("ipq806x: add support for OpenMesh A42")
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
@@ -27,6 +27,8 @@ ifneq ($(OPENWRT_BUILD),1)
export OPENWRT_BUILD
GREP_OPTIONS=
export GREP_OPTIONS
CDPATH=
export CDPATH
include $(TOPDIR)/include/debug.mk
include $(TOPDIR)/include/depends.mk
include $(TOPDIR)/include/toplevel.mk
@@ -85,7 +87,7 @@ prereq: $(target/stamp-prereq) tmp/.prereq_packages
fi

checksum: FORCE
$(call sha256sums,$(BIN_DIR))
$(call sha256sums,$(BIN_DIR),$(CONFIG_BUILDBOT))

diffconfig: FORCE
mkdir -p $(BIN_DIR)
@@ -333,6 +333,7 @@ TARGET_CC:=$(TARGET_CROSS)gcc
TARGET_CXX:=$(TARGET_CROSS)g++
KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh
SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
ESED:=$(STAGING_DIR_HOST)/bin/sed -E -i -e
CP:=cp -fpR
LN:=ln -sf
XARGS:=xargs -r
@@ -344,6 +345,7 @@ PATCH:=patch
PYTHON:=python

INSTALL_BIN:=install -m0755
INSTALL_SUID:=install -m4755
INSTALL_DIR:=install -d -m0755
INSTALL_DATA:=install -m0644
INSTALL_CONF:=install -m0600

0 comments on commit 6764707

Please sign in to comment.
You can’t perform that action at this time.