Merge remote-tracking branch 'origin/master' into next

[people/mlorenz/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index b0a4b89268939f8cf964848aee7ae84261e5eb17..e74156156a1ad2a84e8a36d555f7f61aba1f9fc7 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -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="178"                                                     # Core Level (Filename)
+CORE="179"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 MAX_RETRIES=1                                                  # prefetch/check loop
@@ -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
 
@@ -1132,17 +1132,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 linux-initrd                KCFG=""
-
   lfsmake2 expat
   lfsmake2 libconfig
   lfsmake2 curl
@@ -1708,6 +1697,16 @@ buildipfire() {
   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() {