X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=a2b4a7ce01d2042eb31c97a128f75062420912cc;hb=b84005daaaaa7d0e82d34485c56b0546cc4942d0;hp=cf16717efdd4cddad0272663f23bfcccdda4f9ce;hpb=76c5f3e0d96525c419faa3e69d7592d3e3d0965b;p=ipfire-2.x.git

diff --git a/make.sh b/make.sh
index cf16717efd..a2b4a7ce01 100755
--- 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="151"							# Core Level (Filename)
+CORE="154"							# 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 }'`
@@ -220,6 +219,9 @@ configure_build() {
 	# Use this as default PARALLELISM
 	DEFAULT_PARALLELISM="${parallelism}"
 
+	# Limit lauched ninja build jobs to computed parallel value.
+	NINJAJOBS="${parallelism}"
+
 	# Compression parameters
 	# We use mode 8 for reasonable memory usage when decompressing
 	# but with overall good compression
@@ -432,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"
@@ -465,7 +462,7 @@ prepareenv() {
 	# Setup environment
 	set +h
 	LC_ALL=POSIX
-	export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM RUSTFLAGS
+	export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM RUSTFLAGS NINJAJOBS
 	unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
 	# Make some extra directories
@@ -1076,6 +1073,7 @@ buildbase() {
 	lfsmake2 tzdata
 	lfsmake2 cleanup-toolchain
 	lfsmake2 zlib
+	lfsmake2 zstd
 	lfsmake2 binutils
 	lfsmake2 gmp
 	lfsmake2 gmp-compat
@@ -1093,7 +1091,6 @@ buildbase() {
 	lfsmake2 m4
 	lfsmake2 bison
 	lfsmake2 ncurses
-	lfsmake2 procps
 	lfsmake2 libtool
 	lfsmake2 perl
 	lfsmake2 readline
@@ -1102,6 +1099,9 @@ buildbase() {
 	lfsmake2 xz
 	lfsmake2 pcre
 	lfsmake2 pcre-compat
+	lfsmake2 gettext
+	lfsmake2 attr
+	lfsmake2 acl
 	lfsmake2 bash
 	lfsmake2 diffutils
 	lfsmake2 e2fsprogs
@@ -1109,7 +1109,6 @@ buildbase() {
 	lfsmake2 findutils
 	lfsmake2 flex
 	lfsmake2 gawk
-	lfsmake2 gettext
 	lfsmake2 go
 	lfsmake2 grep
 	lfsmake2 groff
@@ -1121,6 +1120,7 @@ buildbase() {
 	lfsmake2 kbd
 	lfsmake2 less
 	lfsmake2 pkg-config
+	lfsmake2 procps
 	lfsmake2 make
 	lfsmake2 man
 	lfsmake2 net-tools
@@ -1233,12 +1233,14 @@ buildipfire() {
   lfsmake2 linux-atm
   lfsmake2 gdbm
   lfsmake2 pam
+  lfsmake2 c-ares
   lfsmake2 curl
   lfsmake2 tcl
   lfsmake2 sqlite
   lfsmake2 libffi
   lfsmake2 python
   lfsmake2 python3
+  lfsmake2 gdb
   lfsmake2 grub
   lfsmake2 efivar
   lfsmake2 efibootmgr
@@ -1251,8 +1253,11 @@ buildipfire() {
   lfsmake2 nasm
   lfsmake2 libarchive
   lfsmake2 cmake
+  lfsmake2 ninja
+  lfsmake2 meson
   lfsmake2 libjpeg
   lfsmake2 libjpeg-compat
+  lfsmake2 openjpeg
   lfsmake2 libexif
   lfsmake2 libpng
   lfsmake2 libtiff
@@ -1261,8 +1266,6 @@ buildipfire() {
   lfsmake2 slang
   lfsmake2 newt
   lfsmake2 libsmooth
-  lfsmake2 attr
-  lfsmake2 acl
   lfsmake2 libcap
   lfsmake2 libcap-ng
   lfsmake2 pciutils
@@ -1295,6 +1298,7 @@ buildipfire() {
   lfsmake2 perl-Device-SerialPort
   lfsmake2 perl-Device-Modem
   lfsmake2 perl-Apache-Htpasswd
+  lfsmake2 perl-Parse-Yapp
   lfsmake2 gnupg
   lfsmake2 hdparm
   lfsmake2 sdparm
@@ -1336,7 +1340,6 @@ buildipfire() {
   lfsmake2 Archive-Tar
   lfsmake2 Archive-Zip
   lfsmake2 Text-Tabs+Wrap
-  lfsmake2 Locale-Country
   lfsmake2 XML-Parser
   lfsmake2 Crypt-PasswdMD5
   lfsmake2 Net-Telnet
@@ -1383,7 +1386,6 @@ buildipfire() {
   lfsmake2 spandsp
   lfsmake2 lz4
   lfsmake2 lzo
-  lfsmake2 zstd
   lfsmake2 openvpn
   lfsmake2 mpage
   lfsmake2 dbus
@@ -1395,12 +1397,14 @@ buildipfire() {
   lfsmake2 ghostscript
   lfsmake2 qpdf
   lfsmake2 poppler
+  lfsmake2 poppler-data
   lfsmake2 cups-filters
   lfsmake2 epson-inkjet-printer-escpr
   lfsmake2 foomatic
   lfsmake2 hplip
   lfsmake2 cifs-utils
   lfsmake2 krb5
+  lfsmake2 rpcsvc-proto
   lfsmake2 samba
   lfsmake2 netatalk
   lfsmake2 sudo
@@ -1414,9 +1418,6 @@ buildipfire() {
   lfsmake2 fetchmail
   lfsmake2 clamav
   lfsmake2 perl-NetAddr-IP
-  lfsmake2 spamassassin
-  lfsmake2 perl-Net-LibIDN
-  lfsmake2 amavisd
   lfsmake2 dma
   lfsmake2 alsa
   lfsmake2 mpfire
@@ -1437,7 +1438,6 @@ buildipfire() {
   lfsmake2 rsync
   lfsmake2 rpcbind
   lfsmake2 keyutils
-  lfsmake2 rpcsvc-proto
   lfsmake2 libnfsidmap
   lfsmake2 nfs
   lfsmake2 gnu-netcat
@@ -1561,6 +1561,7 @@ buildipfire() {
   lfsmake2 python3-s3transfer
   lfsmake2 python3-rsa
   lfsmake2 python3-pyasn1
+  lfsmake2 python3-urllib3
   lfsmake2 python3-botocore
   lfsmake2 python3-llfuse
   lfsmake2 python3-msgpack
@@ -1620,6 +1621,7 @@ buildipfire() {
   lfsmake2 libpciaccess
   lfsmake2 libyajl
   lfsmake2 libvirt
+  lfsmake2 libtalloc
   lfsmake2 freeradius
   lfsmake2 perl-common-sense
   lfsmake2 perl-inotify2
@@ -1632,6 +1634,7 @@ buildipfire() {
   lfsmake2 dehydrated
   lfsmake2 shairport-sync
   lfsmake2 borgbackup
+  lfsmake2 lmdb
   lfsmake2 knot
   lfsmake2 spectre-meltdown-checker
   lfsmake2 zabbix_agentd
@@ -1644,6 +1647,7 @@ buildipfire() {
   lfsmake2 libloc
   lfsmake2 ncdu
   lfsmake2 lshw
+  lfsmake2 socat
 }
 
 buildinstaller() {