tools/pkgutils
3
0
Fork 2
Code Issues 1 Pull Requests Projects Releases Wiki Activity

handle kernel-version better, add arch detection to slim down arm overlays #2

Closed
tb wants to merge 1 commits from footprint-improvements into master
pull from: footprint-improvements
merge into: tools:master
Conversation 3 Commits 1 Files Changed 1 +8 -3
tb commented 2024-10-12 13:06:17 +02:00
Owner
Copy Link
No description provided.
tb added 1 commit 2024-10-12 13:06:18 +02:00
tb commented 2024-10-12 13:16:01 +02:00
Author
Owner
Copy Link

kernel-version is now exchanged over the whole footprint of a port, which may look like that:

diff --git a/zfs-lts/.footprint b/zfs-lts/.footprint
index b951daf1..eba018ea 100644
--- a/zfs-lts/.footprint
+++ b/zfs-lts/.footprint
@@ -7,10 +7,10 @@ drwxr-xr-x	root/root	lib/modules/<kernel-version>/extra/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/src/
 drwxr-xr-x	root/root	usr/src/zfs-2.2.6/
-drwxr-xr-x	root/root	usr/src/zfs-2.2.6/6.10.8/
--rw-r--r--	root/root	usr/src/zfs-2.2.6/6.10.8/Module.symvers
--rw-r--r--	root/root	usr/src/zfs-2.2.6/6.10.8/zfs.release
--rw-r--r--	root/root	usr/src/zfs-2.2.6/6.10.8/zfs_config.h
+drwxr-xr-x	root/root	usr/src/zfs-2.2.6/<kernel-version>/
+-rw-r--r--	root/root	usr/src/zfs-2.2.6/<kernel-version>/Module.symvers
+-rw-r--r--	root/root	usr/src/zfs-2.2.6/<kernel-version>/zfs.release
+-rw-r--r--	root/root	usr/src/zfs-2.2.6/<kernel-version>/zfs_config.h
 drwxr-xr-x	root/root	usr/src/zfs-2.2.6/include/
 -rw-r--r--	root/root	usr/src/zfs-2.2.6/include/cityhash.h
 drwxr-xr-x	root/root	usr/src/zfs-2.2.6/include/linux/

arch can hopefully trim the overlays needed by CRUX-ARM by changing the footprint in the same way that kernel-version does:
image

kernel-version is now exchanged over the whole footprint of a port, which may look like that: ```diff diff --git a/zfs-lts/.footprint b/zfs-lts/.footprint index b951daf1..eba018ea 100644 --- a/zfs-lts/.footprint +++ b/zfs-lts/.footprint @@ -7,10 +7,10 @@ drwxr-xr-x root/root lib/modules/<kernel-version>/extra/ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/src/ drwxr-xr-x root/root usr/src/zfs-2.2.6/ -drwxr-xr-x root/root usr/src/zfs-2.2.6/6.10.8/ --rw-r--r-- root/root usr/src/zfs-2.2.6/6.10.8/Module.symvers --rw-r--r-- root/root usr/src/zfs-2.2.6/6.10.8/zfs.release --rw-r--r-- root/root usr/src/zfs-2.2.6/6.10.8/zfs_config.h +drwxr-xr-x root/root usr/src/zfs-2.2.6/<kernel-version>/ +-rw-r--r-- root/root usr/src/zfs-2.2.6/<kernel-version>/Module.symvers +-rw-r--r-- root/root usr/src/zfs-2.2.6/<kernel-version>/zfs.release +-rw-r--r-- root/root usr/src/zfs-2.2.6/<kernel-version>/zfs_config.h drwxr-xr-x root/root usr/src/zfs-2.2.6/include/ -rw-r--r-- root/root usr/src/zfs-2.2.6/include/cityhash.h drwxr-xr-x root/root usr/src/zfs-2.2.6/include/linux/ ``` arch can hopefully trim the overlays needed by CRUX-ARM by changing the footprint in the same way that kernel-version does: ![image](/attachments/044f5bf8-dc87-4d33-930f-c9316d8cf44e)
image.png
147 KiB
pitillo commented 2024-10-12 13:23:25 +02:00
First-time contributor
Copy Link

Effectively, with this patch we can reduce the number of ports that currently need an overlay simply by having a specific footprint for the architecture.

It would be great if the possibility was considered.

