[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 178c7a6adc97fbbb436ca142734c70152e43b4b5

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 178c7a6adc97fbbb436ca142734c70152e43b4b5

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3532 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  178c7a6adc97fbbb436ca142734c70152e43b4b5 (commit)
       via  df490025fee29fb776c06598e20ae8de987b3e9c (commit)
      from  fe74afee4c3d7f3c6a26b543d9f385a502b5fbbe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 178c7a6adc97fbbb436ca142734c70152e43b4b5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Feb 8 10:56:33 2021 -0500

    toolchain: Build libxcrypt earlier because gcc depends on it
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit df490025fee29fb776c06598e20ae8de987b3e9c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Feb 8 16:33:24 2021 +0000

    qemu: Enable riscv64 targets
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/packages/qemu |  2 ++
 lfs/qemu                       | 14 ++++++++++++--
 make.sh                        |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index ee4b9f736..3792e7479 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -9,9 +9,11 @@ usr/bin/qemu-img
 usr/bin/qemu-io
 usr/bin/qemu-nbd
 usr/bin/qemu-pr-helper
+usr/bin/qemu-riscv64
 usr/bin/qemu-storage-daemon
 usr/bin/qemu-system-arm
 usr/bin/qemu-system-i386
+usr/bin/qemu-system-riscv64
 usr/bin/qemu-system-x86_64
 usr/bin/qemu-x86_64
 usr/libexec/qemu-bridge-helper
diff --git a/lfs/qemu b/lfs/qemu
index 2ab1bf8c0..aa09fa0ca 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -33,10 +33,20 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586 x86_64
 PROG       = qemu
-PAK_VER    = 29
+PAK_VER    = 30
 
 DEPS       = libusbredir spice libseccomp
 
+TARGETS    = \
+	i386-linux-user \
+	x86_64-linux-user \
+	arm-linux-user \
+	riscv64-linux-user \
+	i386-softmmu \
+	x86_64-softmmu \
+	arm-softmmu \
+	riscv64-softmmu
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -84,7 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--localstatedir=/var \
 		--enable-kvm \
 		--disable-attr \
-		--target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \
+		--target-list="$(TARGETS)" \
 		--extra-cflags="$(CFLAGS)" \
 		--enable-spice \
 		--enable-usb-redir \
diff --git a/make.sh b/make.sh
index 164fd7c72..3c94509d3 100755
--- a/make.sh
+++ b/make.sh
@@ -1027,11 +1027,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


hooks/post-receive
--
IPFire 2.x development tree