Revert "kernel: update to 4.14.172"

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

diff --git a/make.sh b/make.sh
index 72f21e4c8d94e720c49ab2e42325b62784bc9454..984fc95b2317677a4f2f093e322dee26938d375f 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007-2019 IPFire Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
@@ -27,7 +27,6 @@ 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="142"                                                     # Core Level (Filename)
-PAKFIRE_CORE="141"                                             # Core Level (PAKFIRE)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 NICE=10                                                                # Nice level
@@ -516,7 +515,7 @@ prepareenv() {
                        system_release="${system_release} - ${GIT_BRANCH}"
                        ;;
                *)
-                       system_release="${system_release} - Development Build: ${GIT_BRANCH}/${GIT_LASTCOMMIT:0:8}"
+                       system_release="${system_release} - core${CORE} Development Build: ${GIT_BRANCH}/${GIT_LASTCOMMIT:0:8}"
                        ;;
        esac
 
@@ -557,7 +556,6 @@ enterchroot() {
                PS1="${PS1}" \
                PATH="${PATH}" \
                SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
-               PAKFIRE_CORE="${PAKFIRE_CORE}" \
                PAKFIRE_TREE="${PAKFIRE_TREE}" \
                NAME="${NAME}" \
                SNAME="${SNAME}" \
@@ -1113,7 +1111,6 @@ buildbase() {
        lfsmake2 pkg-config
        lfsmake2 make
        lfsmake2 man
-       lfsmake2 kmod
        lfsmake2 net-tools
        lfsmake2 patch
        lfsmake2 psmisc
@@ -1123,7 +1120,6 @@ buildbase() {
        lfsmake2 tar
        lfsmake2 texinfo
        lfsmake2 util-linux
-       lfsmake2 udev
        lfsmake2 vim
 }
 
@@ -1135,6 +1131,8 @@ buildipfire() {
   lfsmake2 backup
   lfsmake2 openssl
   [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
+  lfsmake2 kmod
+  lfsmake2 udev
   lfsmake2 popt
   lfsmake2 libedit
   lfsmake2 libusb
@@ -1360,7 +1358,6 @@ buildipfire() {
   lfsmake2 cairo
   lfsmake2 pango
   lfsmake2 rrdtool
-  lfsmake2 setserial
   lfsmake2 setup
   lfsmake2 libdnet
   lfsmake2 rust
@@ -1411,7 +1408,6 @@ buildipfire() {
   lfsmake2 chkconfig
   lfsmake2 postfix
   lfsmake2 fetchmail
-  lfsmake2 cyrus-imapd
   lfsmake2 clamav
   lfsmake2 perl-NetAddr-IP
   lfsmake2 spamassassin
@@ -1482,8 +1478,6 @@ buildipfire() {
   lfsmake2 vdr_dvbapi
   lfsmake2 vdr_eepg
   lfsmake2 w_scan
-  lfsmake2 icecast
-  lfsmake2 icegenerator
   lfsmake2 mpd
   lfsmake2 libmpdclient
   lfsmake2 mpc
@@ -1511,7 +1505,6 @@ buildipfire() {
   lfsmake2 iperf3
   lfsmake2 7zip
   lfsmake2 lynis
-  lfsmake2 streamripper
   lfsmake2 sshfs
   lfsmake2 taglib
   lfsmake2 sslh
@@ -1541,7 +1534,6 @@ buildipfire() {
   lfsmake2 parted
   lfsmake2 swig
   lfsmake2 u-boot
-  lfsmake2 u-boot-kirkwood
   lfsmake2 u-boot-friendlyarm
   lfsmake2 python-typing
   lfsmake2 python-m2crypto
@@ -1619,7 +1611,6 @@ buildipfire() {
   lfsmake2 frr
   lfsmake2 dmidecode
   lfsmake2 mcelog
-  lfsmake2 rtpproxy
   lfsmake2 util-macros
   lfsmake2 libpciaccess
   lfsmake2 libyajl