| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame^] | 1 | From 97cb9405f281f54d4083f3126d441c8b44eafb89 Mon Sep 17 00:00:00 2001 |
| 2 | From: Paul Barker <pbarker@toganlabs.com> |
| 3 | Date: Thu, 7 Sep 2017 19:14:20 +0000 |
| 4 | Subject: [PATCH] Don't require internet connection during build |
| 5 | |
| 6 | The following issues break offline builds: |
| 7 | |
| 8 | * Building the man page uses a web service hosted on heroku. |
| 9 | |
| 10 | * Makefile.ffmpeg explicitly does a "git clone" from the internet. |
| 11 | |
| 12 | Signed-off-by: Paul Barker <pbarker@toganlabs.com> |
| 13 | Upstream-status: Inappropriate |
| 14 | --- |
| 15 | Makefile | 6 ++---- |
| 16 | Makefile.ffmpeg | 2 +- |
| 17 | 2 files changed, 3 insertions(+), 5 deletions(-) |
| 18 | |
| 19 | diff --git a/Makefile b/Makefile |
| 20 | index 60501b1..6471f0f 100644 |
| 21 | --- a/Makefile |
| 22 | +++ b/Makefile |
| 23 | @@ -79,14 +79,12 @@ ffmpeg: |
| 24 | make -f Makefile.ffmpeg |
| 25 | make -f Makefile.ffmpeg install |
| 26 | |
| 27 | -dist: omxplayer.bin omxplayer.1 |
| 28 | +dist: omxplayer.bin |
| 29 | mkdir -p $(DIST)/usr/lib/omxplayer |
| 30 | mkdir -p $(DIST)/usr/bin |
| 31 | mkdir -p $(DIST)/usr/share/doc/omxplayer |
| 32 | - mkdir -p $(DIST)/usr/share/man/man1 |
| 33 | cp omxplayer omxplayer.bin $(DIST)/usr/bin |
| 34 | cp COPYING $(DIST)/usr/share/doc/omxplayer |
| 35 | cp README.md $(DIST)/usr/share/doc/omxplayer/README |
| 36 | - cp omxplayer.1 $(DIST)/usr/share/man/man1 |
| 37 | cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/ |
| 38 | - tar -czf omxplayer-dist.tar.gz $(DIST) |
| 39 | \ No newline at end of file |
| 40 | + tar -czf omxplayer-dist.tar.gz $(DIST) |
| 41 | diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg |
| 42 | index 22d495c..8651724 100644 |
| 43 | --- a/Makefile.ffmpeg |
| 44 | +++ b/Makefile.ffmpeg |
| 45 | @@ -6,7 +6,7 @@ FFMPEG_EXTRA_CFLAGS?=-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstru |
| 46 | WORK=$(PWD) |
| 47 | |
| 48 | .PHONY : all |
| 49 | -all: checkout configure compile |
| 50 | +all: configure compile |
| 51 | |
| 52 | .PHONY : copy |
| 53 | copy: |
| 54 | -- |
| 55 | 2.7.4 |
| 56 | |