======> ERROR: Footprint mismatch found:
MISSING -rwxr-xr-x root/root usr/lib/python3.10/site-packages/markupsafe/_speedups.cpython-310-aarch64-linux-gnu.so
NEW -rwxr-xr-x root/root usr/lib/python3.10/site-packages/markupsafe/_speedups.cpython-310-<arch>-linux-gnu.so
=======> ERROR: Building '/nfs/rpi3/3.7/pkg/python3-markupsafe#3.0.1-1.pkg.tar.xz' failed.

Effectively, with this patch we can reduce the number of ports that currently need an overlay simply by having a specific footprint for the architecture. It would be great if the possibility was considered. ======> ERROR: Footprint mismatch found: MISSING -rwxr-xr-x root/root usr/lib/python3.10/site-packages/markupsafe/**_speedups.cpython-310-aarch64-linux-gnu.so** NEW -rwxr-xr-x root/root usr/lib/python3.10/site-packages/markupsafe/**_speedups.cpython-310-`<arch`>-linux-gnu.so** =======> ERROR: Building '/nfs/rpi3/3.7/pkg/python3-markupsafe#3.0.1-1.pkg.tar.xz' failed.
tb commented 2024-10-19 09:33:37 +02:00
Author
Owner
Copy Link
=======> ERROR: Footprint mismatch found:
NEW       -rw-r--r--      root/root       usr/include/llvm/BinaryFormat/ELFRelocs/<arch>.def
MISSING   -rw-r--r--      root/root       usr/include/llvm/BinaryFormat/ELFRelocs/x86_64.def
NEW       -rw-r--r--      root/root       usr/include/llvm/ExecutionEngine/JITLink/<arch>.h
MISSING   -rw-r--r--      root/root       usr/include/llvm/ExecutionEngine/JITLink/COFF_x86_64.h
NEW       -rw-r--r--      root/root       usr/include/llvm/ExecutionEngine/JITLink/COFF_<arch>.h
NEW       -rw-r--r--      root/root       usr/include/llvm/ExecutionEngine/JITLink/ELF_<arch>.h
MISSING   -rw-r--r--      root/root       usr/include/llvm/ExecutionEngine/JITLink/ELF_x86_64.h
NEW       -rw-r--r--      root/root       usr/include/llvm/ExecutionEngine/JITLink/MachO_<arch>.h
MISSING   -rw-r--r--      root/root       usr/include/llvm/ExecutionEngine/JITLink/MachO_x86_64.h
MISSING   -rw-r--r--      root/root       usr/include/llvm/ExecutionEngine/JITLink/x86_64.h
=======> ERROR: Building '/home/pkgmk/packages/llvm#19.1.2-1.pkg.tar.xz' failed.

Maybe thats not the best way to go..

``` =======> ERROR: Footprint mismatch found: NEW -rw-r--r-- root/root usr/include/llvm/BinaryFormat/ELFRelocs/<arch>.def MISSING -rw-r--r-- root/root usr/include/llvm/BinaryFormat/ELFRelocs/x86_64.def NEW -rw-r--r-- root/root usr/include/llvm/ExecutionEngine/JITLink/<arch>.h MISSING -rw-r--r-- root/root usr/include/llvm/ExecutionEngine/JITLink/COFF_x86_64.h NEW -rw-r--r-- root/root usr/include/llvm/ExecutionEngine/JITLink/COFF_<arch>.h NEW -rw-r--r-- root/root usr/include/llvm/ExecutionEngine/JITLink/ELF_<arch>.h MISSING -rw-r--r-- root/root usr/include/llvm/ExecutionEngine/JITLink/ELF_x86_64.h NEW -rw-r--r-- root/root usr/include/llvm/ExecutionEngine/JITLink/MachO_<arch>.h MISSING -rw-r--r-- root/root usr/include/llvm/ExecutionEngine/JITLink/MachO_x86_64.h MISSING -rw-r--r-- root/root usr/include/llvm/ExecutionEngine/JITLink/x86_64.h =======> ERROR: Building '/home/pkgmk/packages/llvm#19.1.2-1.pkg.tar.xz' failed. ``` Maybe thats not the best way to go..
tb closed this pull request 2024-10-19 09:33:37 +02:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: tools/pkgutils#2
No description provided.
Delete Branch "footprint-improvements"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?