Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add patch to be compatible with Rockchip Linux Kernel #2

Merged
merged 1 commit into from
Sep 4, 2024
Merged

fix: add patch to be compatible with Rockchip Linux Kernel #2

merged 1 commit into from
Sep 4, 2024

Conversation

CodeChenL
Copy link
Contributor

先只提patch

@CodeChenL
Copy link
Contributor Author

@RadxaYuntian request a review

@RadxaYuntian
Copy link
Member

rebase一下，修好了用x64的交叉编译，ci快很多

@RadxaYuntian RadxaYuntian mentioned this pull request Aug 30, 2024
Closed
@CodeChenL
fix: add patch to be compatible with Rockchip Linux Kernel
2a8dc9c 
Signed-off-by: Chen Jiali <chenjiali@radxa.com>
@RadxaYuntian
Copy link
Member

另外你有测试功能么？不仅仅是要能编译

@CodeChenL
Copy link
Contributor Author

另外你有测试功能么？不仅仅是要能编译

基于2.11.1的测试过

@CodeChenL
Copy link
Contributor Author

另外你有测试功能么？不仅仅是要能编译

等ci好了我再测测

@RadxaYuntian
Copy link
Member

我感觉可以跑一下zfs-test看看结果

@CodeChenL
Copy link
Contributor Author

我感觉可以跑一下zfs-test看看结果

bullseye的版本跟不上

rock@rock-3a:~$ sudo apt install libc6
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
Suggested packages:
  glibc-doc
Recommended packages:
  libnss-nis libnss-nisplus
The following packages will be upgraded:
  libc6
