Skip to content

Commit

Permalink
fix: glib build
Browse files Browse the repository at this point in the history
Fix glib build by disabling elf support.

Signed-off-by: Noel Georgi <git@frezbo.dev>
  • Loading branch information
frezbo committed Mar 8, 2024
1 parent ba40f6e commit ee6071c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-03-01T10:12:16Z by kres latest.
# Generated on 2024-03-08T14:57:49Z by kres latest.

# common variables

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

# sync bldr image with pkgfile

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

Expand Down Expand Up @@ -90,7 +90,7 @@ NONFREE_TARGETS = nonfree-kmod-nvidia
# extra variables

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

# help menu
Expand Down
2 changes: 1 addition & 1 deletion Pkgfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# syntax = ghcr.io/siderolabs/bldr:v0.2.3
# syntax = ghcr.io/siderolabs/bldr:v0.3.0

format: v1alpha2

Expand Down
5 changes: 3 additions & 2 deletions guest-agents/qemu-guest-agent/glib/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ steps:
- sources:
- url: https://download.gnome.org/sources/glib/{{ regexReplaceAll ".\\d+$" .GLIB_VERSION "${1}" }}/glib-{{ .GLIB_VERSION }}.tar.xz
destination: glib.tar.xz
sha256: a47f7ecf7bba0346e6cd562887b93ee4ee37a57d8dcae0755f0de8dc75ca5e8c
sha512: c4cf99546828d8b8310faafcafef6db17381d07973d465e7699a2b8743687c730496de38c5ab670613411b89358f6cd60cc9aad2f35bf0a80d12a53d79f15581
sha256: 8228a92f92a412160b139ae68b6345bd28f24434a7b5af150ebe21ff587a561d
sha512: 1514d62aeb4c4a1a1048ae0f84f7db7f0dbf355772b2dadf6a34ec547045b163a5e28331b096e7616fe3c9c19bed98025a0202b05073f5d7ee901d0efaffe143
prepare:
- |
tar -xf glib.tar.xz --strip-components=1
Expand All @@ -29,6 +29,7 @@ steps:
meson setup \
--prefix=/usr \
-Ddefault_library=both \
-Dlibelf=disabled \
_build
ninja -C _build
Expand Down
2 changes: 1 addition & 1 deletion guest-agents/vars.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=https://github.com/qemu/qemu.git
QEMU_VERSION: 8.2.2
# renovate: datasource=git-tags depName=https://gitlab.gnome.org/GNOME/glib.git
GLIB_VERSION: 2.79.2
GLIB_VERSION: 2.80.0
# renovate: datasource=github-releases extractVersion=^pcre2-(?<version>.*)$ depName=PCRE2Project/pcre2
PCRE2_VERSION: 10.42
# renovate: datasource=github-releases extractVersion=^v(?<version>.*)$ depName=xenserver/xe-guest-utilities
Expand Down

0 comments on commit ee6071c

Please sign in to comment.