]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - make.sh
xtables-addons: Fix typo in lfs
[people/pmueller/ipfire-2.x.git] / make.sh
diff --git a/make.sh b/make.sh
index 7e9cd6d9d862154c5f0c839e767725509d0dbbc9..1d9163dce492950f2e85984e12c03702eb77488a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.21"                                                 # Version number
-CORE="126"                                                     # Core Level (Filename)
-PAKFIRE_CORE="125"                                             # Core Level (PAKFIRE)
+CORE="127"                                                     # Core Level (Filename)
+PAKFIRE_CORE="126"                                             # 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
@@ -253,7 +253,10 @@ configure_build() {
 
 configure_build_guess() {
        case "${HOST_ARCH}" in
-               x86_64|i686|i586)
+               x86_64)
+                       echo "x86_64"
+                       ;;
+               i?86)
                        echo "i586"
                        ;;
 
@@ -1302,7 +1305,6 @@ buildipfire() {
   lfsmake2 python-daemon
   lfsmake2 python-ipaddress
   lfsmake2 glib
-  lfsmake2 GeoIP
   lfsmake2 ntp
   lfsmake2 openssh
   lfsmake2 fontconfig
@@ -1431,6 +1433,7 @@ buildipfire() {
   lfsmake2 mpd
   lfsmake2 libmpdclient
   lfsmake2 mpc
+  lfsmake2 perl-Net-CIDR-Lite
   lfsmake2 perl-Net-SMTP-SSL
   lfsmake2 perl-MIME-Base64
   lfsmake2 perl-Authen-SASL