* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 84ad76dd670324f3b2d920ef0dce64cc69159bd6
@ 2024-12-23 16:16 Arne Fitzenreiter
0 siblings, 0 replies; only message in thread
From: Arne Fitzenreiter @ 2024-12-23 16:16 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 29456 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 84ad76dd670324f3b2d920ef0dce64cc69159bd6 (commit)
via b630334147324d5e05c38acc5b428e67f01b9f87 (commit)
via 50f8a13985fd804dc6c9a71cccbfd179ae62a732 (commit)
via 1ff1a164b58fbed161f4f4cb464f4e207ec823ac (commit)
via 3a740522afd2b02ea21798925b99c7a8823e5482 (commit)
from f3523a9d7d5577909570d654540774cd8d9ab395 (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 84ad76dd670324f3b2d920ef0dce64cc69159bd6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Dec 23 17:15:22 2024 +0100
core191: ship backup.pl
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b630334147324d5e05c38acc5b428e67f01b9f87
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Dec 20 11:04:05 2024 +0100
backup.pl: Fix Bug13799 - addon restore not working
- This fixes the existence check for the addon .ipf file from a check of existence
of a directory to a check of existence of a file.
Suggested-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Tested-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Fixes: Bug13799
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 50f8a13985fd804dc6c9a71cccbfd179ae62a732
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Dec 21 10:54:42 2024 +0000
make.sh: Explicitely check the source tarballs
The Makefiles do not automatically perform the check that I expected
them to perform when running a build. They check if the source tarballs
are all present, but they don't check whether they match the checksum.
This is only being done when "./make.sh downloadsrc" is being run.
In case of the automated builds, we explicitely run "./make.sh
downloadsrc", so I don't think that this might have introduced any
malicious source into the published builds.
Reported-by: Stephen Cuka <stephen(a)firemypi.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1ff1a164b58fbed161f4f4cb464f4e207ec823ac
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Dec 20 12:40:02 2024 +0100
libyajl: Removal of addon as no longer required by libvirt
- libyajl is no longer being used by libvirt. libvirt now uses json-c which is a core
package in IPFire. libyajl was stopped being used as it had not been updated and
is considered effectively dead upstream.
- lfs, rootfile and libyajl entry in make.sh removed.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 3a740522afd2b02ea21798925b99c7a8823e5482
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Dec 20 12:40:01 2024 +0100
libvirt: Update to version 10.10.0
- Update from version 10.7.0 to 10.10.0
- Update of rootfile
- version 10.7.0 had a change in it which meant that the script friendly output of
``virsh list --uuid`` was replaced. This change was reverted in version 10.8.0
- In version 10.8.0 libyajl was replaced by json-c for JSON parsing and formatting.
Therefore this patch set also removes libyajl from IPFire as it is no longer
required.
- Changelog
10.10.0
New features
* qemu: add multi boot device support on s390x
For classical mainframe guests (i.e. LPAR or z/VM installations), you
always have to explicitly specify the disk where you want to boot from (or
"IPL" from, in s390x-speak -- IPL means "Initial Program Load").
In the past QEMU only used the first device in the boot order to IPL from.
With the new multi boot device support on s390x that is available with QEMU
version 9.2 and newer, this limitation is lifted. If the IPL fails for the
first device with the lowest boot index, the device with the second lowest
boot index will be tried and so on until IPL is successful or there are no
remaining boot devices to try.
Limitation: The s390x BIOS will try to IPL up to 8 total devices, any
number of which may be disks or network devices.
* qemu: Add support for versioned CPU models
Updates to QEMU CPU models with -vN suffix can now be used in libvirt just
like any other CPU model.
* qemu: Support for the 'data-file' QCOW2 image feature
The QEMU hypervisor driver now supports QCOW2 images with 'data-file'
feature present (both when probing form the image itself and when specified
explicitly via ``<dataStore>`` element). This can be useful when it's
required to keep data "raw" on disk, but the use case requires features
of the QCOW2 format such as incremental backups.
* swtpm: Add support for profiles
Upcoming swtpm release will have TPM profile support that allows to
restrict a TPM's provided set of crypto algorithms and commands. Users can
now select profile by using ``<profile/>`` in their TPM XML definition.
Improvements
* qemu: Support UEFI NVRAM images on block storage
Libvirt now allows users to use block storage as backend for UEFI NVRAM
images and allows them to be in format different than the template. When
qcow2 is used as the format, the images are now also auto-populated from the
template.
* qemu: Automatically add IOMMU when needed
When domain of 'qemu' or 'kvm' type has more than 255 vCPUs IOMMU with EIM
mode is required. Starting with this release libvirt automatically adds one
(or turns on the EIM mode if there's IOMMU without it).
* ch: allow hostdevs in domain definition
The Cloud Hypervisor driver (ch) now supports ``<hostdev/>``-s.
* ch: Enable callbacks for ch domain events
The Cloud Hypervisor driver (ch) now supports emitting events on domain
define, undefine, start, boot, stop and destroy.
Bug fixes
* qemu: Fix reversion and inactive deletion of internal snapshots with UEFI
NVRAM. In `v10.9.0 (2024-11-01)`_ creation of internal snapshots of VMs
with UEFI firmware was allowed, but certain operations such as reversion
or inactive deletion didn't work properly as they didn't consider the
NVRAM qcow2 file.
* virnetdevopenvswitch: Warn on unsupported QoS settings
For OpenVSwitch vNICs libivrt does not set QoS directly using 'tc' but
offloads setting to OVS. But OVS is not as feature full as libvirt in this
regard and setting different 'peak' than 'average' results in vNIC always
sticking with 'peak'. Produce a warning if that's the case.
10.9.0
New features
* qemu: zero block detection for non-shared-storage migration
Users can now request that all-zero blocks are not transferred when migrating
non-shared disk data without actually enabling zero detection on the disk
itself. This allows sparsifying images during migration where the source
has no access to the allocation state of blocks at the cost of CPU overhead.
This feature is available via the ``--migrate-disks-detect-zeroes`` option
for ``virsh migrate`` or ``VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES``
migration parameter. See the documentation for caveats.
Improvements
* qemu: internal snapshot improvements
The qemu internal snapshot handling code was updated to use modern commands
which avoid the problems the old ones had, preventing use of internal
snapshots on VMs with UEFI NVRAM. Internal snapshots of VMs using UEFI are
now possible provided that the NVRAM is in ``qcow2`` format.
The new code also allows better control when deleting snapshots. To prevent
possible regressions no strict checking is done, but in case inconsistent
state is encountered a log message is added::
warning : qemuSnapshotActiveInternalDeleteGetDevices:3841 : inconsistent
internal snapshot state (deletion): VM='snap' snapshot='1727959843'
missing='vda ' unexpected='' extra=''
Users are encouraged to report any occurence of the above message along
with steps they took to the upstream tracker.
* qemu: improve documentation of image format settings
The documentation of the various ``*_image_format`` settings in ``qemu.conf``
imply they can only be used to control compression of the image. The
documentation has been improved to clarify the settings describe the
representation of guest memory blocks on disk, which includes compression
among other possible layouts.
* Report CPU model blockers in domain capabilities
When a CPU model is reported as usable='no' an additional
``<blockers model='...'>`` element is added for that CPU model listing
features required by the CPU model, but not supported on the host.
10.8.0
Improvements
* network: make networks with ``<forward mode='open'/>`` more useful
It is now permissable to have a ``<forward mode='open'>`` network that
has no IP address assigned to the host's port of the bridge. This
is the only way to create a libvirt network where guests are
unreachable from the host (and vice versa) and also 0 firewall
rules are added on the host.
It is now also possible for a ``<forward mode='open'/>`` network to
use the ``zone`` attribute of ``<bridge>`` to set the firewalld zone of
the bridge interface (normally it would not be set, as is done
with other forward modes).
* storage: Lessen dependancy on the ``showmount`` program
Libvirt now automatically detects presence of ``showmount`` during runtime
as we do with other helper programs and also the
``daemon-driver-storage-core`` RPM package now doesn't strongly depend on it
if the users wish for a more minimal deployment.
* Switch from YAJL to json-c for JSON parsing and formatting
The parser and formatter in the libvirt library, as well
as the parsers in the nss plugin were rewritten to use json-c
instead of YAJL, which is effectively dead upstream.
* Relax restrictions for memorytune settings
It should now be possible to use resctrl on AMD CPUs as well as Intel CPUs
when the resctrl filesystem is mounted with ``mba_MBps`` option.
Bug fixes
* virsh: Fix script-friedly output of ``virsh list --uuid``
The script-friendly output of just 1 UUID per line was mistakenly replaced
by the full human-targetted table view full of redundant information
and very hard to parse. Users who wish to see the UUIDs in the tabular
output need to use ``virsh list --table --uuid`` as old behaviour was
reverted.
Note that this also broke the ``libvirt-guests`` script. The bug was
introduced in `v10.7.0 (2024-09-02)`_.
* network/qemu: fix some cases where ``device-update`` of a network
interface was failing:
* If the interface was connected to a libvirt network that was
providing a pool of VFs to be used with macvtap passthrough
mode, then *any* update to the interface would fail, even
changing the link state. Updating (the updateable parts of) a
macvtap passthrough interface will now succeed.
* It previously was not possible to move an interface from a Linux
host bridge to an OVS bridge. This (and the opposite direction)
now works.
* qemu: backup: Fix possible crashes when running monitoring commands during
backup job The qemu monitor code was fixed to not crash in specific cases
when monitoing APIs are called during a backup job.
* Fix various memleaks and overflows
Multiple memory leaks and overflows in corner cases were fixed based on
upstream issues reported.
* network: Better cleanup after disappeared networks
If a network disappeared while virtnetworkd was not running not all clean up
was done properly once the daemon was started, especially when only the
network interface disappeared. This could have in some cases resulted in
the network being shown as inactive, but not being able to start.
* qemu: Remember memory backing directory for domains
If ``memory_backing_dir`` is changed during the lifetime of a domain with
file backed memory, files in the old directory would not be cleaned up once
the domain is shut down. Now the directory that was used during startup is
remembered for each running domain.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/backup.pl | 2 +-
config/rootfiles/core/191/filelists/files | 1 +
config/rootfiles/packages/libvirt | 74 ++++++++++++++++++++++++--
config/rootfiles/packages/libyajl | 13 -----
lfs/libvirt | 8 +--
lfs/libyajl | 88 -------------------------------
make.sh | 5 +-
7 files changed, 78 insertions(+), 113 deletions(-)
delete mode 100644 config/rootfiles/packages/libyajl
delete mode 100644 lfs/libyajl
Difference in files:
diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 3b10b8707..b618576e1 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -285,7 +285,7 @@ make_addon_backup() {
restore_addon_backup() {
local name="${1}"
- if [ -d "/tmp/${name}.ipf" ]; then
+ if [ -e "/tmp/${name}.ipf" ]; then
mv "/tmp/${name}.ipf" "/var/ipfire/backup/addons/backup/${name}.ipf"
fi
diff --git a/config/rootfiles/core/191/filelists/files b/config/rootfiles/core/191/filelists/files
index 282ac8891..0f03b7358 100644
--- a/config/rootfiles/core/191/filelists/files
+++ b/config/rootfiles/core/191/filelists/files
@@ -2,3 +2,4 @@ srv/web/ipfire/cgi-bin/connections.cgi
srv/web/ipfire/cgi-bin/dnsforward.cgi
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
+var/ipfire/backup/bin/backup.pl
diff --git a/config/rootfiles/packages/libvirt b/config/rootfiles/packages/libvirt
index 32fdd5cce..55bd39a4e 100644
--- a/config/rootfiles/packages/libvirt
+++ b/config/rootfiles/packages/libvirt
@@ -87,16 +87,16 @@ usr/bin/virt-xml-validate
#usr/lib/libvirt
#usr/lib/libvirt-admin.so
usr/lib/libvirt-admin.so.0
-usr/lib/libvirt-admin.so.0.10007.0
+usr/lib/libvirt-admin.so.0.10010.0
#usr/lib/libvirt-lxc.so
usr/lib/libvirt-lxc.so.0
-usr/lib/libvirt-lxc.so.0.10007.0
+usr/lib/libvirt-lxc.so.0.10010.0
#usr/lib/libvirt-qemu.so
usr/lib/libvirt-qemu.so.0
-usr/lib/libvirt-qemu.so.0.10007.0
+usr/lib/libvirt-qemu.so.0.10010.0
#usr/lib/libvirt.so
usr/lib/libvirt.so.0
-usr/lib/libvirt.so.0.10007.0
+usr/lib/libvirt.so.0.10010.0
#usr/lib/libvirt/connection-driver
usr/lib/libvirt/connection-driver/libvirt_driver_ch.so
usr/lib/libvirt/connection-driver/libvirt_driver_interface.so
@@ -247,29 +247,73 @@ usr/share/libvirt/cpu_map/x86_486.xml
usr/share/libvirt/cpu_map/x86_Broadwell-IBRS.xml
usr/share/libvirt/cpu_map/x86_Broadwell-noTSX-IBRS.xml
usr/share/libvirt/cpu_map/x86_Broadwell-noTSX.xml
+usr/share/libvirt/cpu_map/x86_Broadwell-v1.xml
+usr/share/libvirt/cpu_map/x86_Broadwell-v2.xml
+usr/share/libvirt/cpu_map/x86_Broadwell-v3.xml
+usr/share/libvirt/cpu_map/x86_Broadwell-v4.xml
usr/share/libvirt/cpu_map/x86_Broadwell.xml
usr/share/libvirt/cpu_map/x86_Cascadelake-Server-noTSX.xml
+usr/share/libvirt/cpu_map/x86_Cascadelake-Server-v1.xml
+usr/share/libvirt/cpu_map/x86_Cascadelake-Server-v2.xml
+usr/share/libvirt/cpu_map/x86_Cascadelake-Server-v3.xml
+usr/share/libvirt/cpu_map/x86_Cascadelake-Server-v4.xml
+usr/share/libvirt/cpu_map/x86_Cascadelake-Server-v5.xml
usr/share/libvirt/cpu_map/x86_Cascadelake-Server.xml
usr/share/libvirt/cpu_map/x86_Conroe.xml
+usr/share/libvirt/cpu_map/x86_Cooperlake-v1.xml
+usr/share/libvirt/cpu_map/x86_Cooperlake-v2.xml
usr/share/libvirt/cpu_map/x86_Cooperlake.xml
+usr/share/libvirt/cpu_map/x86_Denverton-v1.xml
+usr/share/libvirt/cpu_map/x86_Denverton-v2.xml
+usr/share/libvirt/cpu_map/x86_Denverton-v3.xml
+usr/share/libvirt/cpu_map/x86_Denverton.xml
+usr/share/libvirt/cpu_map/x86_Dhyana-v1.xml
+usr/share/libvirt/cpu_map/x86_Dhyana-v2.xml
usr/share/libvirt/cpu_map/x86_Dhyana.xml
usr/share/libvirt/cpu_map/x86_EPYC-Genoa.xml
usr/share/libvirt/cpu_map/x86_EPYC-IBPB.xml
+usr/share/libvirt/cpu_map/x86_EPYC-Milan-v1.xml
+usr/share/libvirt/cpu_map/x86_EPYC-Milan-v2.xml
usr/share/libvirt/cpu_map/x86_EPYC-Milan.xml
+usr/share/libvirt/cpu_map/x86_EPYC-Rome-v1.xml
+usr/share/libvirt/cpu_map/x86_EPYC-Rome-v2.xml
+usr/share/libvirt/cpu_map/x86_EPYC-Rome-v3.xml
+usr/share/libvirt/cpu_map/x86_EPYC-Rome-v4.xml
usr/share/libvirt/cpu_map/x86_EPYC-Rome.xml
+usr/share/libvirt/cpu_map/x86_EPYC-v1.xml
+usr/share/libvirt/cpu_map/x86_EPYC-v2.xml
+usr/share/libvirt/cpu_map/x86_EPYC-v3.xml
+usr/share/libvirt/cpu_map/x86_EPYC-v4.xml
usr/share/libvirt/cpu_map/x86_EPYC.xml
+usr/share/libvirt/cpu_map/x86_GraniteRapids-v1.xml
usr/share/libvirt/cpu_map/x86_GraniteRapids.xml
usr/share/libvirt/cpu_map/x86_Haswell-IBRS.xml
usr/share/libvirt/cpu_map/x86_Haswell-noTSX-IBRS.xml
usr/share/libvirt/cpu_map/x86_Haswell-noTSX.xml
+usr/share/libvirt/cpu_map/x86_Haswell-v1.xml
+usr/share/libvirt/cpu_map/x86_Haswell-v2.xml
+usr/share/libvirt/cpu_map/x86_Haswell-v3.xml
+usr/share/libvirt/cpu_map/x86_Haswell-v4.xml
usr/share/libvirt/cpu_map/x86_Haswell.xml
usr/share/libvirt/cpu_map/x86_Icelake-Client-noTSX.xml
usr/share/libvirt/cpu_map/x86_Icelake-Client.xml
usr/share/libvirt/cpu_map/x86_Icelake-Server-noTSX.xml
+usr/share/libvirt/cpu_map/x86_Icelake-Server-v1.xml
+usr/share/libvirt/cpu_map/x86_Icelake-Server-v2.xml
+usr/share/libvirt/cpu_map/x86_Icelake-Server-v3.xml
+usr/share/libvirt/cpu_map/x86_Icelake-Server-v4.xml
+usr/share/libvirt/cpu_map/x86_Icelake-Server-v5.xml
+usr/share/libvirt/cpu_map/x86_Icelake-Server-v6.xml
+usr/share/libvirt/cpu_map/x86_Icelake-Server-v7.xml
usr/share/libvirt/cpu_map/x86_Icelake-Server.xml
usr/share/libvirt/cpu_map/x86_IvyBridge-IBRS.xml
+usr/share/libvirt/cpu_map/x86_IvyBridge-v1.xml
+usr/share/libvirt/cpu_map/x86_IvyBridge-v2.xml
usr/share/libvirt/cpu_map/x86_IvyBridge.xml
+usr/share/libvirt/cpu_map/x86_KnightsMill.xml
usr/share/libvirt/cpu_map/x86_Nehalem-IBRS.xml
+usr/share/libvirt/cpu_map/x86_Nehalem-v1.xml
+usr/share/libvirt/cpu_map/x86_Nehalem-v2.xml
usr/share/libvirt/cpu_map/x86_Nehalem.xml
usr/share/libvirt/cpu_map/x86_Opteron_G1.xml
usr/share/libvirt/cpu_map/x86_Opteron_G2.xml
@@ -278,16 +322,38 @@ usr/share/libvirt/cpu_map/x86_Opteron_G4.xml
usr/share/libvirt/cpu_map/x86_Opteron_G5.xml
usr/share/libvirt/cpu_map/x86_Penryn.xml
usr/share/libvirt/cpu_map/x86_SandyBridge-IBRS.xml
+usr/share/libvirt/cpu_map/x86_SandyBridge-v1.xml
+usr/share/libvirt/cpu_map/x86_SandyBridge-v2.xml
usr/share/libvirt/cpu_map/x86_SandyBridge.xml
+usr/share/libvirt/cpu_map/x86_SapphireRapids-v1.xml
+usr/share/libvirt/cpu_map/x86_SapphireRapids-v2.xml
+usr/share/libvirt/cpu_map/x86_SapphireRapids-v3.xml
usr/share/libvirt/cpu_map/x86_SapphireRapids.xml
+usr/share/libvirt/cpu_map/x86_SierraForest-v1.xml
+usr/share/libvirt/cpu_map/x86_SierraForest.xml
usr/share/libvirt/cpu_map/x86_Skylake-Client-IBRS.xml
usr/share/libvirt/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+usr/share/libvirt/cpu_map/x86_Skylake-Client-v1.xml
+usr/share/libvirt/cpu_map/x86_Skylake-Client-v2.xml
+usr/share/libvirt/cpu_map/x86_Skylake-Client-v3.xml
+usr/share/libvirt/cpu_map/x86_Skylake-Client-v4.xml
usr/share/libvirt/cpu_map/x86_Skylake-Client.xml
usr/share/libvirt/cpu_map/x86_Skylake-Server-IBRS.xml
usr/share/libvirt/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+usr/share/libvirt/cpu_map/x86_Skylake-Server-v1.xml
+usr/share/libvirt/cpu_map/x86_Skylake-Server-v2.xml
+usr/share/libvirt/cpu_map/x86_Skylake-Server-v3.xml
+usr/share/libvirt/cpu_map/x86_Skylake-Server-v4.xml
+usr/share/libvirt/cpu_map/x86_Skylake-Server-v5.xml
usr/share/libvirt/cpu_map/x86_Skylake-Server.xml
+usr/share/libvirt/cpu_map/x86_Snowridge-v1.xml
+usr/share/libvirt/cpu_map/x86_Snowridge-v2.xml
+usr/share/libvirt/cpu_map/x86_Snowridge-v3.xml
+usr/share/libvirt/cpu_map/x86_Snowridge-v4.xml
usr/share/libvirt/cpu_map/x86_Snowridge.xml
usr/share/libvirt/cpu_map/x86_Westmere-IBRS.xml
+usr/share/libvirt/cpu_map/x86_Westmere-v1.xml
+usr/share/libvirt/cpu_map/x86_Westmere-v2.xml
usr/share/libvirt/cpu_map/x86_Westmere.xml
usr/share/libvirt/cpu_map/x86_athlon.xml
usr/share/libvirt/cpu_map/x86_core2duo.xml
diff --git a/config/rootfiles/packages/libyajl b/config/rootfiles/packages/libyajl
deleted file mode 100644
index f575f6a1b..000000000
--- a/config/rootfiles/packages/libyajl
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/bin/json_reformat
-usr/bin/json_verify
-#usr/include/yajl
-#usr/include/yajl/yajl_common.h
-#usr/include/yajl/yajl_gen.h
-#usr/include/yajl/yajl_parse.h
-#usr/include/yajl/yajl_tree.h
-#usr/include/yajl/yajl_version.h
-#usr/lib/libyajl.so
-usr/lib/libyajl.so.2
-usr/lib/libyajl.so.2.1.0
-#usr/lib/libyajl_s.a
-#usr/share/pkgconfig/yajl.pc
diff --git a/lfs/libvirt b/lfs/libvirt
index a497ed868..ed076a781 100644
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -26,7 +26,7 @@ include Config
SUMMARY = Server side daemon and supporting files for libvirt
-VER = 10.7.0
+VER = 10.10.0
THISAPP = libvirt-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -35,9 +35,9 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
SUP_ARCH = x86_64 aarch64
PROG = libvirt
-PAK_VER = 36
+PAK_VER = 37
-DEPS = ebtables libpciaccess libyajl qemu
+DEPS = ebtables libpciaccess qemu
SERVICES = libvirtd virtlogd
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 331f8c01395c70536ac094a156810f93cd85aab9f25bdde40633698a27f5863cb5c88c520199a5182318f376cb1a3484f3c487da74a41925a521c4a305c51f13
+$(DL_FILE)_BLAKE2 = 8042ce1493c3ffd6e6deeb7d94d0744da18850fe416480487a57ffd33bf3390f587849f308aad12fd38c887628f90137ba717ea11ef7e0f73a97b157fa985a6e
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
diff --git a/lfs/libyajl b/lfs/libyajl
deleted file mode 100644
index eccae6489..000000000
--- a/lfs/libyajl
+++ /dev/null
@@ -1,88 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 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 #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-SUMMARY = Yet Another JSON Library
-
-VER = 2.1.0
-
-THISAPP = libyajl-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = libyajl
-PAK_VER = 1
-
-DEPS =
-
-SERVICES =
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = e0f2d0300d2cc35599d8b080fa0102a532b52f3ca3cf96db020ecc54bdab04aff971184a411776d263ac06ae9333d1dca03b3437d65b7247eea9919ca25b6d43
-
-install: $(TARGET)
-
-check: $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download: $(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-dist:
- $(PAK)
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
- @$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && cmake -DCMAKE_INSTALL_PREFIX=/usr .
- cd $(DIR_APP) && make
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index ee098d9a3..0a21b9489 100755
--- a/make.sh
+++ b/make.sh
@@ -939,7 +939,7 @@ lfsmake1() {
exiterror "Downloading ${pkg}"
fi
- if ! make_pkg --timer="update_runtime" "${pkg}" TOOLCHAIN=1 ROOT="${BUILD_DIR}" "$@"; then
+ if ! make_pkg --timer="update_runtime" "${pkg}" TOOLCHAIN=1 ROOT="${BUILD_DIR}" b2 "$@"; then
print_status FAIL
exiterror "Building ${pkg}"
@@ -962,7 +962,7 @@ lfsmake2() {
fi
# Run install on the package
- if ! make_pkg --chroot --timer="update_runtime" "${pkg}" install "$@"; then
+ if ! make_pkg --chroot --timer="update_runtime" "${pkg}" b2 install "$@"; then
print_status FAIL
exiterror "Building ${pkg}"
@@ -2034,7 +2034,6 @@ build_system() {
lfsmake2 dmidecode
lfsmake2 mcelog
lfsmake2 libpciaccess
- lfsmake2 libyajl
lfsmake2 libvirt
lfsmake2 freeradius
lfsmake2 perl-common-sense
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-12-23 16:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-12-23 16:16 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 84ad76dd670324f3b2d920ef0dce64cc69159bd6 Arne Fitzenreiter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox