core155: Disable all connection tracking helpers

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

diff --git a/make.sh b/make.sh
index 2c0b2da43de9ad02125043cfa634fa6608a16085..43cccaca0dee59a73d0e01a0b64b92844c632a60 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,10 +26,9 @@ NAME="IPFire"                                                        # Software name
 SNAME="ipfire"                                                 # Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.25"                                                 # Version number
-CORE="154"                                                     # Core Level (Filename)
+CORE="155"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
-NICE=10                                                                # Nice level
 MAX_RETRIES=1                                                  # prefetch/check loop
 BUILD_IMAGES=1                                                 # Flash and Xen Downloader
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
@@ -435,11 +434,6 @@ prepareenv() {
        # Trap on emergency exit
        trap "exiterror 'Build process interrupted'" SIGINT SIGTERM SIGKILL SIGSTOP SIGQUIT
 
-       # Resetting our nice level
-       if ! renice ${NICE} $$ >/dev/null; then
-                       exiterror "Failed to set nice level to ${NICE}"
-       fi
-
        # Checking if running as root user
        if [ $(id -u) -ne 0 ]; then
                        exiterror "root privileges required for building"
@@ -1033,6 +1027,7 @@ buildtoolchain() {
        lfsmake1 gcc                    PASS=1
        lfsmake1 linux                  KCFG="-headers"
        lfsmake1 glibc
+       lfsmake1 libxcrypt
        lfsmake1 gcc                    PASS=L
        lfsmake1 binutils                       PASS=2
        lfsmake1 gcc                    PASS=2
@@ -1079,41 +1074,40 @@ buildbase() {
        lfsmake2 tzdata
        lfsmake2 cleanup-toolchain
        lfsmake2 zlib
+       lfsmake2 zstd
+       lfsmake2 autoconf
+       lfsmake2 automake
+       lfsmake2 libtool
        lfsmake2 binutils
        lfsmake2 gmp
-       lfsmake2 gmp-compat
        lfsmake2 mpfr
        lfsmake2 libmpc
+       lfsmake2 libxcrypt
        lfsmake2 file
        lfsmake2 gcc
        lfsmake2 sed
-       lfsmake2 autoconf
-       lfsmake2 automake
        lfsmake2 berkeley
-       lfsmake2 berkeley-compat
        lfsmake2 coreutils
        lfsmake2 iana-etc
        lfsmake2 m4
        lfsmake2 bison
        lfsmake2 ncurses
-       lfsmake2 libtool
        lfsmake2 perl
        lfsmake2 readline
-       lfsmake2 readline-compat
        lfsmake2 bzip2
        lfsmake2 xz
+       lfsmake2 lzip
        lfsmake2 pcre
-       lfsmake2 pcre-compat
+       lfsmake2 pcre2
+       lfsmake2 gettext
        lfsmake2 attr
        lfsmake2 acl
        lfsmake2 bash
        lfsmake2 diffutils
-       lfsmake2 e2fsprogs
        lfsmake2 ed
        lfsmake2 findutils
        lfsmake2 flex
        lfsmake2 gawk
-       lfsmake2 gettext
        lfsmake2 go
        lfsmake2 grep
        lfsmake2 groff
@@ -1138,6 +1132,7 @@ buildbase() {
        lfsmake2 texinfo
        lfsmake2 util-linux
        lfsmake2 vim
+       lfsmake2 e2fsprogs
 }
 
 buildipfire() {
@@ -1147,7 +1142,6 @@ buildipfire() {
   lfsmake2 initscripts
   lfsmake2 backup
   lfsmake2 openssl
-  [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
   lfsmake2 kmod
   lfsmake2 udev
   lfsmake2 popt
@@ -1261,7 +1255,6 @@ buildipfire() {
   lfsmake2 ninja
   lfsmake2 meson
   lfsmake2 libjpeg
-  lfsmake2 libjpeg-compat
   lfsmake2 openjpeg
   lfsmake2 libexif
   lfsmake2 libpng
@@ -1391,7 +1384,6 @@ buildipfire() {
   lfsmake2 spandsp
   lfsmake2 lz4
   lfsmake2 lzo
-  lfsmake2 zstd
   lfsmake2 openvpn
   lfsmake2 mpage
   lfsmake2 dbus
@@ -1511,6 +1503,7 @@ buildipfire() {
   lfsmake2 cpufrequtils
   lfsmake2 gutenprint
   lfsmake2 apcupsd
+  lfsmake2 fireperf
   lfsmake2 iperf
   lfsmake2 iperf3
   lfsmake2 7zip
@@ -1554,7 +1547,6 @@ buildipfire() {
   lfsmake2 python-distutils-extra
   lfsmake2 python-lzma
   lfsmake2 python-progressbar
-  lfsmake2 python-xattr
   lfsmake2 ddns
   lfsmake2 python3-setuptools
   lfsmake2 python3-setuptools-scm
@@ -1819,9 +1811,9 @@ clean)
        for i in `mount | grep $BASEDIR | sed 's/^.*loop=\(.*\))/\1/'`; do
                $LOSETUP -d $i 2>/dev/null
        done
-       for i in `mount | grep $BASEDIR | cut -d " " -f 1`; do
-               umount $i
-       done
+       #for i in `mount | grep $BASEDIR | cut -d " " -f 1`; do
+       #       umount $i
+       #done
        stdumount
        for i in `seq 0 7`; do
                if ( losetup /dev/loop${i} 2>/dev/null | grep -q "/install/images" ); then
@@ -1981,7 +1973,7 @@ lang)
        $BASEDIR/tools/check_strings.pl de > $BASEDIR/doc/language_issues.de
        $BASEDIR/tools/check_strings.pl fr > $BASEDIR/doc/language_issues.fr
        $BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.es
-       $BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.pl
+       $BASEDIR/tools/check_strings.pl pl > $BASEDIR/doc/language_issues.pl
        $BASEDIR/tools/check_strings.pl ru > $BASEDIR/doc/language_issues.ru
        $BASEDIR/tools/check_strings.pl nl > $BASEDIR/doc/language_issues.nl
        $BASEDIR/tools/check_strings.pl tr > $BASEDIR/doc/language_issues.tr