X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=d5d194cc8f99f015efde6ba8c5bbff25d720d122;hb=bde13ed56b1226e2cc39179c495ca06b5161670d;hp=68277b09bf9cfda4c08644fd3ff48fba398c5906;hpb=fa94326f5d826c8d8cb92ca75f61e3588acd632f;p=ipfire-2.x.git

diff --git a/make.sh b/make.sh
index 68277b09bf..d5d194cc8f 100755
--- a/make.sh
+++ b/make.sh
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -23,7 +23,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.27"							# Version number
-CORE="174"							# Core Level (Filename)
+CORE="182"							# Core Level (Filename)
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
 MAX_RETRIES=1							# prefetch/check loop
@@ -35,7 +35,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=20230210
+TOOLCHAINVER=20230731
 
 # use multicore and max compression
 ZSTD_OPT="-T0 --ultra -22"
@@ -145,14 +145,14 @@ configure_build() {
 			BUILDTARGET="${build_arch}-pc-linux-gnu"
 			CROSSTARGET="${build_arch}-cross-linux-gnu"
 			BUILD_PLATFORM="x86"
-			CFLAGS_ARCH="-m64 -mtune=generic -fcf-protection"
+			CFLAGS_ARCH="-m64 -mtune=generic -fcf-protection=full"
 			;;
 
 		aarch64)
 			BUILDTARGET="${build_arch}-pc-linux-gnu"
 			CROSSTARGET="${build_arch}-cross-linux-gnu"
 			BUILD_PLATFORM="arm"
-			CFLAGS_ARCH=""
+			CFLAGS_ARCH="-mbranch-protection=standard"
 			;;
 
 		riscv64)
@@ -767,8 +767,8 @@ qemu_environ() {
 			;;
 		riscv64)
 			QEMU_CPU="${QEMU_CPU:-sifive-u54}"
-
-			env="${env} QEMU_CPU=${QEMU_CPU}"
+			G_SLICE="always-malloc"
+			env="${env} QEMU_CPU=${QEMU_CPU} G_SLICE=${G_SLICE}"
 			;;
 	esac
 
