Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a4bb6d3
++ virt-launcher with C debug tools
diafour Dec 29, 2025
faabdac
++ virt-launcher with C debug tools 2
diafour Dec 29, 2025
1f3da78
++ set march to x86-64-v2 for gnutls
diafour Dec 29, 2025
302bf44
++ fix certtool path
diafour Dec 29, 2025
caa80ad
++ fix yaml comments
diafour Dec 29, 2025
d7b600b
++ strange errors
diafour Dec 29, 2025
2dc73c7
++ fix pathes for binaries info
diafour Dec 29, 2025
71b879f
++ fix 2 for binaries info
diafour Dec 29, 2025
9c32c7f
++ fix 3 for binaries info
diafour Dec 29, 2025
f378500
++ Try to fix bootstrap errors "fatal: not a git repository (or any …
diafour Dec 29, 2025
95f6964
++ ignore non-zero exit from grep
diafour Dec 29, 2025
56e532b
++ systemd problems! Error during build: test/fuzz/meson.build:72:14:…
diafour Dec 29, 2025
805858a
++ systemd problems! Error during build: test/fuzz/meson.build:72:14:…
diafour Dec 29, 2025
0782b9b
++ systemd problems! Error during build: test/fuzz/meson.build:72:14:…
diafour Dec 29, 2025
9308383
++ systemd problems! Error during build: test/fuzz/meson.build:72:14:…
diafour Dec 29, 2025
c265c38
++ systemd problems! Error during build: test/fuzz/meson.build:72:14:…
diafour Dec 29, 2025
7635e7d
++ systemd problems! Error during build: test/fuzz/meson.build:72:14:…
diafour Dec 29, 2025
dbd6897
++ systemd problems! Error during build: test/fuzz/meson.build:72:14:…
diafour Dec 29, 2025
bf9be55
++ use werf 2.55 to workaround .git folder problem
diafour Dec 29, 2025
d92137e
++ use werf 2.54.1 to workaround .git folder problem
diafour Dec 29, 2025
01fdbef
++ restore empty dirs for .git to be a correct repository directory.
diafour Dec 30, 2025
3d6e71a
++ restore empty dirs for .git to be a correct repository directory, …
diafour Dec 30, 2025
fdd92cb
++ restore empty dirs for .git to be a correct repository directory, …
diafour Dec 30, 2025
f94b077
++ set x86-64-v2 for libgmp
diafour Dec 30, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 51 additions & 2 deletions images/packages/gnutls/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ altPackages:
- liboqs-devel
- iproute2-devel
- wget
- tree
packages:
- libbrotli libidn2 libgcrypt libgmp
- nettle zlib zstd p11-kit
Expand Down Expand Up @@ -86,18 +87,37 @@ shell:
PKGS="{{ $builderDependencies.packages | join " " }}"
for pkg in $PKGS; do
# cp -a /$pkg/. /packages
echo Copy /$pkg/. to / ...
cp -a /$pkg/. /
echo Remove /$pkg directory ...
rm -rf /$pkg
done
ls -la /

OUTDIR=/out

cd /src

# Fake distcheck-hook that checks bootstrap is called without --skip-po
# Restore empty dirs after import on werf 2.56+.
mkdir -p .git/refs/heads .git/refs/tags .git/objects/info

ls -la

# Workaround for --skip-po: bootstrap checks .reference to decide if it should download po files.
mkdir -p po/.reference

./bootstrap --skip-po
export CFLAGS="-march=x86-64-v2"

./bootstrap --skip-po --no-git --gnulib-srcdir=/src/gnulib

ls -la /src/gnulib

echo "GCC OPTIONS =========="
gcc -c -Q -O2 --help=target
echo "GCC FLAGS =========="
echo CFLAGS=$CFLAGS
echo CXXFLAGS=$CXXFLAGS
echo "GCC SCRIPTS ==========="

./configure \
--prefix=/usr \
Expand All @@ -122,4 +142,33 @@ shell:

make -j$(nproc)


echo MAKE INSTALL ========

make DESTDIR=$OUTDIR install-strip

echo DONE MAKE ===============

which readelf
which objdump

tree /out

echo ELF and AVX info ==============

echo find certtool
find . -name certtool -type f | grep .libs

echo find libgnutls.so
find . -name libgnutls.so\* -type f

echo readelf --notes $(find . -name certtool -type f | grep .libs| head -n1)
readelf --notes $(find . -name certtool -type f | grep .libs| head -n1)

echo objdump -d $(find . -name certtool -type f | grep .libs| head -n1)
objdump -d $(find . -name certtool -type f | grep .libs| head -n1) | grep "vpbroadcast|vinsert|vextract|vfmadd" || true

echo readelf --notes $(find . -name libgnutls.so\* -type f | head -n1)
readelf --notes $(find . -name libgnutls.so\* -type f | head -n1)
echo objdump -d $(find . -name libgnutls.so\* -type f | head -n1)
objdump -d $(find . -name libgnutls.so\* -type f | head -n1) | grep "vpbroadcast|vinsert|vextract|vfmadd" || true
4 changes: 4 additions & 0 deletions images/packages/libcurl/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ shell:

