Merge remote-tracking branch 'origin/master' into next

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 9314ae942082152076ffdd6aa854a005804ff06c..6585dd13a1a1a11d9b62625b2539690e71569cba 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.19"                                                 # Version number
-CORE="110"                                                     # Core Level (Filename)
+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
@@ -494,6 +494,7 @@ buildipfire() {
   lfsmake2 nettle
   lfsmake2 libevent
   lfsmake2 libevent2
+  lfsmake2 libevent2-compat
   lfsmake2 expat
   lfsmake2 unbound
   lfsmake2 gnutls
@@ -652,8 +653,8 @@ buildipfire() {
   lfsmake2 intltool
   lfsmake2 libdaemon
   lfsmake2 cups
-  lfsmake2 ghostscript
   lfsmake2 lcms2
+  lfsmake2 ghostscript
   lfsmake2 qpdf
   lfsmake2 poppler
   lfsmake2 cups-filters
@@ -805,7 +806,6 @@ buildipfire() {
   lfsmake2 pound
   lfsmake2 minicom
   lfsmake2 ddrescue
-  lfsmake2 imspector
   lfsmake2 miniupnpd
   lfsmake2 client175
   lfsmake2 powertop
@@ -882,6 +882,7 @@ buildipfire() {
   lfsmake2 libpciaccess
   lfsmake2 libyajl
   lfsmake2 libvirt
+  lfsmake2 python3-libvirt
   lfsmake2 freeradius
   lfsmake2 perl-common-sense
   lfsmake2 perl-inotify2
@@ -992,7 +993,7 @@ ipfirepackages() {
 while [ $# -gt 0 ]; do
        case "${1}" in
                --target=*)
-                       configure_target "${1#--target=}"
+                       configure_build "${1#--target=}"
                        ;;
                -*)
                        exiterror "Unknown configuration option: ${1}"