X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=make.sh;h=cdf5bbed7eadeea898a46a72aa9c00b538f3a6de;hb=HEAD;hp=e5540c0f4e369c64e4fc0b53966efed62ddb9c3b;hpb=e6453de73e46741ed947dea92ff20b8a5aa1f023;p=ipfire-2.x.git

diff --git a/make.sh b/make.sh
index e5540c0f4e..a4ba093266 100755
--- a/make.sh
+++ b/make.sh
@@ -22,8 +22,8 @@
 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="181"							# Core Level (Filename)
+VERSION="2.29"							# Version number
+CORE="186"							# 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=20230731
+TOOLCHAINVER=20240210
 
 # use multicore and max compression
 ZSTD_OPT="-T0 --ultra -22"
@@ -182,9 +182,9 @@ configure_build() {
 	TOOLS_DIR="/tools_${BUILD_ARCH}"
 
 	# Enables hardening
-	HARDENING_CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection"
+	HARDENING_CFLAGS="-Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection"
 
-	CFLAGS="-O2 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}"
+	CFLAGS="-O2 -g0 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}"
 	CXXFLAGS="${CFLAGS}"
 
 	RUSTFLAGS="-Copt-level=3 -Clink-arg=-Wl,-z,relro,-z,now -Ccodegen-units=1 --cap-lints=warn ${RUSTFLAGS_ARCH}"
@@ -1103,24 +1103,19 @@ 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 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
@@ -1145,8 +1140,16 @@ buildipfire() {
   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
@@ -1166,7 +1169,6 @@ buildipfire() {
   lfsmake2 boost
   lfsmake2 linux-atm
   lfsmake2 libqmi
-  lfsmake2 pam
   lfsmake2 c-ares
   lfsmake2 rust-dissimilar
   lfsmake2 rust-cfg-if
@@ -1292,8 +1294,6 @@ buildipfire() {
   lfsmake2 slang
   lfsmake2 newt
   lfsmake2 libsmooth
-  lfsmake2 libcap
-  lfsmake2 libcap-ng
   lfsmake2 pciutils
   lfsmake2 usbutils
   lfsmake2 libxml2
@@ -1377,6 +1377,10 @@ buildipfire() {
   lfsmake2 perl-Crypt-PasswdMD5
   lfsmake2 perl-Net-Telnet
   lfsmake2 perl-JSON
+  lfsmake2 perl-Capture-Tiny
+  lfsmake2 perl-Config-AutoConf
+  lfsmake2 perl-Object-Tiny
+  lfsmake2 perl-Archive-Peek-Libarchive
   lfsmake2 python3-inotify
   lfsmake2 python3-docutils
   lfsmake2 python3-daemon
@@ -1500,7 +1504,6 @@ buildipfire() {
   lfsmake2 netsnmpd
   lfsmake2 nagios_nrpe
   lfsmake2 nagios-plugins
-  lfsmake2 icinga
   lfsmake2 observium-agent
   lfsmake2 ebtables
   lfsmake2 faad2
@@ -1538,7 +1541,6 @@ buildipfire() {
   lfsmake2 lynis
   lfsmake2 sshfs
   lfsmake2 taglib
-  lfsmake2 sslh
   lfsmake2 perl-gettext
   lfsmake2 perl-Sort-Naturally
   lfsmake2 vdradmin
@@ -1595,6 +1597,14 @@ buildipfire() {
   lfsmake2 python3-terminaltables
   lfsmake2 python3-pkgconfig
   lfsmake2 python3-msgpack
+  lfsmake2 python3-editables
+  lfsmake2 python3-pathspec
+  lfsmake2 python3-pluggy
+  lfsmake2 python3-calver
+  lfsmake2 python3-trove-classifiers
+  lfsmake2 python3-hatchling
+  lfsmake2 python3-hatch-vcs
+  lfsmake2 python3-hatch-fancy-pypi-readme
   lfsmake2 python3-attrs
   lfsmake2 python3-sniffio
   lfsmake2 python3-sortedcontainers
@@ -1648,6 +1658,9 @@ buildipfire() {
   lfsmake2 dnsdist
   lfsmake2 bird
   lfsmake2 libyang
+  lfsmake2 abseil-cpp
+  lfsmake2 protobuf
+  lfsmake2 protobuf-c
   lfsmake2 frr
   lfsmake2 dmidecode
   lfsmake2 mcelog
@@ -1699,15 +1712,16 @@ buildipfire() {
   lfsmake2 perl-MIME-Base32
   lfsmake2 perl-URI-Encode
   lfsmake2 rsnapshot
+  lfsmake2 mympd
+  lfsmake2 wsdd
+  lfsmake2 btrfs-progs
+  lfsmake2 inotify-tools
+  lfsmake2 grub-btrfs
 
   # 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=""
 }