X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=0c124ac81a6a2eff57f2f0bef22ce563099dbd73;hb=4b63a0322dad81b852583f603760006cd3fa408c;hp=164fd7c729e56483de8fc74a26da8d7222d8ff37;hpb=cf6c8e67fbbcbd465748055992d4c0af83697884;p=ipfire-2.x.git

diff --git a/make.sh b/make.sh
index 164fd7c729..0c124ac81a 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="155"							# Core Level (Filename)
+CORE="156"							# Core Level (Filename)
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
 MAX_RETRIES=1							# prefetch/check loop
@@ -177,6 +177,13 @@ configure_build() {
 			RUSTFLAGS="-Ccodegen-units=1"
 			;;
 
+		riscv64)
+			BUILDTARGET="${build_arch}-unknown-linux-gnu"
+			CROSSTARGET="${build_arch}-cross-linux-gnu"
+			BUILD_PLATFORM="riscv"
+			CFLAGS_ARCH="-fstack-clash-protection"
+			;;
+
 		*)
 			exiterror "Cannot build for architure ${build_arch}"
 			;;
@@ -264,6 +271,10 @@ configure_build_guess() {
 			echo "armv5tel"
 			;;
 
+		riscv64)
+			echo "riscv64"
+			;;
+
 		*)
 			exiterror "Cannot guess build architecture"
 			;;
@@ -801,7 +812,7 @@ qemu_is_required() {
 	fi
 
 	case "${HOST_ARCH},${build_arch}" in
-		x86_64,arm*|x86_64,aarch64|i?86,arm*|i?86,aarch64|i?86,x86_64)
+		x86_64,arm*|x86_64,aarch64|x86_64,riscv64|i?86,arm*|i?86,aarch64|i?86,x86_64)
 			return 0
 			;;
 		*)
@@ -865,6 +876,9 @@ qemu_find_build_helper_name() {
 		arm*)
 			magic="7f454c4601010100000000000000000002002800"
 			;;
+		riscv64)
+			magic="7f454c460201010000000000000000000200f300"
+			;;
 		x86_64)
 			magic="7f454c4602010100000000000000000002003e00"
 			;;
@@ -1027,11 +1041,11 @@ buildtoolchain() {
 	lfsmake1 gcc			PASS=1
 	lfsmake1 linux			KCFG="-headers"
 	lfsmake1 glibc
+	lfsmake1 libxcrypt
 	lfsmake1 gcc			PASS=L
 	lfsmake1 binutils			PASS=2
 	lfsmake1 gcc			PASS=2
 	lfsmake1 zlib
-	lfsmake1 libxcrypt
 	lfsmake1 ccache			PASS=2
 	lfsmake1 tcl
 	lfsmake1 expect
@@ -1080,7 +1094,6 @@ buildbase() {
 	lfsmake2 libtool
 	lfsmake2 binutils
 	lfsmake2 gmp
-	lfsmake2 gmp-compat
 	lfsmake2 mpfr
 	lfsmake2 libmpc
 	lfsmake2 libxcrypt
@@ -1088,7 +1101,6 @@ buildbase() {
 	lfsmake2 gcc
 	lfsmake2 sed
 	lfsmake2 berkeley
-	lfsmake2 berkeley-compat
 	lfsmake2 coreutils
 	lfsmake2 iana-etc
 	lfsmake2 m4
@@ -1096,18 +1108,16 @@ buildbase() {
 	lfsmake2 ncurses
 	lfsmake2 perl
 	lfsmake2 readline
-	lfsmake2 readline-compat
 	lfsmake2 bzip2
 	lfsmake2 xz
 	lfsmake2 lzip
 	lfsmake2 pcre
-	lfsmake2 pcre-compat
+	lfsmake2 pcre2
 	lfsmake2 gettext
 	lfsmake2 attr
 	lfsmake2 acl
 	lfsmake2 bash
 	lfsmake2 diffutils
-	lfsmake2 e2fsprogs
 	lfsmake2 ed
 	lfsmake2 findutils
 	lfsmake2 flex
@@ -1136,6 +1146,7 @@ buildbase() {
 	lfsmake2 texinfo
 	lfsmake2 util-linux
 	lfsmake2 vim
+	lfsmake2 e2fsprogs
 }
 
 buildipfire() {
@@ -1145,7 +1156,6 @@ buildipfire() {
   lfsmake2 initscripts
   lfsmake2 backup
   lfsmake2 openssl
-  [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
   lfsmake2 kmod
   lfsmake2 udev
   lfsmake2 popt
@@ -1259,7 +1269,6 @@ buildipfire() {
   lfsmake2 ninja
   lfsmake2 meson
   lfsmake2 libjpeg
-  lfsmake2 libjpeg-compat
   lfsmake2 openjpeg
   lfsmake2 libexif
   lfsmake2 libpng
@@ -1552,9 +1561,7 @@ buildipfire() {
   lfsmake2 python-distutils-extra
   lfsmake2 python-lzma
   lfsmake2 python-progressbar
-  lfsmake2 python-xattr
   lfsmake2 ddns
-  lfsmake2 python3-setuptools
   lfsmake2 python3-setuptools-scm
   lfsmake2 python3-six
   lfsmake2 python3-dateutil
@@ -1817,9 +1824,9 @@ clean)
 	for i in `mount | grep $BASEDIR | sed 's/^.*loop=\(.*\))/\1/'`; do
 		$LOSETUP -d $i 2>/dev/null
 	done
-	for i in `mount | grep $BASEDIR | cut -d " " -f 1`; do
-		umount $i
-	done
+	#for i in `mount | grep $BASEDIR | cut -d " " -f 1`; do
+	#	umount $i
+	#done
 	stdumount
 	for i in `seq 0 7`; do
 		if ( losetup /dev/loop${i} 2>/dev/null | grep -q "/install/images" ); then
@@ -1979,7 +1986,7 @@ lang)
 	$BASEDIR/tools/check_strings.pl de > $BASEDIR/doc/language_issues.de
 	$BASEDIR/tools/check_strings.pl fr > $BASEDIR/doc/language_issues.fr
 	$BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.es
-	$BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.pl
+	$BASEDIR/tools/check_strings.pl pl > $BASEDIR/doc/language_issues.pl
 	$BASEDIR/tools/check_strings.pl ru > $BASEDIR/doc/language_issues.ru
 	$BASEDIR/tools/check_strings.pl nl > $BASEDIR/doc/language_issues.nl
 	$BASEDIR/tools/check_strings.pl tr > $BASEDIR/doc/language_issues.tr