Skip to content
Snippets Groups Projects
  1. Nov 07, 2019
  2. Oct 03, 2019
  3. Oct 01, 2019
  4. Jul 17, 2019
  5. Jun 26, 2019
    • Mike Rapoport's avatar
      scripts/sphinx-pre-install: fix out-of-tree build · 8c69b77a
      Mike Rapoport authored
      
      Build of htmldocs fails for out-of-tree builds:
      
      $ make V=1 O=~/build/kernel/ htmldocs
      make -C /home/rppt/build/kernel -f /home/rppt/git/linux-docs/Makefile htmldocs
      make[1]: Entering directory '/home/rppt/build/kernel'
      make -f /home/rppt/git/linux-docs/scripts/Makefile.build obj=scripts/basic
      rm -f .tmp_quiet_recordmcount
      make -f /home/rppt/git/linux-docs/scripts/Makefile.build obj=Documentation htmldocs
      Can't open Documentation/conf.py at /home/rppt/git/linux-docs/scripts/sphinx-pre-install line 230.
      /home/rppt/git/linux-docs/Documentation/Makefile:80: recipe for target 'htmldocs' failed
      make[2]: *** [htmldocs] Error 2
      
      The scripts/sphinx-pre-install is trying to open files in the current
      directory which is $KBUILD_OUTPUT rather than in $srctree.
      
      Fix it.
      
      Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
      Reviewed-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
      Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
      8c69b77a
  6. Jun 07, 2019
  7. May 30, 2019
    • Thomas Gleixner's avatar
      treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 157 · c942fddf
      Thomas Gleixner authored
      
      Based on 3 normalized pattern(s):
      
        this program is free software you can redistribute it and or modify
        it under the terms of the gnu general public license as published by
        the free software foundation either version 2 of the license or at
        your option any later version this program is distributed in the
        hope that it will be useful but without any warranty without even
        the implied warranty of merchantability or fitness for a particular
        purpose see the gnu general public license for more details
      
        this program is free software you can redistribute it and or modify
        it under the terms of the gnu general public license as published by
        the free software foundation either version 2 of the license or at
        your option any later version [author] [kishon] [vijay] [abraham]
        [i] [kishon]@[ti] [com] this program is distributed in the hope that
        it will be useful but without any warranty without even the implied
        warranty of merchantability or fitness for a particular purpose see
        the gnu general public license for more details
      
        this program is free software you can redistribute it and or modify
        it under the terms of the gnu general public license as published by
        the free software foundation either version 2 of the license or at
        your option any later version [author] [graeme] [gregory]
        [gg]@[slimlogic] [co] [uk] [author] [kishon] [vijay] [abraham] [i]
        [kishon]@[ti] [com] [based] [on] [twl6030]_[usb] [c] [author] [hema]
        [hk] [hemahk]@[ti] [com] this program is distributed in the hope
        that it will be useful but without any warranty without even the
        implied warranty of merchantability or fitness for a particular
        purpose see the gnu general public license for more details
      
      extracted by the scancode license scanner the SPDX license identifier
      
        GPL-2.0-or-later
      
      has been chosen to replace the boilerplate/reference in 1105 file(s).
      
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Reviewed-by: default avatarAllison Randal <allison@lohutok.net>
      Reviewed-by: default avatarRichard Fontana <rfontana@redhat.com>
      Reviewed-by: default avatarKate Stewart <kstewart@linuxfoundation.org>
      Cc: linux-spdx@vger.kernel.org
      Link: https://lkml.kernel.org/r/20190527070033.202006027@linutronix.de
      
      
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      c942fddf
    • Mauro Carvalho Chehab's avatar
      scripts/sphinx-pre-install: always check if version is compatible with build · 9b88ad54
      Mauro Carvalho Chehab authored
      
      Call the script every time a make docs target is selected, on
      a simplified check mode.
      
      With this change, the script will set two vars:
      
      $min_version - obtained from `needs_sphinx` var inside
      	       conf.py (currently, '1.3')
      
      $rec_version - obtained from sphinx/requirements.txt.
      
      With those changes, a target like "make htmldocs" will do:
      
      1) If no sphinx-build/sphinx-build3 is found, it will run
         the script on normal mode as before, checking for all
         system dependencies and providing install hints for the
         needed programs and will abort the build;
      
      2) If no sphinx-build/sphinx-build3 is found, but there is
         a sphinx_${VER}/bin/activate file, and if
         ${VER} >= $min_version (string comparation), it will
         run in full mode, and will recommend to activate the
         virtualenv. If there are multiple virtualenvs, it
         will string sort the versions, recommending the
         highest version and will abort the build;
      
      3) If Sphinx is detected but has a version lower than
         $min_version, it will run in full mode - with will
         recommend creating a virtual env using sphinx/requirements.txt,
         and will abort the build.
      
      4) If Sphinx is detected and version is lower than
         $rec_version, it will run in full mode and will
         recommend creating a virtual env using sphinx/requirements.txt.
      
         In this case, it **won't** abort the build.
      
      5) If Sphinx is detected and version is equal or righer than
         $rec_version it will return just after detecting the
         version ("quick mode"), not checking if are there any
         missing dependencies.
      
      Just like before, if one wants to install Sphinx from the
      distro, it has to call the script manually and use `--no-virtualenv`
      argument to get the hints for his OS:
      
          You should run:
      
      	sudo dnf install -y python3-sphinx python3-sphinx_rtd_theme
      
      While here, add a small help for the three optional arguments
      for the script.
      
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
      Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
      9b88ad54
    • Mauro Carvalho Chehab's avatar
      scripts/sphinx-pre-install: get rid of RHEL7 explicity check · c4c562de
      Mauro Carvalho Chehab authored
      
      RHEL8 was already launched. This test won't get it, and will
      do the wrong thing. Ok, we could fix it, but now we check
      Sphinx version to ensure that it matches the minimal (1.3),
      so there's no need for an explicit check there.
      
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
      Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
      c4c562de
    • Mauro Carvalho Chehab's avatar
      scripts/sphinx-pre-install: make activate hint smarter · 44f42165
      Mauro Carvalho Chehab authored
      
      It is possible that multiple Sphinx virtualenvs are installed
      on a given kernel tree. Change the logic to get the latest
      version of those, as this is probably what the user wants.
      
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
      Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
      44f42165
  8. May 24, 2019
  9. Apr 01, 2019
  10. Sep 08, 2017
  11. Aug 07, 2017
    • Mauro Carvalho Chehab's avatar
      scripts/sphinx-pre-install: add minimum support for RHEL · 9b756a9d
      Mauro Carvalho Chehab authored
      
      RHEL 7.x and clone distros are shipped with Sphinx 1.1.x,
      with is incompatible with Kernel ReST markups.
      
      So, on those systems, the only alternative is to install
      it via a Python virtual environment.
      
      While seeking for "pip" on CentOS 7.3, I noticed that it
      is not really needed, as python-virtualenv has its version
      packaged there already. So, remove this from the list of
      requirements for all distributions.
      
      With regards to PDF, we need at least texlive-tabulary
      extension, but that is not shipped there (at least on
      CentOS). So, disable PDF packages as a whole.
      
      Please notice, however, that texlive + amsmath is needed for
      ReST to properly handle ReST ".. math::" tags. Yet, Sphinx
      fall back to display the LaTeX math expressions as-is, if
      such extension is not available.
      
      So, let's just disable all texlive packages as a whole.
      
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
      Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
      9b756a9d
  12. Jul 23, 2017
Loading