@@ -1031,6 +1031,7 @@ buildbase() {
 	lfsmake2 tzdata
 	lfsmake2 cleanup-toolchain
 	lfsmake2 zlib
+	[ "${BUILD_ARCH}" = "riscv64" ] && lfsmake2 gcc PASS=A
 	lfsmake2 zstd
 	lfsmake2 autoconf
 	lfsmake2 automake
@@ -1102,31 +1103,20 @@ buildipfire() {
   lfsmake2 backup
   lfsmake2 rust
   lfsmake2 openssl
-  lfsmake2 kmod
-  lfsmake2 udev
   lfsmake2 popt
   lfsmake2 libedit
-  lfsmake2 libusb
+  lfsmake2 pam
+  lfsmake2 libcap
+  lfsmake2 libcap-ng
   lfsmake2 libpcap
   lfsmake2 ppp
   lfsmake2 pptp
   lfsmake2 unzip
   lfsmake2 which
-  lfsmake2 linux-firmware
-  lfsmake2 dvb-firmwares
-  lfsmake2 xr819-firmware
-  lfsmake2 zd1211-firmware
-  lfsmake2 rpi-firmware
-  lfsmake2 intel-microcode
-  lfsmake2 pcengines-apu-firmware
   lfsmake2 bc
   lfsmake2 u-boot MKIMAGE=1
   lfsmake2 cpio
-  lfsmake2 mdadm
-  lfsmake2 dracut
   lfsmake2 libaio
-  lfsmake2 lvm2
-  lfsmake2 multipath-tools
   lfsmake2 freetype
   lfsmake2 libmnl
   lfsmake2 libnfnetlink
@@ -1138,18 +1128,6 @@ buildipfire() {
   lfsmake2 iproute2
   lfsmake2 screen
   lfsmake2 elfutils
-
-  # Kernelbuild ... current we have no platform that need
-  # multi kernel builds so KCFG is empty
-  lfsmake2 linux		KCFG=""
-  lfsmake2 rtl8189es		KCFG=""
-  lfsmake2 rtl8189fs		KCFG=""
-  lfsmake2 rtl8812au		KCFG=""
-  lfsmake2 rtl8822bu		KCFG=""
-  lfsmake2 rtl8821cu		KCFG=""
-  lfsmake2 xradio		KCFG=""
-  lfsmake2 linux-initrd		KCFG=""
-
   lfsmake2 expat
   lfsmake2 libconfig
   lfsmake2 curl
@@ -1162,8 +1140,17 @@ buildipfire() {
   lfsmake2 sqlite
   lfsmake2 python3
   lfsmake2 python3-setuptools
+  lfsmake2 python3-MarkupSafe
+  lfsmake2 python3-Jinja2
   lfsmake2 ninja
   lfsmake2 meson
+  lfsmake2 kmod
+  lfsmake2 udev
+  lfsmake2 libusb
+  lfsmake2 mdadm
+  lfsmake2 dracut
+  lfsmake2 lvm2
+  lfsmake2 multipath-tools
   lfsmake2 glib
   lfsmake2 libgudev
   lfsmake2 libgpg-error
@@ -1183,7 +1170,6 @@ buildipfire() {
   lfsmake2 boost
   lfsmake2 linux-atm
   lfsmake2 libqmi
-  lfsmake2 pam
   lfsmake2 c-ares
   lfsmake2 rust-dissimilar
   lfsmake2 rust-cfg-if
@@ -1309,8 +1295,6 @@ buildipfire() {
   lfsmake2 slang
   lfsmake2 newt
   lfsmake2 libsmooth
-  lfsmake2 libcap
-  lfsmake2 libcap-ng
   lfsmake2 pciutils
   lfsmake2 usbutils
   lfsmake2 libxml2
@@ -1472,7 +1456,6 @@ buildipfire() {
   lfsmake2 libvorbis
   lfsmake2 flac
   lfsmake2 lame
-  lfsmake2 sox
   lfsmake2 soxr
   lfsmake2 libshout
   lfsmake2 xvid
@@ -1495,6 +1478,13 @@ buildipfire() {
   lfsmake2 libstatgrab
   lfsmake2 liboping
   lfsmake2 collectd
+  lfsmake2 git
+  lfsmake2 linux-firmware
+  lfsmake2 dvb-firmwares
+  lfsmake2 zd1211-firmware
+  lfsmake2 rpi-firmware
+  lfsmake2 intel-microcode
+  lfsmake2 pcengines-apu-firmware
   lfsmake2 elinks
   lfsmake2 igmpproxy
   lfsmake2 opus
@@ -1506,6 +1496,7 @@ buildipfire() {
   lfsmake2 sdl2
   lfsmake2 libusbredir
   lfsmake2 libseccomp
+  lfsmake2 libslirp
   lfsmake2 qemu
   lfsmake2 netsnmpd
   lfsmake2 nagios_nrpe
@@ -1532,8 +1523,6 @@ buildipfire() {
   lfsmake2 perl-Authen-SASL
   lfsmake2 perl-MIME-Lite
   lfsmake2 perl-Email-Date-Format
-  lfsmake2 git
-  lfsmake2 squidclamav
   lfsmake2 vnstat
   lfsmake2 iw
   lfsmake2 wpa_supplicant
@@ -1567,7 +1556,6 @@ buildipfire() {
   lfsmake2 zerofree
   lfsmake2 minicom
   lfsmake2 ddrescue
-  lfsmake2 powertop
   lfsmake2 parted
   lfsmake2 swig
   lfsmake2 dtc
@@ -1608,12 +1596,13 @@ buildipfire() {
   lfsmake2 python3-terminaltables
   lfsmake2 python3-pkgconfig
   lfsmake2 python3-msgpack
-  lfsmake2 python3-attr
   lfsmake2 python3-attrs
   lfsmake2 python3-sniffio
   lfsmake2 python3-sortedcontainers
   lfsmake2 python3-outcome
   lfsmake2 python3-async_generator
+  lfsmake2 python3-flit_scm
+  lfsmake2 python3-exceptiongroup
   lfsmake2 python3-trio
   lfsmake2 python3-pyfuse3
   lfsmake2 aws-cli
@@ -1710,6 +1699,17 @@ buildipfire() {
   lfsmake2 perl-Imager-QRCode
   lfsmake2 perl-MIME-Base32
   lfsmake2 perl-URI-Encode
+  lfsmake2 rsnapshot
+
+  # Kernelbuild ... current we have no platform that need
+  # multi kernel builds so KCFG is empty
+  lfsmake2 linux		KCFG=""
+  lfsmake2 rtl8189es		KCFG=""
+  lfsmake2 rtl8189fs		KCFG=""
+  lfsmake2 rtl8812au		KCFG=""
+  lfsmake2 rtl8822bu		KCFG=""
+  lfsmake2 rtl8821cu		KCFG=""
+  lfsmake2 linux-initrd		KCFG=""
 }
 
 buildinstaller() {