Skip to content

Commit ee6071c

Browse files
committed
fix: glib build
Fix glib build by disabling elf support. Signed-off-by: Noel Georgi <git@frezbo.dev>
1 parent ba40f6e commit ee6071c

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-03-01T10:12:16Z by kres latest.
3+
# Generated on 2024-03-08T14:57:49Z by kres latest.
44

55
# common variables
66

@@ -28,7 +28,7 @@ SOURCE_DATE_EPOCH := $(shell git log $(INITIAL_COMMIT_SHA) --pretty=%ct)
2828

2929
# sync bldr image with pkgfile
3030

31-
BLDR_RELEASE := v0.2.3
31+
BLDR_RELEASE := v0.3.0
3232
BLDR_IMAGE := ghcr.io/siderolabs/bldr:$(BLDR_RELEASE)
3333
BLDR := docker run --rm --user $(shell id -u):$(shell id -g) --volume $(PWD):/src --entrypoint=/bldr $(BLDR_IMAGE) --root=/src
3434

@@ -90,7 +90,7 @@ NONFREE_TARGETS = nonfree-kmod-nvidia
9090
# extra variables
9191

9292
EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
93-
PKGS ?= v1.7.0-alpha.0-31-gcb39126
93+
PKGS ?= v1.7.0-alpha.0-33-g3aacf03
9494
PKGS_PREFIX ?= ghcr.io/siderolabs
9595

9696
# help menu

Pkgfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax = ghcr.io/siderolabs/bldr:v0.2.3
1+
# syntax = ghcr.io/siderolabs/bldr:v0.3.0
22

33
format: v1alpha2
44

guest-agents/qemu-guest-agent/glib/pkg.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ steps:
99
- sources:
1010
- url: https://download.gnome.org/sources/glib/{{ regexReplaceAll ".\\d+$" .GLIB_VERSION "${1}" }}/glib-{{ .GLIB_VERSION }}.tar.xz
1111
destination: glib.tar.xz
12-
sha256: a47f7ecf7bba0346e6cd562887b93ee4ee37a57d8dcae0755f0de8dc75ca5e8c
13-
sha512: c4cf99546828d8b8310faafcafef6db17381d07973d465e7699a2b8743687c730496de38c5ab670613411b89358f6cd60cc9aad2f35bf0a80d12a53d79f15581
12+
sha256: 8228a92f92a412160b139ae68b6345bd28f24434a7b5af150ebe21ff587a561d
13+
sha512: 1514d62aeb4c4a1a1048ae0f84f7db7f0dbf355772b2dadf6a34ec547045b163a5e28331b096e7616fe3c9c19bed98025a0202b05073f5d7ee901d0efaffe143
1414
prepare:
1515
- |
1616
tar -xf glib.tar.xz --strip-components=1
@@ -29,6 +29,7 @@ steps:
2929
meson setup \
3030
--prefix=/usr \
3131
-Ddefault_library=both \
32+
-Dlibelf=disabled \
3233
_build
3334
3435
ninja -C _build

guest-agents/vars.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=https://github.com/qemu/qemu.git
22
QEMU_VERSION: 8.2.2
33
# renovate: datasource=git-tags depName=https://gitlab.gnome.org/GNOME/glib.git
4-
GLIB_VERSION: 2.79.2
4+
GLIB_VERSION: 2.80.0
55
# renovate: datasource=github-releases extractVersion=^pcre2-(?<version>.*)$ depName=PCRE2Project/pcre2
66
PCRE2_VERSION: 10.42
77
# renovate: datasource=github-releases extractVersion=^v(?<version>.*)$ depName=xenserver/xe-guest-utilities

0 commit comments

Comments
 (0)