mptcp/openmptcprouter
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-02-12 11:21:55 +00:00
Code Issues Releases Wiki Activity

Add patch to remove gtime support and fix #54

Browse source
This commit is contained in:
Ycarus 2018-05-10 23:10:49 +02:00
parent 28971a869e
commit ea3d7bac78
2 changed files with 52 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build.sh
View file

@ -77,7 +77,7 @@ src-link luci $(readlink -f feeds/luci)
src-link openmptcprouter $(readlink -f "$OMR_FEED")
EOF
cat >> "$OMR_TARGET/source/package/system/opkg/files/customfeeds.conf" <<EOF
cat > "$OMR_TARGET/source/package/system/opkg/files/customfeeds.conf" <<EOF
src/gz openwrt_luci http://downloads.openwrt.org/snapshots/packages/${OMR_REAL_TARGET}/luci
src/gz openwrt_packages http://downloads.openwrt.org/snapshots/packages/${OMR_REAL_TARGET}/packages
src/gz openwrt_base http://downloads.openwrt.org/snapshots/packages/${OMR_REAL_TARGET}/base
@ -116,6 +116,13 @@ else
fi
echo "Done"
echo "Reverse gtime patch"
if ! patch -Nf -p1 -s --dry-run < ../../patches/gtime.patch; then
patch -N -R -p1 -s < ../../patches/gtime.patch
fi
echo "Done"
#echo "Set to kernel 4.9 for all arch"
#find target/linux/ -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.14%KERNEL_PATCHVER:=4.9%g' {} \;
#echo "Done"

44
patches/gtime.patch Normal file
View file

@ -0,0 +1,44 @@
From ff6e62b288cab103f9dd4200b49ec6dc47375eb8 Mon Sep 17 00:00:00 2001
From: Etienne Champetier <champetier.etienne@gmail.com>
Date: Mon, 30 Apr 2018 12:55:12 -0700
Subject: [PATCH] build: log time taken by each packages/steps
The idea is to easily get the list of packages taking the most time to build,
and see if we can improve them
v1: Use SetupHostCommand as recommended by John
v2: add space after 'time:', remove useless /usr/bin/time from SetupHostCommand
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
---
include/prereq-build.mk | 4 ++++
include/subdir.mk | 1 +
2 files changed, 5 insertions(+)
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 5b9a7e049d1..bac5fdc84c6 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -138,6 +138,10 @@ $(eval $(call SetupHostCommand,bzip2,Please install 'bzip2', \
$(eval $(call SetupHostCommand,wget,Please install GNU 'wget', \
wget --version | grep GNU))
+$(eval $(call SetupHostCommand,gtime,Please install GNU 'time', \
+ gtime --version 2>&1 | grep GNU, \
+ time --version 2>&1 | grep GNU))
+
$(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \
perl --version | grep "perl.*v5"))
diff --git a/include/subdir.mk b/include/subdir.mk
index 79a80528aef..ed4f7537d5c 100644
--- a/include/subdir.mk
+++ b/include/subdir.mk
@@ -43,6 +43,7 @@ log_make = \
$(if $(BUILD_LOG), \
set -o pipefail; \
mkdir -p $(BUILD_LOG_DIR)/$(1)$(if $(4),/$(4));) \
+ gtime -f "time: $(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2)\#%U\#%S\#%e" -- \
$$(SUBMAKE) $(subdir_make_opts) $(if $(3),$(3)-)$(2) \
$(if $(BUILD_LOG),SILENT= 2>&1 | tee $(BUILD_LOG_DIR)/$(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2).txt)