core154: Ship header.pl

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

diff --git a/make.sh b/make.sh
index b17aca45738be04cf01f3dd6ae4918d0ef3462d5..86359ce15268235ec8e6a9716a2ad0edbd420e99 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ 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="153"                                                     # Core Level (Filename)
+CORE="154"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 NICE=10                                                                # Nice level
@@ -220,6 +220,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
@@ -465,7 +468,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
@@ -1093,7 +1096,6 @@ buildbase() {
        lfsmake2 m4
        lfsmake2 bison
        lfsmake2 ncurses
-       lfsmake2 procps
        lfsmake2 libtool
        lfsmake2 perl
        lfsmake2 readline
@@ -1102,6 +1104,9 @@ buildbase() {
        lfsmake2 xz
        lfsmake2 pcre
        lfsmake2 pcre-compat
+       lfsmake2 gettext
+       lfsmake2 attr
+       lfsmake2 acl
        lfsmake2 bash
        lfsmake2 diffutils
        lfsmake2 e2fsprogs
@@ -1109,7 +1114,6 @@ buildbase() {
        lfsmake2 findutils
        lfsmake2 flex
        lfsmake2 gawk
-       lfsmake2 gettext
        lfsmake2 go
        lfsmake2 grep
        lfsmake2 groff
@@ -1121,6 +1125,7 @@ buildbase() {
        lfsmake2 kbd
        lfsmake2 less
        lfsmake2 pkg-config
+       lfsmake2 procps
        lfsmake2 make
        lfsmake2 man
        lfsmake2 net-tools
@@ -1233,6 +1238,7 @@ buildipfire() {
   lfsmake2 linux-atm
   lfsmake2 gdbm
   lfsmake2 pam
+  lfsmake2 c-ares
   lfsmake2 curl
   lfsmake2 tcl
   lfsmake2 sqlite
@@ -1252,6 +1258,8 @@ buildipfire() {
   lfsmake2 nasm
   lfsmake2 libarchive
   lfsmake2 cmake
+  lfsmake2 ninja
+  lfsmake2 meson
   lfsmake2 libjpeg
   lfsmake2 libjpeg-compat
   lfsmake2 openjpeg
@@ -1263,8 +1271,6 @@ buildipfire() {
   lfsmake2 slang
   lfsmake2 newt
   lfsmake2 libsmooth
-  lfsmake2 attr
-  lfsmake2 acl
   lfsmake2 libcap
   lfsmake2 libcap-ng
   lfsmake2 pciutils