Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion config/core/rootfs-configs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -419,21 +419,31 @@ rootfs_configs:
- armhf
- riscv64
extra_packages:
- bc
- btrfs-progs
- bzip2
- ca-certificates
- curl
- dosfstools
- e2fsprogs
- file
- gcc
- gdb-minimal
- iproute2
- iputils-ping
- jq
- libnuma-dev

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We remove libnuma-dev from the list to be installed (but add numactl and libnuma1) here.

- libaio1t64
- libc6-dev
- libnuma1
- net-tools
- nfs-kernel-server
- ntfs-3g
- numactl
- parted
- psmisc
- python3
- quota
- unzip
- xfsprogs
script: "scripts/trixie-ltp.sh"
imagesize: 2GB
Expand Down
12 changes: 11 additions & 1 deletion config/rootfs/debos/rootfs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,14 @@ actions:
description: Install cross-build target dependencies
recommends: false
packages:
- libacl1-dev
- libaio-dev
- libc6-dev
- libcap-dev
- libmnl-dev
- libnuma-dev

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but leave it here, the changelog says we should be removing it?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. The changelog should make the two stages clearer. I’ll update this in the changelog

libnuma-dev remains a build dependency because LTP needs its headers during compilation. The recipe already removes it afterward; previously, extra_packages installed it again into the finished image. This patch removes that reinstallation and provides the runtime library and NUMA command-line tools instead.

- libssl-dev
- libtirpc-dev
{{ end }}

- action: run
Expand All @@ -89,7 +95,11 @@ actions:
- action: run
description: Remove cross-build target dependencies
chroot: true
command: apt-get autoremove --purge -y libc6-dev libnuma-dev && apt-get clean
command: >-
apt-get autoremove --purge -y
libacl1-dev libaio-dev libc6-dev libcap-dev
libmnl-dev libnuma-dev libssl-dev libtirpc-dev
&& apt-get clean
{{ end }}

- action: run
Expand Down