X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=1c08af6e3840d7381349fce1eb84278b165c68a1;hb=8630c5ab67fe0db0a95e4933b50780545926f7c1;hp=e17d0487c8f77e764305c14f56be580fc3092c74;hpb=d338e55ce5b766f579b38f8df355957fcff6799f;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/make.sh b/make.sh
index e17d0487c8..1c08af6e38 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="157"							# 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"
 			;;
@@ -1104,7 +1118,6 @@ buildbase() {
 	lfsmake2 acl
 	lfsmake2 bash
 	lfsmake2 diffutils
-	lfsmake2 e2fsprogs
 	lfsmake2 ed
 	lfsmake2 findutils
 	lfsmake2 flex
@@ -1133,6 +1146,7 @@ buildbase() {
 	lfsmake2 texinfo
 	lfsmake2 util-linux
 	lfsmake2 vim
+	lfsmake2 e2fsprogs
 }
 
 buildipfire() {
@@ -1182,20 +1196,12 @@ buildipfire() {
   case "${BUILD_ARCH}" in
 	x86_64|aarch64)
 		lfsmake2 linux			KCFG=""
-#		lfsmake2 backports			KCFG=""
-#		lfsmake2 e1000e			KCFG=""
-#		lfsmake2 igb				KCFG=""
-#		lfsmake2 ixgbe			KCFG=""
 		lfsmake2 xtables-addons		KCFG=""
 		lfsmake2 linux-initrd			KCFG=""
 		;;
 	i586)
 		# x86 kernel build
 		lfsmake2 linux			KCFG=""
-#		lfsmake2 backports			KCFG=""
-#		lfsmake2 e1000e			KCFG=""
-#		lfsmake2 igb				KCFG=""
-#		lfsmake2 ixgbe			KCFG=""
 		lfsmake2 xtables-addons		KCFG=""
 		lfsmake2 linux-initrd			KCFG=""
 		;;
@@ -1203,10 +1209,6 @@ buildipfire() {
 	armv5tel)
 		# arm multi platform (Panda, Wandboard ...) kernel build
 		lfsmake2 linux			KCFG="-multi"
-#		lfsmake2 backports			KCFG="-multi"
-#		lfsmake2 e1000e			KCFG="-multi"
-#		lfsmake2 igb				KCFG="-multi"
-#		lfsmake2 ixgbe			KCFG="-multi"
 		lfsmake2 xtables-addons		KCFG="-multi"
 		lfsmake2 linux-initrd			KCFG="-multi"
 		;;
@@ -1300,7 +1302,6 @@ buildipfire() {
   lfsmake2 gnupg
   lfsmake2 hdparm
   lfsmake2 sdparm
-  lfsmake2 mtools
   lfsmake2 whatmask
   lfsmake2 libtirpc
   lfsmake2 conntrack-tools
@@ -1333,6 +1334,7 @@ buildipfire() {
   lfsmake2 Mail-Tools
   lfsmake2 MIME-Tools
   lfsmake2 Net-Server
+  lfsmake2 Canary-Stability
   lfsmake2 Convert-TNEF
   lfsmake2 Convert-UUlib
   lfsmake2 Archive-Tar
@@ -1496,8 +1498,6 @@ buildipfire() {
   lfsmake2 iw
   lfsmake2 wpa_supplicant
   lfsmake2 hostapd
-  lfsmake2 pycurl
-  lfsmake2 urlgrabber
   lfsmake2 syslinux
   lfsmake2 tftpd
   lfsmake2 cpufrequtils
@@ -1545,10 +1545,7 @@ buildipfire() {
   lfsmake2 crda
   lfsmake2 libsolv
   lfsmake2 python-distutils-extra
-  lfsmake2 python-lzma
-  lfsmake2 python-progressbar
   lfsmake2 ddns
-  lfsmake2 python3-setuptools
   lfsmake2 python3-setuptools-scm
   lfsmake2 python3-six
   lfsmake2 python3-dateutil
@@ -1561,7 +1558,6 @@ buildipfire() {
   lfsmake2 python3-pyasn1
   lfsmake2 python3-urllib3
   lfsmake2 python3-botocore
-  lfsmake2 python3-llfuse
   lfsmake2 python3-msgpack
   lfsmake2 aws-cli
   lfsmake2 transmission
@@ -1573,9 +1569,6 @@ buildipfire() {
   lfsmake2 fping
   lfsmake2 telnet
   lfsmake2 xinetd
-  lfsmake2 gpgme
-  lfsmake2 pygpgme
-  lfsmake2 pakfire3
   lfsmake2 stress
   lfsmake2 libstatgrab
   lfsmake2 sarg
@@ -1973,7 +1966,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