commit fa6fc26d93b32c0b152650970d367a50f90eacf3 · pyrox.dev/nixpkgs

+72

pkgs/misc/uboot/binman-resources.patch

···

       1
       1
       +
       (Patch from https://lists.denx.de/pipermail/u-boot/2024-July/559077.html)

     

       2
       2
       +
       

     

       3
       3
       +
       

     

       4
       4
       +
       pkg_resources is deprecated long ago and being removed in python 3.12.

     

       5
       5
       +
       

     

       6
       6
       +
       Reimplement functions with importlib.resources.

     

       7
       7
       +
       

     

       8
       8
       +
       Link: https://docs.python.org/3/library/importlib.resources.html

     

       9
       9
       +
       Signed-off-by: Jiaxun Yang <jiaxun.yang at flygoat.com>

     

       10
       10
       +
       ---

     

       11
       11
       +
        tools/binman/control.py | 18 +++++++++---------

     

       12
       12
       +
        1 file changed, 9 insertions(+), 9 deletions(-)

     

       13
       13
       +
       

     

       14
       14
       +
       diff --git a/tools/binman/control.py b/tools/binman/control.py

     

       15
       15
       +
       index 2f00279232b8..5549b0ad2185 100644

     

       16
       16
       +
       --- a/tools/binman/control.py

     

       17
       17
       +
       +++ b/tools/binman/control.py

     

       18
       18
       +
       @@ -8,12 +8,11 @@

     

       19
       19
       +
        from collections import OrderedDict

     

       20
       20
       +
        import glob

     

       21
       21
       +
        try:

     

       22
       22
       +
       -    import importlib.resources

     

       23
       23
       +
       -except ImportError:  # pragma: no cover

     

       24
       24
       +
       +    from importlib import resources

     

       25
       25
       +
       +except ImportError:

     

       26
       26
       +
            # for Python 3.6

     

       27
       27
       +
       -    import importlib_resources

     

       28
       28
       +
       +    import importlib_resources as resources

     

       29
       29
       +
        import os

     

       30
       30
       +
       -import pkg_resources

     

       31
       31
       +
        import re

     

       32
       32
       +
        

     

       33
       33
       +
        import sys

     

       34
       34
       +
       @@ -96,12 +95,12 @@ def _ReadMissingBlobHelp():

     

       35
       35
       +
                    msg = ''

     

       36
       36
       +
                return tag, msg

     

       37
       37
       +
        

     

       38
       38
       +
       -    my_data = pkg_resources.resource_string(__name__, 'missing-blob-help')

     

       39
       39
       +
       +    my_data = resources.files(__package__).joinpath('missing-blob-help').read_text()

     

       40
       40
       +
            re_tag = re.compile('^([-a-z0-9]+):$')

     

       41
       41
       +
            result = {}

     

       42
       42
       +
            tag = None

     

       43
       43
       +
            msg = ''

     

       44
       44
       +
       -    for line in my_data.decode('utf-8').splitlines():

     

       45
       45
       +
       +    for line in my_data.splitlines():

     

       46
       46
       +
                if not line.startswith('#'):

     

       47
       47
       +
                    m_tag = re_tag.match(line)

     

       48
       48
       +
                    if m_tag:

     

       49
       49
       +
       @@ -151,8 +150,9 @@ def GetEntryModules(include_testing=True):

     

       50
       50
       +
            Returns:

     

       51
       51
       +
                Set of paths to entry class filenames

     

       52
       52
       +
            """

     

       53
       53
       +
       -    glob_list = pkg_resources.resource_listdir(__name__, 'etype')

     

       54
       54
       +
       -    glob_list = [fname for fname in glob_list if fname.endswith('.py')]

     

       55
       55
       +
       +    directory = resources.files("binman.etype")

     

       56
       56
       +
       +    glob_list = [entry.name for entry in directory.iterdir()

     

       57
       57
       +
       +                 if entry.name.endswith('.py')]

     

       58
       58
       +
            return set([os.path.splitext(os.path.basename(item))[0]

     

       59
       59
       +
                        for item in glob_list

     

       60
       60
       +
                        if include_testing or '_testing' not in item])

     

       61
       61
       +
       @@ -735,7 +735,7 @@ def Binman(args):

     

       62
       62
       +
            global state

     

       63
       63
       +
        

     

       64
       64
       +
            if args.full_help:

     

       65
       65
       +
       -        with importlib.resources.path('binman', 'README.rst') as readme:

     

       66
       66
       +
       +        with resources.path('binman', 'README.rst') as readme:

     

       67
       67
       +
                    tools.print_full_help(str(readme))

     

       68
       68
       +
                return 0

     

       69
       69
       +
        

     

       70
       70
       +
       

     

       71
       71
       +
       -- 

     

       72
       72
       +
       2.45.2

pkgs/misc/uboot/default.nix

···

       29
       29
        
         armTrustedFirmwareS905,

     

       30
       30
        
         opensbi,

     

       31
       31
        
         buildPackages,

     

       32
       32
       +
         callPackages,

     

       32
       33
        
         darwin,

     

       33
       34
        
       }@pkgs:

     

       34
       35
        
       

     
···

       198
       199
        
       

     

       199
       200
        
           filesToInstall = [

     

       200
       201
        
             "tools/dumpimage"

     

       202
       202
       +
             "tools/fdt_add_pubkey"

     

       201
       203
        
             "tools/fdtgrep"

     

       202
       204
        
             "tools/kwboot"

     

       205
       205
       +
             "tools/mkeficapsule"

     

       203
       206
        
             "tools/mkenvimage"

     

       204
       207
        
             "tools/mkimage"

     

       205
       208
        
             "tools/env/fw_printenv"

     
···

       210
       213
        
             "tools/efivar.py" = (python3.withPackages (ps: [ ps.pyopenssl ]));

     

       211
       214
        
           };

     

       212
       215
        
         };

     

       216
       216
       +
       

     

       217
       217
       +
         ubootPythonTools = lib.recurseIntoAttrs (callPackages ./python.nix { });

     

       213
       218
        
       

     

       214
       219
        
         ubootA20OlinuxinoLime = buildUBoot {

     

       215
       220
        
           defconfig = "A20-OLinuXino-Lime_defconfig";

+160

pkgs/misc/uboot/python.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         python3Packages,

     

       4
       4
       +
         fetchPypi,

     

       5
       5
       +
         makeWrapper,

     

       6
       6
       +
       

     

       7
       7
       +
         armTrustedFirmwareTools,

     

       8
       8
       +
         bzip2,

     

       9
       9
       +
         cbfstool,

     

       10
       10
       +
         gzip,

     

       11
       11
       +
         lz4,

     

       12
       12
       +
         lzop,

     

       13
       13
       +
         openssl,

     

       14
       14
       +
         ubootTools,

     

       15
       15
       +
         vboot_reference,

     

       16
       16
       +
         xilinx-bootgen,

     

       17
       17
       +
         xz,

     

       18
       18
       +
         zstd,

     

       19
       19
       +
       }:

     

       20
       20
       +
       

     

       21
       21
       +
       let

     

       22
       22
       +
         # We are fetching from PyPI because the code in the repository seems to be

     

       23
       23
       +
         # lagging behind the PyPI releases somehow...

     

       24
       24
       +
         version = "0.0.7";

     

       25
       25
       +
       in

     

       26
       26
       +
       rec {

     

       27
       27
       +
       

     

       28
       28
       +
         u_boot_pylib = python3Packages.buildPythonPackage rec {

     

       29
       29
       +
           pname = "u_boot_pylib";

     

       30
       30
       +
           inherit version;

     

       31
       31
       +
           pyproject = true;

     

       32
       32
       +
       

     

       33
       33
       +
           src = fetchPypi {

     

       34
       34
       +
             inherit pname version;

     

       35
       35
       +
             hash = "sha256-A5r20Y8mgxhOhaKMpd5MJN5ubzPbkodAO0Tr0RN1SRA=";

     

       36
       36
       +
           };

     

       37
       37
       +
       

     

       38
       38
       +
           build-system = with python3Packages; [

     

       39
       39
       +
             setuptools

     

       40
       40
       +
           ];

     

       41
       41
       +
       

     

       42
       42
       +
           checkPhase = ''

     

       43
       43
       +
             ${python3Packages.python.interpreter} "src/$pname/__main__.py"

     

       44
       44
       +
             # There are some tests in other files, but they are broken

     

       45
       45
       +
           '';

     

       46
       46
       +
       

     

       47
       47
       +
           pythonImportsCheck = [ "u_boot_pylib" ];

     

       48
       48
       +
         };

     

       49
       49
       +
       

     

       50
       50
       +
         dtoc = python3Packages.buildPythonPackage rec {

     

       51
       51
       +
           pname = "dtoc";

     

       52
       52
       +
           inherit version;

     

       53
       53
       +
           pyproject = true;

     

       54
       54
       +
       

     

       55
       55
       +
           src = fetchPypi {

     

       56
       56
       +
             inherit pname version;

     

       57
       57
       +
             hash = "sha256-NA96CznIxjqpw2Ik8AJpJkJ/ei+kQTCUExwFgssV+CM=";

     

       58
       58
       +
           };

     

       59
       59
       +
       

     

       60
       60
       +
           build-system = with python3Packages; [

     

       61
       61
       +
             setuptools

     

       62
       62
       +
           ];

     

       63
       63
       +
       

     

       64
       64
       +
           dependencies =

     

       65
       65
       +
             (with python3Packages; [

     

       66
       66
       +
               libfdt

     

       67
       67
       +
             ])

     

       68
       68
       +
             ++ [

     

       69
       69
       +
               u_boot_pylib

     

       70
       70
       +
             ];

     

       71
       71
       +
       

     

       72
       72
       +
           pythonImportsCheck = [ "dtoc" ];

     

       73
       73
       +
         };

     

       74
       74
       +
       

     

       75
       75
       +
         binman =

     

       76
       76
       +
           let

     

       77
       77
       +
             btools = [

     

       78
       78
       +
               armTrustedFirmwareTools

     

       79
       79
       +
               bzip2

     

       80
       80
       +
               cbfstool

     

       81
       81
       +
               # TODO: cst

     

       82
       82
       +
               gzip

     

       83
       83
       +
               lz4

     

       84
       84
       +
               # TODO: lzma_alone

     

       85
       85
       +
               lzop

     

       86
       86
       +
               openssl

     

       87
       87
       +
               ubootTools

     

       88
       88
       +
               vboot_reference

     

       89
       89
       +
               xilinx-bootgen

     

       90
       90
       +
               xz

     

       91
       91
       +
               zstd

     

       92
       92
       +
             ];

     

       93
       93
       +
           in

     

       94
       94
       +
           python3Packages.buildPythonApplication rec {

     

       95
       95
       +
             pname = "binary_manager";

     

       96
       96
       +
             inherit version;

     

       97
       97
       +
             pyproject = true;

     

       98
       98
       +
       

     

       99
       99
       +
             src = fetchPypi {

     

       100
       100
       +
               inherit pname version;

     

       101
       101
       +
               hash = "sha256-llEBBhUoW5jTEQeoaTCjZN8y6Kj+PGNUSB3cKpgD06w=";

     

       102
       102
       +
             };

     

       103
       103
       +
       

     

       104
       104
       +
             patches = [

     

       105
       105
       +
               ./binman-resources.patch

     

       106
       106
       +
             ];

     

       107
       107
       +
             patchFlags = [

     

       108
       108
       +
               "-p2"

     

       109
       109
       +
               "-d"

     

       110
       110
       +
               "src"

     

       111
       111
       +
             ];

     

       112
       112
       +
       

     

       113
       113
       +
             build-system = with python3Packages; [

     

       114
       114
       +
               setuptools

     

       115
       115
       +
             ];

     

       116
       116
       +
       

     

       117
       117
       +
             nativeBuildInputs = [ makeWrapper ];

     

       118
       118
       +
       

     

       119
       119
       +
             dependencies =

     

       120
       120
       +
               (with python3Packages; [

     

       121
       121
       +
                 jsonschema

     

       122
       122
       +
                 pycryptodomex

     

       123
       123
       +
                 pyelftools

     

       124
       124
       +
                 yamllint

     

       125
       125
       +
               ])

     

       126
       126
       +
               ++ [

     

       127
       127
       +
                 dtoc

     

       128
       128
       +
                 u_boot_pylib

     

       129
       129
       +
               ];

     

       130
       130
       +
       

     

       131
       131
       +
             preFixup = ''

     

       132
       132
       +
               wrapProgram "$out/bin/binman" --prefix PATH : "${lib.makeBinPath btools}"

     

       133
       133
       +
             '';

     

       134
       134
       +
           };

     

       135
       135
       +
       

     

       136
       136
       +
         patman = python3Packages.buildPythonApplication rec {

     

       137
       137
       +
           pname = "patch_manager";

     

       138
       138
       +
           inherit version;

     

       139
       139
       +
           pyproject = true;

     

       140
       140
       +
       

     

       141
       141
       +
           src = fetchPypi {

     

       142
       142
       +
             inherit pname version;

     

       143
       143
       +
             hash = "sha256-zD9e87fpWKynpUcfxobbdk6wbM6Ja3f8hEVHS7DGIKQ=";

     

       144
       144
       +
           };

     

       145
       145
       +
       

     

       146
       146
       +
           build-system = with python3Packages; [

     

       147
       147
       +
             setuptools

     

       148
       148
       +
           ];

     

       149
       149
       +
       

     

       150
       150
       +
           dependencies =

     

       151
       151
       +
             (with python3Packages; [

     

       152
       152
       +
               aiohttp

     

       153
       153
       +
               pygit2

     

       154
       154
       +
             ])

     

       155
       155
       +
             ++ [

     

       156
       156
       +
               u_boot_pylib

     

       157
       157
       +
             ];

     

       158
       158
       +
         };

     

       159
       159
       +
       

     

       160
       160
       +
       }

pkgs/top-level/all-packages.nix

···

       10780
       10780
        
         inherit (callPackage ../misc/uboot { })

     

       10781
       10781
        
           buildUBoot

     

       10782
       10782
        
           ubootTools

     

       10783
       10783
       +
           ubootPythonTools

     

       10783
       10784
        
           ubootA20OlinuxinoLime

     

       10784
       10785
        
           ubootA20OlinuxinoLime2EMMC

     

       10785
       10786
        
           ubootBananaPi