Jelajahi Sumber

added target ar71xx-tiny for support of TP-Link TL-WR841N.
For this target there are no modules build so that the build script checks this and continues.

cajuskamer 6 tahun lalu
induk
melakukan
f00b430bca
2 mengubah file dengan 21 tambahan dan 17 penghapusan
  1. 2 2
      Dockerfile
  2. 19 15
      docker-build.py

+ 2 - 2
Dockerfile

@@ -1,12 +1,12 @@
 FROM debian:stretch
-MAINTAINER Markus Lindenberg <markus@lindenberg.io>
+MAINTAINER Cajus Kamer <Cajus.Kamer@arcor.de>
 
 ENV GLUON_SITE ffdo
 ENV GLUON_TAG v2017.1.2 
 ENV GLUON_RELEASE 0.11.2
 ENV GLUON_BRANCH stable
 ENV GLUON_BROKEN 1
-ENV GLUON_TARGETS ar71xx-generic ar71xx-nand brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic x86-generic x86-64 
+ENV GLUON_TARGETS ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic x86-generic x86-64 
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBIAN_PRIORITY critical

+ 19 - 15
docker-build.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 from os import environ, makedirs, chdir, listdir, rename
-from os.path import isdir
+from os.path import isdir, exists
 from subprocess import call, check_call
 from shutil import *
 from multiprocessing import cpu_count
@@ -99,19 +99,23 @@ for target in targets:
             rename('output/images/sysupgrade/%s' % f, '%s/%s' % (sysupdir, f))
 
         # Move modules to output
-        try:
-            makedirs('%s/%s' % (modulesdir, arch))
-        except FileExistsError:
-            pass
-        variantdir = '%s/%s/%s' % (modulesdir, arch, variant)
-        rename('output/packages/gluon-%s-%s/%s/%s' % (site, release, arch, variant), variantdir)
-
-        # Checksum modules
-        print('Creating SHA512 sums for modules... ', end=''); stdout.flush()
-        chdir(variantdir)
-        check_call('sha512sum * > sha512sum.txt', shell=True)
-        chdir(gluondir)
-        print('OK')
+        # Since lede modules are optional for some targets
+        modulesbuilddir = 'output/packages/gluon-%s-%s/%s/%s' % (site, release, arch, variant)
+        if exists(modulesbuilddir):
+            try:
+                makedirs('%s/%s' % (modulesdir, arch))
+            except FileExistsError:
+                pass
+            variantdir = '%s/%s/%s' % (modulesdir, arch, variant)
+            rename('output/packages/gluon-%s-%s/%s/%s' % (site, release, arch, variant), variantdir)
+
+            # Checksum modules
+            print('Creating SHA512 sums for modules... ', end=''); stdout.flush()
+            chdir(variantdir)
+            check_call('sha512sum * > sha512sum.txt', shell=True)
+            chdir(gluondir)
+        else:
+            print('No modules found for target %s....OK' % target)
     else:
         print('FAILED after', duration)
 
@@ -128,7 +132,7 @@ for target in targets:
     else:
         print('FAILED')
     stdout.flush()
-    
+
 print('Creating SHA512 sums for images... ', end=''); stdout.flush()
 for d in (factorydir, sysupdir):
     chdir(d)