X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=7e25ce9963e8a0a595a10b8424a0af8b7f47f6c7;hp=a30ed2c36d32b33565bf3c4357b32b993bd36da2;hb=203601bf686a3248f4a807d728ed53bc7c499e0d;hpb=ee072e104cf147338893ce2e845044da1af3b594

diff --git a/make.sh b/make.sh
index a30ed2c36d..7e25ce9963 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.19"							# Version number
-CORE="109"							# Core Level (Filename)
-PAKFIRE_CORE="109"						# Core Level (PAKFIRE)
+CORE="111"							# Core Level (Filename)
+PAKFIRE_CORE="110"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
@@ -279,8 +279,6 @@ buildtoolchain() {
     LOGFILE="$BASEDIR/log/_build.toolchain.log"
     export LOGFILE
 
-    local ORG_PATH=$PATH
-    export PATH="/tools/ccache/bin:/tools/bin:$PATH"
     lfsmake1 ccache			PASS=1
     lfsmake1 binutils			PASS=1
     lfsmake1 gcc			PASS=1
@@ -316,7 +314,6 @@ buildtoolchain() {
     lfsmake1 xz
     lfsmake1 fake-environ
     lfsmake1 cleanup-toolchain		PASS=2
-    export PATH=$ORG_PATH
 }
 
 buildbase() {
@@ -393,6 +390,7 @@ buildipfire() {
   LOGFILE="$BASEDIR/log/_build.ipfire.log"
   export LOGFILE
   ipfiremake configroot
+  ipfiremake initscripts
   ipfiremake backup
   ipfiremake pkg-config
   ipfiremake libusb
@@ -487,12 +485,18 @@ buildipfire() {
   ipfiremake libgpg-error
   ipfiremake libgcrypt
   ipfiremake libassuan
+  ipfiremake nettle
+  ipfiremake libevent
+  ipfiremake libevent2
+  ipfiremake libevent2-compat
+  ipfiremake expat
+  ipfiremake unbound
+  ipfiremake gnutls
   ipfiremake bind
   ipfiremake dhcp
   ipfiremake dhcpcd
   ipfiremake boost
   ipfiremake linux-atm
-  ipfiremake expat
   ipfiremake gdbm
   ipfiremake pam
   ipfiremake curl
@@ -539,10 +543,6 @@ buildipfire() {
   ipfiremake arping
   ipfiremake beep
   ipfiremake dvdrtools
-  ipfiremake nettle
-  ipfiremake libevent
-  ipfiremake libevent2
-  ipfiremake unbound
   ipfiremake dosfstools
   ipfiremake reiserfsprogs
   ipfiremake xfsprogs
@@ -562,7 +562,6 @@ buildipfire() {
   ipfiremake hdparm
   ipfiremake sdparm
   ipfiremake mtools
-  ipfiremake initscripts
   ipfiremake whatmask
   ipfiremake conntrack-tools
   ipfiremake libupnp
@@ -647,11 +646,12 @@ buildipfire() {
   ipfiremake dbus
   ipfiremake intltool
   ipfiremake libdaemon
-  ipfiremake avahi
   ipfiremake cups
   ipfiremake ghostscript
   ipfiremake lcms2
   ipfiremake qpdf
+  ipfiremake poppler
+  ipfiremake cups-filters
   ipfiremake epson-inkjet-printer-escpr
   ipfiremake foomatic
   ipfiremake hplip
@@ -839,6 +839,8 @@ buildipfire() {
   ipfiremake sendEmail
   ipfiremake sysbench
   ipfiremake strace
+  ipfiremake elfutils
+  ipfiremake ltrace
   ipfiremake ipfire-netboot
   ipfiremake lcdproc
   ipfiremake bitstream
@@ -879,6 +881,7 @@ buildipfire() {
   ipfiremake libpciaccess
   ipfiremake libyajl
   ipfiremake libvirt
+  ipfiremake python3-libvirt
   ipfiremake freeradius
   ipfiremake perl-common-sense
   ipfiremake perl-inotify2