OUTDIR=/out
cd /src

# Restore empty dirs after import on werf 2.56+.
mkdir -p .git/refs/heads .git/refs/tags .git/objects/info

autoreconf -f -i
./configure \
--prefix=/usr \
Expand Down
2 changes: 2 additions & 0 deletions images/packages/libgmp/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ shell:

cd /src

export CFLAGS="-march=x86-64-v2"

./configure \
--prefix=/usr \
--libdir=/usr/lib64 \
Expand Down
4 changes: 4 additions & 0 deletions images/packages/libgsasl/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ shell:
OUTDIR=/out

cd /src

# Restore empty dirs after import on werf 2.56+.
mkdir -p .git/refs/heads .git/refs/tags .git/objects/info

export GNULIB_REVISION=$(. bootstrap.conf >&2; echo $GNULIB_REVISION)
export GNULIB_SRCDIR=$(pwd)/gnulib

Expand Down
3 changes: 3 additions & 0 deletions images/packages/libnbd/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ shell:

cd /src

# Restore empty dirs after import on werf 2.56+.
mkdir -p .git/refs/heads .git/refs/tags .git/objects/info

autoreconf -i
./configure \
--prefix=/usr \
Expand Down
5 changes: 4 additions & 1 deletion images/packages/libvirt/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ shell:

cd /{{ $gitRepoName }}-{{ $version }}

# Restore empty dirs after import on werf 2.56+.
mkdir -p .git/refs/heads .git/refs/tags .git/objects/info

CFLAGS="-Wframe-larger-than=262144" meson setup build \
-Dinit_script=systemd \
-Dsystem=true \
Expand Down Expand Up @@ -266,4 +269,4 @@ shell:
echo "Stripped: $execfile"
fi
done
tree -hp $OUTDIR
tree -hp $OUTDIR
3 changes: 3 additions & 0 deletions images/packages/nbdkit/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ shell:

cd /src

# Restore empty dirs after import on werf 2.56+.
mkdir -p .git/refs/heads .git/refs/tags .git/objects/info

autoreconf -if
./configure \
--disable-static \
Expand Down
3 changes: 3 additions & 0 deletions images/packages/ngtcp2/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ shell:

cd /src

# Restore empty dirs after import on werf 2.56+.
mkdir -p .git/refs/heads .git/refs/tags .git/objects/info

autoreconf -if
./configure \
--prefix=/usr \
Expand Down
5 changes: 5 additions & 0 deletions images/packages/swtpm/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ shell:

cd /src

# Restore empty dirs after import on werf 2.56+.
mkdir -p .git/refs/heads .git/refs/tags .git/objects/info

export CFLAGS="-march=x86-64-v2"

./autogen.sh \
--disable-tests \
--with-openssl \
Expand Down
3 changes: 3 additions & 0 deletions images/packages/systemd/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ shell:

cd /src

# Restore empty dirs after import on werf 2.56+.
mkdir -p .git/refs/heads .git/refs/tags .git/objects/info

/usr/bin/meson setup _build . \
-Doptimization=2 \
--prefix=/usr \
Expand Down
3 changes: 3 additions & 0 deletions images/packages/ubdsrv/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ shell:
OUTDIR=/out
cd /src

# Restore empty dirs after import on werf 2.56+.
mkdir -p .git/refs/heads .git/refs/tags .git/objects/info

autoreconf -i
./configure \
--prefix=/usr \
Expand Down
18 changes: 16 additions & 2 deletions images/virt-launcher/werf.inc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,17 @@ altLibs:
- psmisc
- msulogin
- strace
- binutils
- glibc-utils
- gdb
binaries:
# Gnu utils (requared for swtpm)
# DEBUG
- /usr/bin/bash
- /usr/bin/strace
- /usr/bin/objdump
- /usr/bin/ldd
- /usr/bin/gdb
# GNU utils (required to run swtpm).
- /usr/bin/certtool
- /usr/bin/gnutls-cli
- /usr/bin/ocsptool
Expand Down Expand Up @@ -210,7 +219,7 @@ import:

{{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}

# Statically builded
# Statically built.
- image: {{ .ModuleNamePrefix }}packages/openssl
add: /openssl
to: /relocate
Expand Down Expand Up @@ -303,6 +312,11 @@ shell:
echo "Copy binaries to /relocate"
./relocate_binaries.sh -i "{{ $builderDependencies.binaries | join " " }}" -o /relocate

echo "=========================="
echo "ls /relocate/usr/bin"
ls /relocate/usr/bin
echo "=========================="

echo "Copy additional config swtpm"
cp -a /etc/{swtpm_setup.conf,swtpm-localca.conf,swtpm-localca.options} /relocate/etc/

Expand Down
Loading