* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 199ac34d56980b8baf42f23f4b0447986e2d5764
@ 2024-09-03 18:45 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2024-09-03 18:45 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7877 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 199ac34d56980b8baf42f23f4b0447986e2d5764 (commit)
via 0dbab7806670583f7fd1427bd0921227104e3e17 (commit)
via a54da99100ebb067490042a9aad1fcd3a86a98a7 (commit)
via a50bd44c440efd126175d08db57e4274abdb5316 (commit)
from 4ac5f13f1e5358ceddc83343c52738ea73c40f9a (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 199ac34d56980b8baf42f23f4b0447986e2d5764
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Tue Sep 3 19:55:42 2024 +0200
qemu-ga: Update to version 9.0.0
- Follow the qemu update version
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0dbab7806670583f7fd1427bd0921227104e3e17
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Tue Sep 3 19:55:41 2024 +0200
qemu: Update to version 9.0.0
- Update from version 8.1.2 to 9.0.0
- Update of rootfile
- Version 9.0.1 and 9.0.2 no longer have the bundled dtc package to provide the libfdt
library and require a system version but identify the 1.7.1 version of dtc as being
older than 1.5.1. So currently qemu has only been updated to 9.0.0 until the reason
for this is identified and can be fixed. It has been raised as an issue on the qemu
gitlab site.
- Changelog is only available at x.0 level
9.0 https://wiki.qemu.org/ChangeLog/9.0
8.2 https://wiki.qemu.org/ChangeLog/8.2
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a54da99100ebb067490042a9aad1fcd3a86a98a7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Sep 3 18:42:41 2024 +0000
make.sh: Require at least 8 GiB of space for the build
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a50bd44c440efd126175d08db57e4274abdb5316
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Sep 3 18:42:25 2024 +0000
make.sh: Subtract any used space for the space check
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/qemu | 5 +----
lfs/qemu | 10 +++-------
lfs/qemu-ga | 6 +++---
make.sh | 15 ++++++++++++---
4 files changed, 19 insertions(+), 17 deletions(-)
Difference in files:
diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index efc0cbd2e..b4c3a752d 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -2,10 +2,8 @@ lib/udev/rules.d/65-kvm.rules
usr/bin/elf2dmp
usr/bin/qemu
usr/bin/qemu-aarch64
-usr/bin/qemu-arm
usr/bin/qemu-edid
#usr/bin/qemu-ga
-usr/bin/qemu-i386
usr/bin/qemu-img
usr/bin/qemu-io
usr/bin/qemu-nbd
@@ -13,8 +11,6 @@ usr/bin/qemu-pr-helper
usr/bin/qemu-riscv64
usr/bin/qemu-storage-daemon
usr/bin/qemu-system-aarch64
-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
@@ -77,6 +73,7 @@ usr/share/qemu/firmware/60-edk2-arm.json
usr/share/qemu/firmware/60-edk2-i386.json
usr/share/qemu/firmware/60-edk2-x86_64.json
#usr/share/qemu/hppa-firmware.img
+#usr/share/qemu/hppa-firmware64.img
usr/share/qemu/keymaps
usr/share/qemu/keymaps/ar
usr/share/qemu/keymaps/bepo
diff --git a/lfs/qemu b/lfs/qemu
index d65282743..caa7c1bc2 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -27,7 +27,7 @@ include Config
SUMMARY = Machine emulator and virtualizer
# If you update the version also qemu-ga !!!
-VER = 8.1.2
+VER = 9.0.0
THISAPP = qemu-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -35,21 +35,17 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = qemu
-PAK_VER = 42
+PAK_VER = 43
DEPS = alsa libusbredir spice libseccomp libslirp
SERVICES =
TARGETS = \
- i386-linux-user \
x86_64-linux-user \
- arm-linux-user \
aarch64-linux-user \
riscv64-linux-user \
- i386-softmmu \
x86_64-softmmu \
- arm-softmmu \
aarch64-softmmu \
riscv64-softmmu
@@ -61,7 +57,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8f48638cd1f0285356aae2d14862f56cc79da09bb9ff9f09e90221fdca851e9c3f8a3d940039f578d24d0b4435baf19cb52a3e927e97bf978ea674d148ecd746
+$(DL_FILE)_BLAKE2 = d92acb859d9ce5097fee27a4689c71869aa38f65eb0308547956d54bd8caf29efe5389d9009f334f109ad228e0ef1f1fd1444d26360f03fac4320b204b657081
install : $(TARGET)
diff --git a/lfs/qemu-ga b/lfs/qemu-ga
index ff85ca1cc..00ca8c0a0 100644
--- a/lfs/qemu-ga
+++ b/lfs/qemu-ga
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2024 IPFire Team <info(a)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 #
@@ -26,11 +26,11 @@ include Config
SUMMARY = Guest agent for QEMU
-VER = 8.1.2
+VER = 9.0.0
THISAPP = qemu-ga-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = qemu-ga
-PAK_VER = 7
+PAK_VER = 8
DEPS =
diff --git a/make.sh b/make.sh
index 966e5bc2e..9b2e0ee70 100755
--- a/make.sh
+++ b/make.sh
@@ -378,6 +378,7 @@ prepareenv() {
# Do we need to check the required space?
if [ -n "${required_space}" ]; then
local free_space free_blocks block_size
+ local consumed_space path
# Fetch free blocks
read -r free_blocks block_size <<< "$(stat --file-system --format="%a %S" "${BASEDIR}")"
@@ -385,9 +386,17 @@ prepareenv() {
# Calculate free space
(( free_space = free_blocks * block_size / 1024 / 1024 ))
- # Check if we have at least 4GB of space
+ # If we don't have the total space free, we need to check how much we have consumed already...
if [ "${free_space}" -lt "${required_space}" ]; then
- exiterror "Not enough temporary space available, need at least ${required_space}MiB"
+ # Add any consumed space
+ while read -r consumed_space path; do
+ (( free_space += consumed_space / 1024 / 1024 ))
+ done <<< "$(du --summarize --bytes "${BUILD_DIR}" "${IMAGES_DIR}" "${LOG_DIR}")"
+ fi
+
+ # Check that we have the required space
+ if [ "${free_space}" -lt "${required_space}" ]; then
+ exiterror "Not enough temporary space available, need at least ${required_space}MiB, but only have ${free_space}MiB"
fi
fi
@@ -2464,7 +2473,7 @@ build)
exec_in_namespace "$@"
# Prepare the environment
- prepareenv --required-space=2048
+ prepareenv --required-space=8192
# Check if the toolchain is available
if [ ! -e "${BUILD_DIR}${TOOLS_DIR}/.toolchain-successful" ]; then
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-09-03 18:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-03 18:45 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 199ac34d56980b8baf42f23f4b0447986e2d5764 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox