From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 30 Mar 2018 08:26:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into kernel-4.14
X-Git-Tag: v2.21-core122~178^2~34
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=302dba205bf58b3def6163b85b4decfce4538fac

Merge remote-tracking branch 'origin/master' into kernel-4.14
---

302dba205bf58b3def6163b85b4decfce4538fac
diff --cc make.sh
index a41db54136,c03e464b51..691444cd96
--- a/make.sh
+++ b/make.sh
@@@ -1428,7 -1435,7 +1429,8 @@@ buildipfire() 
    lfsmake2 powertop
    lfsmake2 parted
    lfsmake2 swig
 +  lfsmake2 u-boot
+   lfsmake2 python-typing
    lfsmake2 python-m2crypto
    lfsmake2 wireless-regdb
    lfsmake2 crda