X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=2e54cec28af4687f682abad5ac1c627fc767c772;hb=63eacedabc44cd0b6d2a702f8f2da6fcb17f440c;hp=43c5921e48a92c3388bbe552e9c684f2cf70f04f;hpb=36065e4219389acd23a9ba06576075f0740cd307;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/make.sh b/make.sh
index 43c5921e48..2e54cec28a 100755
--- 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="143"							# Core Level (Filename)
+CORE="147"							# Core Level (Filename)
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
 NICE=10								# Nice level
@@ -39,7 +39,7 @@ GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"			# Git Branch
 GIT_TAG="$(git tag | tail -1)"					# Git Tag
 GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)"			# Last commit
 
-TOOLCHAINVER=20200108
+TOOLCHAINVER=20200324
 
 ###############################################################################
 #
@@ -285,6 +285,7 @@ stdumount() {
 	umount $BASEDIR/build/usr/src/log		2>/dev/null;
 	umount $BASEDIR/build/usr/src/src		2>/dev/null;
 	umount $BASEDIR/build/usr/src		2>/dev/null;
+	umount $BASEDIR/build/tmp		2>/dev/null;
 }
 
 now() {
@@ -1083,6 +1084,7 @@ buildbase() {
 	lfsmake2 autoconf
 	lfsmake2 automake
 	lfsmake2 berkeley
+	lfsmake2 berkeley-compat
 	lfsmake2 coreutils
 	lfsmake2 iana-etc
 	lfsmake2 m4
@@ -1105,6 +1107,7 @@ buildbase() {
 	lfsmake2 flex
 	lfsmake2 gawk
 	lfsmake2 gettext
+	lfsmake2 go
 	lfsmake2 grep
 	lfsmake2 groff
 	lfsmake2 gperf
@@ -1185,15 +1188,6 @@ buildipfire() {
 		lfsmake2 linux-initrd			KCFG=""
 		;;
 	i586)
-		# x86-pae (Native and new XEN) kernel build
-		lfsmake2 linux			KCFG="-pae"
-#		lfsmake2 backports			KCFG="-pae"
-#		lfsmake2 e1000e			KCFG="-pae"
-#		lfsmake2 igb				KCFG="-pae"
-#		lfsmake2 ixgbe			KCFG="-pae"
-		lfsmake2 xtables-addons		KCFG="-pae"
-		lfsmake2 linux-initrd			KCFG="-pae"
-
 		# x86 kernel build
 		lfsmake2 linux			KCFG=""
 #		lfsmake2 backports			KCFG=""
@@ -1252,6 +1246,8 @@ buildipfire() {
   lfsmake2 libnl-3
   lfsmake2 libidn
   lfsmake2 nasm
+  lfsmake2 libarchive
+  lfsmake2 cmake
   lfsmake2 libjpeg
   lfsmake2 libjpeg-compat
   lfsmake2 libexif
@@ -1280,8 +1276,6 @@ buildipfire() {
   lfsmake2 bootstrap
   lfsmake2 arping
   lfsmake2 beep
-  lfsmake2 libarchive
-  lfsmake2 cmake
   lfsmake2 libssh
   lfsmake2 cdrkit
   lfsmake2 dosfstools
@@ -1405,6 +1399,7 @@ buildipfire() {
   lfsmake2 cifs-utils
   lfsmake2 krb5
   lfsmake2 samba
+  lfsmake2 netatalk
   lfsmake2 sudo
   lfsmake2 mc
   lfsmake2 wget
@@ -1520,6 +1515,7 @@ buildipfire() {
   lfsmake2 perl-DBD-SQLite
   lfsmake2 perl-File-ReadBackwards
   lfsmake2 openvmtools
+  lfsmake2 libmicrohttpd
   lfsmake2 motion
   lfsmake2 joe
   lfsmake2 monit
@@ -1694,15 +1690,12 @@ buildpackages() {
 
   ipfirepackages
 
-  lfsmake2 xen-image
-  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
-
   cd $BASEDIR
 
   # remove not useable iso on armv5tel (needed to build flash images)
   [ "${BUILD_ARCH}" = "armv5tel" ] && rm -rf *.iso
 
-  for i in `ls *.bz2 *.img.xz *.iso`; do
+  for i in $(ls *.bz2 *.img.xz *.iso 2>/dev/null); do
 	md5sum $i > $i.md5
   done
   cd $PWD
@@ -1988,8 +1981,12 @@ lang)
 update-contributors)
 	update_contributors
 	;;
+find-dependencies)
+	shift
+	exec "${BASEDIR}/tools/find-dependencies" "${BASEDIR}/build" "$@"
+	;;
 *)
-	echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors}"
+	echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors|find-dependencies}"
 	cat doc/make.sh-usage
 	;;
 esac