瀏覽代碼

added patches 0006 and 0007

Reinhard Russinger 7 年之前
父節點
當前提交
2b20cab2db

+ 6 - 6
Make-bb-kernel_Qt5.7.sh

@@ -24,12 +24,12 @@ rm -rf buildroot57
 git clone git://git.buildroot.net/buildroot ./buildroot57
 cd buildroot57
 git checkout 63a20d5dfebe83e2b2bd683dc78ebdf787dff100 -b gfawrk
-patch -p1 < ../GfA/patches/0001-GfA-wrk-changes-and-setup.patch
-patch -p1 < ../GfA/patches/0002-mysql-add-innodb-engine-to-package.patch
-patch -p1 < ../GfA/patches/0003-add-SW_IO1-to-SW_IO4-to-headers-and-evtest.patch
-patch -p1 < ../GfA/patches/0004-libmodbus-GfA-fflush-for-debug.patch
-patch -p1 < ../GfA/patches/0005-GfA-empty-input-queue-on-CRC-error.patch
-#
+for i in ../GfA/patches/*.patch
+do
+	echo "==Apply patch : <$i> =="
+	patch -p1 < $i
+done
+
 chmod a+x *.sh
 cp ../GfA/configs/* ./configs
 git add .

+ 45 - 0
patches/0006-change-source-ref-of-expect-package.patch

@@ -0,0 +1,45 @@
+From 29d78335b3d30d1fd7f78d6fe8b3f5244cc2c519 Mon Sep 17 00:00:00 2001
+From: Reinhard Russinger <reinhard@russinger.at>
+Date: Sun, 8 Jul 2018 20:49:14 +0200
+Subject: [PATCH 6/7] change source ref of expect package
+
+---
+ package/expect/expect.hash | 4 ++++
+ package/expect/expect.mk   | 7 ++++---
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+ create mode 100644 package/expect/expect.hash
+
+diff --git a/package/expect/expect.hash b/package/expect/expect.hash
+new file mode 100644
+index 0000000000..c89f323906
+--- /dev/null
++++ b/package/expect/expect.hash
+@@ -0,0 +1,4 @@
++# From https://sourceforge.net/projects/expect/files/Expect/5.45.3/expect5.45.3.tar.gz.SHA256
++sha256  c520717b7195944a69ce1492ec82ca0ac3f3baf060804e6c5ee6d505ea512be9  expect5.45.3.tar.gz
++# Locally calculated
++sha256  b2415b17dc8d9a287f4509047ef5ac3436baef7ba7c50faef5222dcdf61a2bab  README
+diff --git a/package/expect/expect.mk b/package/expect/expect.mk
+index d78ff6c208..ccde33a71b 100644
+--- a/package/expect/expect.mk
++++ b/package/expect/expect.mk
+@@ -4,12 +4,13 @@
+ #
+ ################################################################################
+ 
+-# Version 5.45.3
+-EXPECT_VERSION = 2014-05-02
+-EXPECT_SITE = cvs://expect.cvs.sourceforge.net:/cvsroot/expect
++EXPECT_VERSION = 5.45.3
++EXPECT_SITE = https://sourceforge.net/projects/expect/files/Expect/$(EXPECT_VERSION)
++EXPECT_SOURCE = expect$(EXPECT_VERSION).tar.gz
+ EXPECT_LICENSE = Public domain
+ EXPECT_LICENSE_FILES = README
+ 
++# 0001-enable-cross-compilation.patch
+ EXPECT_AUTORECONF = YES
+ EXPECT_DEPENDENCIES = tcl
+ EXPECT_CONF_OPTS = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
+-- 
+2.17.1
+

+ 24 - 0
patches/0007-change-source-ref-of-qt-5.7.0.patch

@@ -0,0 +1,24 @@
+From ece4f60bdaa3fd818286ff1b6f41c993e5dc83bf Mon Sep 17 00:00:00 2001
+From: Reinhard Russinger <reinhard@russinger.at>
+Date: Sun, 8 Jul 2018 20:49:46 +0200
+Subject: [PATCH 7/7] change source ref of qt 5.7.0
+
+---
+ package/qt5/qt5.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
+index 0710ef432c..ba8ae0d196 100644
+--- a/package/qt5/qt5.mk
++++ b/package/qt5/qt5.mk
+@@ -1,6 +1,6 @@
+ QT5_VERSION_MAJOR = 5.7
+ QT5_VERSION = $(QT5_VERSION_MAJOR).0
+-QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
++QT5_SITE = http://download.qt.io/archive/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
+ ##QT5_VERSION = $(QT5_VERSION_MAJOR).1
+ ##QT5_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules
+ include $(sort $(wildcard package/qt5/*/*.mk))
+-- 
+2.17.1
+