1. 26 Sep, 2024 2 commits
    • Carlos Ramos Carreño's avatar
      Changes in platform detection for buildout. · ce23512d
      Carlos Ramos Carreño authored
      The multiarch strings (GNU target triplets) used currently for platform
      detection are different in Suse, as they include the "vendor" ("suse" or
      "pc" depending on the GCC version) and the OS part is just "linux"
      instead of "linux-gnu".
      
      This changes platform detection to use the constants available in
      buildout for detecting the operating system and the `platform` module
      for detecting the machine, instead of these multiarch strings.
      
      See merge request nexedi/slapos!1648
      ce23512d
    • Jérome Perrin's avatar
      stack/erp5: update pylint patch revision on py2 · 81985a28
      Jérome Perrin authored
      follow up 917296b4 (pylint 1.4: Understands six.{PY2,PY3} import
      guards (already supported on pylint 2)., 2024-09-25)
      81985a28
  2. 25 Sep, 2024 6 commits
  3. 24 Sep, 2024 5 commits
  4. 23 Sep, 2024 9 commits
  5. 20 Sep, 2024 1 commit
  6. 19 Sep, 2024 3 commits
    • Xavier Thompson's avatar
      software/slapos-testing: Quickfix python -E errors · 0fad9a6d
      Xavier Thompson authored
      Since upgrading to zc.buildout = 3.0.1+slapos004, slapos.rebootstrap
      and slapos.recipe.template tests are failing due to: these two tests
      running buildout, buildout installing develop eggs, develop eggs now
      being installed with pip install -e instead of setup.py develop, and
      pip install -e launching sys.executable -E at some point. This fails
      because the tests are run using gpython:main script, which currently
      does not support -E option.
      
      As a quick fix run these two tests with a barebone python executable
      and use export PYTHONPATH to provide the needed eggs. This is not as
      good as gpython:main because PYTHONPATH will be inherited by all sub
      processes and not just those launched with sys.executable, including
      potentially other versions of python.
      0fad9a6d
    • Kazuhiko Shiozaki's avatar
    • Thomas Gambier's avatar
      default software_type is now 'default' · 54ff69a8
      Thomas Gambier authored
      See merge request !1642
      54ff69a8
  7. 18 Sep, 2024 3 commits
    • Jérome Perrin's avatar
      stack/erp5: fix useless parameters in shared frontend requests · aa7e6b2f
      Jérome Perrin authored
      frontends were requested with use-ipv6 and
      computer-memory-percent-threshold parameters
      aa7e6b2f
    • Carlos Ramos Carreño's avatar
      Fix wrong substitution in GCC's fixincludes. · b38ffc80
      Carlos Ramos Carreño authored
      Old GCC versions wrongly patched `__has_include` directives in system
      includes (using fixincludes).
      This was reported in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085,
      and patches to fix this behavior are given in
      https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=6bf383c37e6131a8e247e8a0997d55d65c830b6d
      and are applied upstream in versions above 12.1.
      This commit applies these patches to older GCC versions.
      
      This bug in GCC's fixincludes manifest itself with several seemingly
      unrelated symptoms.
      In particular, there are two conflicting "mount.h" includes, one coming
      from Linux and other from Glibc.
      Newer Glibc included some preprocessor tricks to detect if the Linux
      header has been previously included and prevent incompatibilities by not
      redefining common symbols, thus allowing its header to be included
      *after* the Linux header.
      In case that the header is included *before* the Linux header, it uses
      the aforementioned `__has_include` directive to detect and include the
      Linux header before itself if present, thus preventing its inclusion
      afterwards.
      However, due to the `fixincludes` wrong substitution, the check was
      always false, and thus including the Glibc header before the Linux one
      caused the compilation to fail, with an error similar to:
      
      ```C
      In file included from ./include/mount-api-utils.h:11,
                       from libmount/src/optlist.c:19:
      /usr/include/linux/mount.h:95:6: error: redeclaration of 'enum fsconfig_command'
         95 | enum fsconfig_command {
            |      ^~~~~~~~~~~~~~~~
      In file included from libmount/src/libmount.h:40,
                       from libmount/src/mountP.h:31,
                       from libmount/src/optlist.c:18:
      /opt/slapgrid/0f0705ad6e3e586cc45dcb5c9ab9e5f6/parts/gcc-10.5/lib/gcc/x86_64-pc-linux-gnu/10.5.0/include-fixed/sys/mount.h:249:6: note: originally defined here
        249 | enum fsconfig_command
            |      ^~~~~~~~~~~~~~~~
      /usr/include/linux/mount.h:96:2: error: redeclaration of enumerator 'FSCONFIG_SET_FLAG'
         96 |  FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */
            |  ^~~~~~~~~~~~~~~~~
      /opt/slapgrid/0f0705ad6e3e586cc45dcb5c9ab9e5f6/parts/gcc-10.5/lib/gcc/x86_64-pc-linux-gnu/10.5.0/include-fixed/sys/mount.h:251:3: note: previous definition of 'FSCONFIG_SET_FLAG' was here
        251 |   FSCONFIG_SET_FLAG       = 0,    /* Set parameter, supplying no value */
            |   ^~~~~~~~~~~~~~~~~
      /usr/include/linux/mount.h:97:2: error: redeclaration of enumerator 'FSCONFIG_SET_STRING'
         97 |  FSCONFIG_SET_STRING = 1, /* Set parameter, supplying a string value */
            |  ^~~~~~~~~~~~~~~~~~~
      /opt/slapgrid/0f0705ad6e3e586cc45dcb5c9ab9e5f6/parts/gcc-10.5/lib/gcc/x86_64-pc-linux-gnu/10.5.0/include-fixed/sys/mount.h:253:3: note: previous definition of 'FSCONFIG_SET_STRING' was here
        253 |   FSCONFIG_SET_STRING     = 1,    /* Set parameter, supplying a string value */
            |   ^~~~~~~~~~~~~~~~~~~
      /usr/include/linux/mount.h:98:2: error: redeclaration of enumerator 'FSCONFIG_SET_BINARY'
         98 |  FSCONFIG_SET_BINARY = 2, /* Set parameter, supplying a binary blob value */
            |  ^~~~~~~~~~~~~~~~~~~
      /opt/slapgrid/0f0705ad6e3e586cc45dcb5c9ab9e5f6/parts/gcc-10.5/lib/gcc/x86_64-pc-linux-gnu/10.5.0/include-fixed/sys/mount.h:255:3: note: previous definition of 'FSCONFIG_SET_BINARY' was here
        255 |   FSCONFIG_SET_BINARY     = 2,    /* Set parameter, supplying a binary blob value */
            |   ^~~~~~~~~~~~~~~~~~~
      /usr/include/linux/mount.h:99:2: error: redeclaration of enumerator 'FSCONFIG_SET_PATH'
         99 |  FSCONFIG_SET_PATH = 3, /* Set parameter, supplying an object by path */
            |  ^~~~~~~~~~~~~~~~~
      /opt/slapgrid/0f0705ad6e3e586cc45dcb5c9ab9e5f6/parts/gcc-10.5/lib/gcc/x86_64-pc-linux-gnu/10.5.0/include-fixed/sys/mount.h:257:3: note: previous definition of 'FSCONFIG_SET_PATH' was here
        257 |   FSCONFIG_SET_PATH       = 3,    /* Set parameter, supplying an object by path */
            |   ^~~~~~~~~~~~~~~~~
      /usr/include/linux/mount.h:100:2: error: redeclaration of enumerator 'FSCONFIG_SET_PATH_EMPTY'
        100 |  FSCONFIG_SET_PATH_EMPTY = 4, /* Set parameter, supplying an object by (empty) path */
            |  ^~~~~~~~~~~~~~~~~~~~~~~
      /opt/slapgrid/0f0705ad6e3e586cc45dcb5c9ab9e5f6/parts/gcc-10.5/lib/gcc/x86_64-pc-linux-gnu/10.5.0/include-fixed/sys/mount.h:259:3: note: previous definition of 'FSCONFIG_SET_PATH_EMPTY' was here
        259 |   FSCONFIG_SET_PATH_EMPTY = 4,    /* Set parameter, supplying an object by (empty) path */
            |   ^~~~~~~~~~~~~~~~~~~~~~~
      /usr/include/linux/mount.h:101:2: error: redeclaration of enumerator 'FSCONFIG_SET_FD'
        101 |  FSCONFIG_SET_FD  = 5, /* Set parameter, supplying an object by fd */
            |  ^~~~~~~~~~~~~~~
      /opt/slapgrid/0f0705ad6e3e586cc45dcb5c9ab9e5f6/parts/gcc-10.5/lib/gcc/x86_64-pc-linux-gnu/10.5.0/include-fixed/sys/mount.h:261:3: note: previous definition of 'FSCONFIG_SET_FD' was here
        261 |   FSCONFIG_SET_FD         = 5,    /* Set parameter, supplying an object by fd */
            |   ^~~~~~~~~~~~~~~
      /usr/include/linux/mount.h:102:2: error: redeclaration of enumerator 'FSCONFIG_CMD_CREATE'
        102 |  FSCONFIG_CMD_CREATE = 6, /* Invoke superblock creation */
            |  ^~~~~~~~~~~~~~~~~~~
      /opt/slapgrid/0f0705ad6e3e586cc45dcb5c9ab9e5f6/parts/gcc-10.5/lib/gcc/x86_64-pc-linux-gnu/10.5.0/include-fixed/sys/mount.h:263:3: note: previous definition of 'FSCONFIG_CMD_CREATE' was here
        263 |   FSCONFIG_CMD_CREATE     = 6,    /* Invoke superblock creation */
            |   ^~~~~~~~~~~~~~~~~~~
      /usr/include/linux/mount.h:103:2: error: redeclaration of enumerator 'FSCONFIG_CMD_RECONFIGURE'
        103 |  FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */
            |  ^~~~~~~~~~~~~~~~~~~~~~~~
      /opt/slapgrid/0f0705ad6e3e586cc45dcb5c9ab9e5f6/parts/gcc-10.5/lib/gcc/x86_64-pc-linux-gnu/10.5.0/include-fixed/sys/mount.h:265:3: note: previous definition of 'FSCONFIG_CMD_RECONFIGURE' was here
        265 |   FSCONFIG_CMD_RECONFIGURE = 7,   /* Invoke superblock reconfiguration */
            |   ^~~~~~~~~~~~~~~~~~~~~~~~
      In file included from ./include/mount-api-utils.h:11,
                       from libmount/src/optlist.c:19:
      /usr/include/linux/mount.h:129:8: error: redefinition of 'struct mount_attr'
        129 | struct mount_attr {
            |        ^~~~~~~~~~
      In file included from libmount/src/libmount.h:40,
                       from libmount/src/mountP.h:31,
                       from libmount/src/optlist.c:18:
      /opt/slapgrid/0f0705ad6e3e586cc45dcb5c9ab9e5f6/parts/gcc-10.5/lib/gcc/x86_64-pc-linux-gnu/10.5.0/include-fixed/sys/mount.h:219:8: note: originally defined here
        219 | struct mount_attr
            |        ^~~~~~~~~~
      make[2]: *** [Makefile:12048: libmount/src/la-optlist.lo] Error 1
      ```
      
      This error was originally detected in Nexedi in
      fe60394b (comment 189391)
      by @vpelletier, but no action was taken at the time to solve it.
      Some of its symptoms were detected and fixed individually in
      !1579 and
      !1580 ,
      by reordering the includes, but the above error in libmount, which could
      not be solved that easily, made me delve more into the problem and find
      the root cause.
      
      See merge request !1630
      b38ffc80
    • Joanne Hugé's avatar
      ors-amarisoft: fixup for 2d65d675 · 88fa942b
      Joanne Hugé authored
      88fa942b
  8. 17 Sep, 2024 7 commits
  9. 12 Sep, 2024 1 commit
  10. 11 Sep, 2024 3 commits