From: Michael Tremer Date: Wed, 20 Aug 2014 19:46:49 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/next' into install-raid X-Git-Tag: v2.17-core87~103^2~51^2~60 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=aa7f55b2dfab3194bbb41bfee671b122eda26da4 Merge remote-tracking branch 'origin/next' into install-raid --- aa7f55b2dfab3194bbb41bfee671b122eda26da4 diff --cc make.sh index 869a6efd5d,4cbdae4fad..fa556194b7 --- a/make.sh +++ b/make.sh @@@ -461,7 -456,18 +458,16 @@@ buildipfire() ;; esac ipfiremake pkg-config + ipfiremake openssl + ipfiremake openssl-compat + ipfiremake libgpg-error + ipfiremake libgcrypt + ipfiremake libassuan + ipfiremake bind + ipfiremake dhcp + ipfiremake dhcpcd + ipfiremake boost ipfiremake linux-atm - ipfiremake cpio - ipfiremake dracut ipfiremake expat ipfiremake gdbm ipfiremake pam