Skip to content

Instantly share code, notes, and snippets.

@flaviut

flaviut/esp-open-sdk-git.patch

Created December 12, 2018 18:08
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save flaviut/64fa918566e3370736cee9c9a284bee3 to your computer and use it in GitHub Desktop.
Save flaviut/64fa918566e3370736cee9c9a284bee3 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
esp-open-sdk-git.patch
From cd5757b5d231294bc0e41f509ebe492569975ce1 Mon Sep 17 00:00:00 2001
From: Flaviu Tamas <tamasflaviu@gmail.com>
Date: Wed, 12 Dec 2018 17:49:27 +0000
Subject: [PATCH 1/5] Build using gdb-8.2
---
crosstool-config-overrides.patch | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/crosstool-config-overrides.patch b/crosstool-config-overrides.patch
index ccd9480..a5dd4fa 100644
--- a/crosstool-config-overrides.patch
+++ b/crosstool-config-overrides.patch
@@ -1,10 +1,16 @@
---- crosstool-config-overrides.old 2017-07-08 15:08:14.192759182 +0100
-+++ crosstool-config-overrides 2017-07-08 15:08:50.223178640 +0100
-@@ -1,5 +1,6 @@
+--- crosstool-config-overrides.old
++++ crosstool-config-overrides
+@@ -1,4 +1,12 @@
# Building static toolchain causes problems on some distros which
# by default don't install static libs for all required dependencies
-#CT_STATIC_TOOLCHAIN=y
+CT_STATIC_TOOLCHAIN=y
CT_LIBC_NEWLIB_ENABLE_TARGET_OPTSPACE=y
+CT_GDB_CROSS_EXTRA_CONFIG_ARRAY="--with-guile=guile-2.0"
-
++
++# use gdb 8.2, which fixes a py3.7 bug
++CT_GDB_HAS_PKGVERSION_BUGURL=y
++CT_GDB_HAS_PYTHON=y
++CT_GDB_INSTALL_GDBINIT=y
++CT_GDB_CUSTOM="${CT_TOP_DIR}/.build/tarballs/gdb-8.2.tar.xz"
++CT_GDB_VERSION="8.2"
--
2.20.0
From 517090b68b8676a5843c71fde2763e15d740698a Mon Sep 17 00:00:00 2001
From: Flaviu Tamas <tamasflaviu@gmail.com>
Date: Wed, 12 Dec 2018 17:50:00 +0000
Subject: [PATCH 2/5] Track all sources in PKGBUILD
---
PKGBUILD | 69 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 60 insertions(+), 9 deletions(-)
diff --git a/PKGBUILD b/PKGBUILD
index 053745e..b3c7ab5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
#Maintainer: Sam Bazley <sambazley@protonmail.com>
pkgname=esp-open-sdk-git
-pkgver=1
-pkgrel=12
+pkgver=20181127203314
+pkgrel=1
pkgdesc="Free and open (as much as possible) integrated SDK for ESP8266 chips"
arch=("i686" "x86_64")
url="https://github.com/pfalcon/esp-open-sdk"
@@ -11,8 +11,53 @@ provides=("esp-open-sdk")
conflicts=("esp-open-sdk")
options=("!strip" "!buildflags" "!makeflags")
-source=("git+https://github.com/pfalcon/esp-open-sdk.git")
-md5sums=("SKIP")
+source=(
+ "git+https://github.com/pfalcon/esp-open-sdk.git"
+ Makefile.patch
+ blinky_Makefile.patch
+ crosstool-config-overrides.patch
+ esp-open-sdk-git.sh
+ 'http://isl.gforge.inria.fr/isl-0.14.tar.xz'
+ 'https://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz'
+ 'https://ftpmirror.gnu.org/gnu/binutils/binutils-2.25.1.tar.bz2'
+ 'https://ftpmirror.gnu.org/gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2'
+ 'https://ftpmirror.gnu.org/gnu/gdb/gdb-8.2.tar.xz'
+ 'https://ftpmirror.gnu.org/gnu/mpc/mpc-1.0.3.tar.gz'
+ 'https://ftpmirror.gnu.org/gnu/mpfr/mpfr-3.1.3.tar.xz'
+ 'https://ftpmirror.gnu.org/pub/gnu/ncurses/ncurses-6.0.tar.gz'
+ 'https://gmplib.org/download/gmp/gmp-6.0.0a.tar.xz'
+ 'https://mirrors.kernel.org/sources.redhat.com/newlib/newlib-2.0.0.tar.gz'
+ 'https://www.bastoul.net/cloog/pages/download/cloog-0.18.4.tar.gz'
+)
+noextract=(
+ 'binutils-2.25.1.tar.bz2'
+ 'cloog-0.18.4.tar.gz'
+ 'expat-2.1.0.tar.gz'
+ 'gcc-4.8.5.tar.bz2'
+ 'gdb-8.2.tar.xz'
+ 'gmp-6.0.0a.tar.xz'
+ 'isl-0.14.tar.xz'
+ 'mpc-1.0.3.tar.gz'
+ 'mpfr-3.1.3.tar.xz'
+ 'ncurses-6.0.tar.gz'
+ 'newlib-2.0.0.tar.gz'
+)
+md5sums=('SKIP'
+ '482c20871a5019bff9647fce3c8fb47d'
+ '7d87179a9596ce19e87379db34737917'
+ '18815ee7ec0fcc9082288f47a94c7b2e'
+ 'c5c244df767b0d5484cabbb35ee09f88'
+ '3d6b6a1cddd165fae2af5487c5531b09'
+ 'dd7dab7a5fea97d2a6a43f511449b7cd'
+ 'ac493a78de4fee895961d025b7905be4'
+ '80d2c2982a3392bb0b89673ff136e223'
+ 'b5a49dbff00d9a87fbe114d14b3101c0'
+ 'd6a1d5f8ddea3abd2cc3e98f58352d26'
+ '6969398cd2fbc56a6af570b5273c56a9'
+ 'ee13d052e1ead260d7c28071f46eefb1'
+ '1e6da4e434553d2811437aa42c7f7c76'
+ 'e3e936235e56d6a28afb2a7f98b1a635'
+ 'e531f725244856c92c9bba009ff44faf')
pkgver() {
cd esp-open-sdk
@@ -24,10 +69,17 @@ prepare() {
git submodule init
git submodule deinit esptool
git submodule update
- patch Makefile < "$startdir"/Makefile.patch
+
+ patch Makefile < "$srcdir"/Makefile.patch
patch crosstool-config-overrides \
- < "$startdir"/crosstool-config-overrides.patch
- patch examples/blinky/Makefile < "$startdir"/blinky_Makefile.patch
+ < "$srcdir"/crosstool-config-overrides.patch
+ patch examples/blinky/Makefile < "$srcdir"/blinky_Makefile.patch
+
+ TARBALL_DEST="crosstool-NG/.build/tarballs/"
+ mkdir -p "$TARBALL_DEST"
+ for f in "${noextract[@]}"; do
+ ln -sf "$srcdir/$f" "$TARBALL_DEST"
+ done
}
build() {
@@ -37,9 +89,8 @@ build() {
}
package() {
- cd "$startdir"
mkdir -p "$pkgdir"/etc/profile.d
- install -m755 esp-open-sdk-git.sh "$pkgdir"/etc/profile.d
+ install -m755 "$srcdir/esp-open-sdk-git.sh" "$pkgdir"/etc/profile.d
mkdir -p "$pkgdir"/opt/esp-open-sdk
cd "$srcdir"/esp-open-sdk/
--
2.20.0
From 5aabca8dc6f08940878ba49aca3478f4b6b5e092 Mon Sep 17 00:00:00 2001
From: Flaviu Tamas <tamasflaviu@gmail.com>
Date: Wed, 12 Dec 2018 17:51:04 +0000
Subject: [PATCH 3/5] Add gitignore
---
.gitignore | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..33889fa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.tar.*
+/src/
+/pkg/
+/esp-open-sdk/
--
2.20.0
From 4044a8de8a4f9452cacb05abc7128b946d4062ef Mon Sep 17 00:00:00 2001
From: Flaviu Tamas <tamasflaviu@gmail.com>
Date: Wed, 12 Dec 2018 17:51:28 +0000
Subject: [PATCH 4/5] Use sha256
---
PKGBUILD | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/PKGBUILD b/PKGBUILD
index b3c7ab5..705d4c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -42,22 +42,22 @@ noextract=(
'ncurses-6.0.tar.gz'
'newlib-2.0.0.tar.gz'
)
-md5sums=('SKIP'
- '482c20871a5019bff9647fce3c8fb47d'
- '7d87179a9596ce19e87379db34737917'
- '18815ee7ec0fcc9082288f47a94c7b2e'
- 'c5c244df767b0d5484cabbb35ee09f88'
- '3d6b6a1cddd165fae2af5487c5531b09'
- 'dd7dab7a5fea97d2a6a43f511449b7cd'
- 'ac493a78de4fee895961d025b7905be4'
- '80d2c2982a3392bb0b89673ff136e223'
- 'b5a49dbff00d9a87fbe114d14b3101c0'
- 'd6a1d5f8ddea3abd2cc3e98f58352d26'
- '6969398cd2fbc56a6af570b5273c56a9'
- 'ee13d052e1ead260d7c28071f46eefb1'
- '1e6da4e434553d2811437aa42c7f7c76'
- 'e3e936235e56d6a28afb2a7f98b1a635'
- 'e531f725244856c92c9bba009ff44faf')
+sha256sums=('SKIP'
+ 'a7cf8cab5427780bf52fde008e7146d0d999b83fca2fb3325b5432db2a7a4ac0'
+ 'd768a01532c94c62323efad2851826303431932a315f1596667409ba255393d7'
+ '3406f92c5782e0d0cb6e4db9d15be21d7c6744cd80d78073050edddbc4ff65d4'
+ 'cdcd46da2ad99523330a65eb43b6cdf5136511d5afe815a404d996e4d0414926'
+ 'b1044f02819da0708fc7071fa2a558ce5d3c29d6676c8cb113caaedd5903ff03'
+ '823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86'
+ 'b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22'
+ '22fb1e7e0f68a63cee631d85b20461d1ea6bda162f03096350e38c8d427ecf23'
+ 'c3a441a29c7c89720b734e5a9c6289c0a06be7e0c76ef538f7bbcef389347c39'
+ '617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3'
+ '6835a08bd992c8257641791e9a6a2b35b02336c8de26d0a8577953747e514a16'
+ 'f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260'
+ '9156d32edac6955bc53b0218f5f3763facb890b73a835d5e1b901dcf8eb8b764'
+ '49c29e9129325e7c3b221aa829743ddcd796d024440e47c80fc0d6769af72d8a'
+ '325adf3710ce2229b7eeb9e84d3b539556d093ae860027185e7af8a8b00a750e')
pkgver() {
cd esp-open-sdk
--
2.20.0
From b43e1a2f9a3572e9a0776824beaf5c4fb1f35df9 Mon Sep 17 00:00:00 2001
From: Flaviu Tamas <tamasflaviu@gmail.com>
Date: Wed, 12 Dec 2018 17:55:13 +0000
Subject: [PATCH 5/5] Reset CFLAGS
---
PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/PKGBUILD b/PKGBUILD
index 705d4c4..dd623b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -84,7 +84,7 @@ prepare() {
build() {
cd "$srcdir"/esp-open-sdk
- LD_LIBRARY_PATH= make
+ CFLAGS= CXXFLAGS= LD_LIBRARY_PATH= make
cp sdk/lib/libgcc.a xtensa-lx106-elf/lib/gcc/xtensa-lx106-elf/4.8.5
}
--
2.20.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment