lvm2: Update to 2.02.187

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

diff --git a/make.sh b/make.sh
index 8dfc8897dd67e36274532996756c8d54b5515224..a2b4a7ce01d2042eb31c97a128f75062420912cc 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -29,7 +29,6 @@ VERSION="2.25"                                                        # Version number
 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 }'`
@@ -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"
@@ -1079,6 +1073,7 @@ buildbase() {
        lfsmake2 tzdata
        lfsmake2 cleanup-toolchain
        lfsmake2 zlib
+       lfsmake2 zstd
        lfsmake2 binutils
        lfsmake2 gmp
        lfsmake2 gmp-compat
@@ -1096,7 +1091,6 @@ buildbase() {
        lfsmake2 m4
        lfsmake2 bison
        lfsmake2 ncurses
-       lfsmake2 procps
        lfsmake2 libtool
        lfsmake2 perl
        lfsmake2 readline
@@ -1105,6 +1099,9 @@ buildbase() {
        lfsmake2 xz
        lfsmake2 pcre
        lfsmake2 pcre-compat
+       lfsmake2 gettext
+       lfsmake2 attr
+       lfsmake2 acl
        lfsmake2 bash
        lfsmake2 diffutils
        lfsmake2 e2fsprogs
@@ -1112,7 +1109,6 @@ buildbase() {
        lfsmake2 findutils
        lfsmake2 flex
        lfsmake2 gawk
-       lfsmake2 gettext
        lfsmake2 go
        lfsmake2 grep
        lfsmake2 groff
@@ -1124,6 +1120,7 @@ buildbase() {
        lfsmake2 kbd
        lfsmake2 less
        lfsmake2 pkg-config
+       lfsmake2 procps
        lfsmake2 make
        lfsmake2 man
        lfsmake2 net-tools
@@ -1269,8 +1266,6 @@ buildipfire() {
   lfsmake2 slang
   lfsmake2 newt
   lfsmake2 libsmooth
-  lfsmake2 attr
-  lfsmake2 acl
   lfsmake2 libcap
   lfsmake2 libcap-ng
   lfsmake2 pciutils
@@ -1391,7 +1386,6 @@ buildipfire() {
   lfsmake2 spandsp
   lfsmake2 lz4
   lfsmake2 lzo
-  lfsmake2 zstd
   lfsmake2 openvpn
   lfsmake2 mpage
   lfsmake2 dbus