1 upgraded, 0 newly installed, 0 to remove and 169 not upgraded.
Need to get 2,456 kB of archives.
After this operation, 1,024 B of additional disk space will be used.
Get:1 https://deb.debian.org/debian bullseye/main arm64 libc6 arm64 2.31-13+deb11u10 [2,456 kB]
Fetched 2,456 kB in 1s (3,750 kB/s)
Preconfiguring packages ...
(Reading database ... 66917 files and directories currently installed.)
Preparing to unpack .../libc6_2.31-13+deb11u10_arm64.deb ...
Unpacking libc6:arm64 (2.31-13+deb11u10) over (2.31-13+deb11u6) ............] 
Setting up libc6:arm64 (2.31-13+deb11u10) ..................................] 
Processing triggers for libc-bin (2.31-13+deb11u6) ...##########............] 
rock@rock-3a:~$ sudo apt install ./*.deb
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
Note, selecting 'libnvpair3linux' instead of './libnvpair3linux_2.2.5-1_arm64.deb'
Note, selecting 'libnvpair3linux-dbgsym' instead of './libnvpair3linux-dbgsym_2.2.5-1_arm64.deb'
Note, selecting 'libpam-zfs' instead of './libpam-zfs_2.2.5-1_arm64.deb'
Note, selecting 'libpam-zfs-dbgsym' instead of './libpam-zfs-dbgsym_2.2.5-1_arm64.deb'
Note, selecting 'libuutil3linux' instead of './libuutil3linux_2.2.5-1_arm64.deb'
Note, selecting 'libuutil3linux-dbgsym' instead of './libuutil3linux-dbgsym_2.2.5-1_arm64.deb'
Note, selecting 'libzfs4linux' instead of './libzfs4linux_2.2.5-1_arm64.deb'
Note, selecting 'libzfs4linux-dbgsym' instead of './libzfs4linux-dbgsym_2.2.5-1_arm64.deb'
Note, selecting 'libzfsbootenv1linux' instead of './libzfsbootenv1linux_2.2.5-1_arm64.deb'
Note, selecting 'libzfsbootenv1linux-dbgsym' instead of './libzfsbootenv1linux-dbgsym_2.2.5-1_arm64.deb'
Note, selecting 'libzfslinux-dev' instead of './libzfslinux-dev_2.2.5-1_arm64.deb'
Note, selecting 'libzpool5linux' instead of './libzpool5linux_2.2.5-1_arm64.deb'
Note, selecting 'libzpool5linux-dbgsym' instead of './libzpool5linux-dbgsym_2.2.5-1_arm64.deb'
Note, selecting 'python3-pyzfs' instead of './python3-pyzfs_2.2.5-1_arm64.deb'
Note, selecting 'pyzfs-doc' instead of './pyzfs-doc_2.2.5-1_all.deb'
Note, selecting 'zfs-dkms' instead of './zfs-dkms_2.2.5-1_all.deb'
Note, selecting 'zfs-dracut' instead of './zfs-dracut_2.2.5-1_all.deb'
Note, selecting 'zfs-initramfs' instead of './zfs-initramfs_2.2.5-1_all.deb'
Note, selecting 'zfs-test' instead of './zfs-test_2.2.5-1_arm64.deb'
Note, selecting 'zfs-test-dbgsym' instead of './zfs-test-dbgsym_2.2.5-1_arm64.deb'
Note, selecting 'zfsutils-linux' instead of './zfsutils-linux_2.2.5-1_arm64.deb'
Note, selecting 'zfsutils-linux-dbgsym' instead of './zfsutils-linux-dbgsym_2.2.5-1_arm64.deb'
Note, selecting 'zfs-zed' instead of './zfs-zed_2.2.5-1_arm64.deb'
Note, selecting 'zfs-zed-dbgsym' instead of './zfs-zed-dbgsym_2.2.5-1_arm64.deb'
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
distribution that some required packages have not yet been created
or been moved out of Incoming.
The following information may help to resolve the situation:

The following packages have unmet dependencies:
 libpam-zfs : Depends: libssl3 (>= 3.0.0) but it is not installable
 libuutil3linux : Depends: libc6 (>= 2.34) but 2.31-13+deb11u10 is to be installed
 libzfs4linux : Depends: libc6 (>= 2.34) but 2.31-13+deb11u10 is to be installed
                Depends: libssl3 (>= 3.0.0) but it is not installable
 libzpool5linux : Depends: libc6 (>= 2.34) but 2.31-13+deb11u10 is to be installed
 pyzfs-doc : Depends: libjs-sphinxdoc (>= 5.2) but it is not going to be installed
 zfs-initramfs : Depends: initramfs-tools but it is not installable
 zfs-test : Depends: libc6 (>= 2.34) but 2.31-13+deb11u10 is to be installed
            Recommends: nfs-kernel-server but it is not going to be installed
            Recommends: rsync but it is not going to be installed
            Recommends: tzdata-legacy but it is not installable
 zfs-zed : Depends: libc6 (>= 2.34) but 2.31-13+deb11u10 is to be installed
 zfsutils-linux : Depends: libc6 (>= 2.34) but 2.31-13+deb11u10 is to be installed
                  Depends: libssl3 (>= 3.0.0) but it is not installable
E: Unable to correct problems, you have held broken packages.
rock@rock-3a:~$

@CodeChenL
Copy link
Contributor Author

另外客户邮件又问cm3和cm5什么时候上bookworm

@RadxaYuntian
Copy link
Member

你用debian 12测试

@CodeChenL
Copy link
Contributor Author

你用debian 12测试

测试结果

Results Summary
PASS     1645
FAIL      32
SKIP      65
KILLED     1

Running Time:   06:53:22
Percent passed: 94.4%
Log directory:  /var/tmp/test_results/20240830T111913

Tests with results other than PASS that are expected:
    FAIL casenorm/mixed_formd_delete (https://github.com/openzfs/zfs/issues/7633)
    FAIL casenorm/mixed_formd_lookup (https://github.com/openzfs/zfs/issues/7633)
    FAIL casenorm/mixed_formd_lookup_ci (https://github.com/openzfs/zfs/issues/7633)
    FAIL casenorm/mixed_none_lookup_ci (https://github.com/openzfs/zfs/issues/7633)
    FAIL casenorm/sensitive_formd_delete (https://github.com/openzfs/zfs/issues/7633)
    FAIL casenorm/sensitive_formd_lookup (https://github.com/openzfs/zfs/issues/7633)
    FAIL cli_root/zpool_import/import_rewind_device_replaced (Arbitrary pool rewind is not guaranteed)
    SKIP cli_root/zpool_import/zpool_import_missing_003_pos (https://github.com/openzfs/zfs/issues/6839)
    SKIP pam/setup (pamtester might be not available)
    SKIP pool_checkpoint/checkpoint_discard_busy (https://github.com/openzfs/zfs/issues/12053)
    FAIL refreserv/refreserv_004_pos (Known issue)
    SKIP removal/removal_with_zdb (Known issue)
    FAIL reservation/reservation_008_pos (https://github.com/openzfs/zfs/issues/7741)
    SKIP rsend/rsend_008_pos (https://github.com/openzfs/zfs/issues/6066)
    FAIL vdev_zaps/vdev_zaps_007_pos (Known issue)

Tests with result of PASS that are unexpected:

Tests with results other than PASS that are unexpected:
    FAIL cli_root/zfs_unshare/zfs_unshare_006_pos (expected PASS)
    FAIL cli_root/zpool_create/cleanup (expected PASS)
    SKIP cli_root/zpool_expand/zpool_expand_001_pos (expected PASS)
    SKIP cli_root/zpool_expand/zpool_expand_003_neg (expected PASS)
    SKIP cli_root/zpool_expand/zpool_expand_005_pos (expected PASS)
    FAIL cli_root/zpool_export/setup (expected PASS)
    SKIP cli_root/zpool_export/zpool_export_001_pos (expected PASS)
    SKIP cli_root/zpool_export/zpool_export_002_pos (expected PASS)
    SKIP cli_root/zpool_export/zpool_export_003_neg (expected PASS)
    SKIP cli_root/zpool_export/zpool_export_004_pos (expected PASS)
    FAIL cli_root/zpool_remove/cleanup (expected PASS)
    FAIL cli_root/zpool_reopen/cleanup (expected PASS)
    FAIL cli_root/zpool_reopen/setup (expected PASS)
    SKIP cli_root/zpool_reopen/zpool_reopen_001_pos (expected PASS)
    SKIP cli_root/zpool_reopen/zpool_reopen_002_pos (expected PASS)
    SKIP cli_root/zpool_reopen/zpool_reopen_003_pos (expected PASS)
    SKIP cli_root/zpool_reopen/zpool_reopen_004_pos (expected PASS)
    SKIP cli_root/zpool_reopen/zpool_reopen_005_pos (expected PASS)
    SKIP cli_root/zpool_reopen/zpool_reopen_006_neg (expected PASS)
    SKIP cli_root/zpool_reopen/zpool_reopen_007_pos (expected PASS)
    FAIL cli_root/zpool_resilver/zpool_resilver_restart (expected PASS)
    FAIL cli_root/zpool_scrub/zpool_scrub_offline_device (expected PASS)
    SKIP cli_root/zpool_split/zpool_split_wholedisk (expected PASS)
    KILLED cp_files/cp_stress (expected PASS)
    SKIP fault/auto_offline_001_pos (expected PASS)
    SKIP fault/auto_online_001_pos (expected PASS)
    SKIP fault/auto_online_002_pos (expected PASS)
    SKIP fault/auto_replace_001_pos (expected PASS)
    SKIP fault/auto_replace_002_pos (expected PASS)
    SKIP fault/auto_spare_001_pos (expected PASS)
    SKIP fault/auto_spare_002_pos (expected PASS)
    SKIP fault/auto_spare_ashift (expected PASS)
    SKIP fault/auto_spare_multiple (expected PASS)
    SKIP fault/auto_spare_shared (expected PASS)
    FAIL fault/cleanup (expected PASS)
    SKIP fault/decompress_fault (expected PASS)
    SKIP fault/decrypt_fault (expected PASS)
    SKIP fault/scrub_after_resilver (expected PASS)
    FAIL fault/setup (expected PASS)
    SKIP fault/suspend_resume_single (expected PASS)
    SKIP fault/zpool_status_-s (expected PASS)
    FAIL inuse/inuse_005_pos (expected PASS)
    FAIL inuse/inuse_008_pos (expected PASS)
    FAIL inuse/inuse_009_pos (expected PASS)
    FAIL migration/cleanup (expected PASS)
    SKIP migration/migration_001_pos (expected PASS)
    SKIP migration/migration_002_pos (expected PASS)
    SKIP migration/migration_003_pos (expected PASS)
    SKIP migration/migration_004_pos (expected PASS)
    SKIP migration/migration_005_pos (expected PASS)
    SKIP migration/migration_006_pos (expected PASS)
    SKIP migration/migration_007_pos (expected PASS)
    SKIP migration/migration_008_pos (expected PASS)
    SKIP migration/migration_009_pos (expected PASS)
    SKIP migration/migration_010_pos (expected PASS)
    SKIP migration/migration_011_pos (expected PASS)
    SKIP migration/migration_012_pos (expected PASS)
    FAIL migration/setup (expected PASS)
    SKIP procfs/pool_state (expected PASS)
    FAIL reservation/reservation_009_pos (expected PASS)
    FAIL reservation/reservation_010_pos (expected PASS)
    FAIL reservation/reservation_012_pos (expected PASS)
    FAIL reservation/reservation_015_pos (expected PASS)
    FAIL reservation/reservation_016_pos (expected PASS)
    SKIP simd/simd_supported (expected PASS)
    FAIL zvol/zvol_ENOSPC/setup (expected PASS)
    SKIP zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos (expected PASS)
    FAIL zvol/zvol_cli/setup (expected PASS)
    SKIP zvol/zvol_cli/zvol_cli_001_pos (expected PASS)
    SKIP zvol/zvol_cli/zvol_cli_002_pos (expected PASS)
    SKIP zvol/zvol_cli/zvol_cli_003_neg (expected PASS)
rock@rock-5b:~$

@RadxaYuntian
Copy link
Member

装个x86虚拟机试试看？手动下sid的包，看看结果

@CodeChenL
Copy link
Contributor Author

装个x86虚拟机试试看？手动下sid的包，看看结果

又跑了一次的完整log
zfs-tests.log
我再试试x86 bookworm+sid zfs-dkms

@CodeChenL
Copy link
Contributor Author

在X4L上跑Debian 12 + backport 源的6.10内核和zfs-2.2.5-1~bpo12+1：
test.log
直接使用自带的6.1内核一开始就报错

@RadxaYuntian RadxaYuntian merged commit b811a2b into radxa-pkg:master Sep 4, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RadxaYuntian RadxaYuntian RadxaYuntian left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@CodeChenL @RadxaYuntian