sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a692673b90
diskimage-builder/diskimage_builder/elements/pip-and-virtualenv/pkg-map

38 lines
809 B
Plaintext
Raw Normal View History

add pkg-map to pip-and-virtualenv element Add a pkg-map file so that Gentoo can avoid polluting the FS with files not tracked in the package manager. Changed the directory name so that the source-install method would actually be disabled when DIB_INSTALLTYPE_pip_and_virtualenv=package is set. Also changed source-repository line to be consistent with the element name. Change-Id: I5225bd7113ff2588c755ad4cd4ae9a2d78fff196
2016-03-20 03:16:49 +00:00
{
Add version-less RHEL element for RHEL7 and RHEL8 Make a version-less RHEL element to handle both '7' and '8' DIB_RELEASE. The element usage should align with other elements which operate in the same way such as the Fedora element. Additionally, this patch adds support for RHEL8 that operates with Python 3. As of now, users of diskimage-builder will still be able to use the 'rhel7' element, or migrate to 'rhel' and specify their respective DIB_RELEASE value. * mount the xfs file-system for extraction as read-only. vaguely based on explaination in [1] and the fact we only read the image data into a tar, so can ignore this. XFS (dm-1): Superblock has unknown read-only compatible features (0x4) enabled. * Use the redhat system python as the dib-python version. dib was ahead of it's time making an abstracted python interpreter for system work ;) the system python should work for running the various dib element scripts. [1] https://unix.stackexchange.com/questions/247550/unmountable-xfs-filesystem Redhat-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1700253 Co-Authored-By: Ian Wienand <iwienand@redhat.com> Change-Id: I90540675c70bb475d9db2ae24f81c648a31f3f95
2019-03-17 09:54:38 +00:00
"release": {
"rhel": {
"8": {
"python3-dev": "platform-python-devel"
}
}
},
add pkg-map to pip-and-virtualenv element Add a pkg-map file so that Gentoo can avoid polluting the FS with files not tracked in the package manager. Changed the directory name so that the source-install method would actually be disabled when DIB_INSTALLTYPE_pip_and_virtualenv=package is set. Also changed source-repository line to be consistent with the element name. Change-Id: I5225bd7113ff2588c755ad4cd4ae9a2d78fff196
2016-03-20 03:16:49 +00:00
"family": {
pip-and-virtualenv: include python3-venv for Debuntu This package is not installed by default on Debuntu, but is on RH platforms. This is causing a build breakage as DIB_PYTHON_VIRTUALENV tries to use this (I3414fb9e503f94ff744b560eff9ec0f4afdbb50e). Add the package. Change-Id: I9a551c57dd128bbb4b095c847f634c777b2cb553
2019-10-25 04:41:54 +00:00
"debian": {
"python3-venv": "python3-venv"
},
add pkg-map to pip-and-virtualenv element Add a pkg-map file so that Gentoo can avoid polluting the FS with files not tracked in the package manager. Changed the directory name so that the source-install method would actually be disabled when DIB_INSTALLTYPE_pip_and_virtualenv=package is set. Also changed source-repository line to be consistent with the element name. Change-Id: I5225bd7113ff2588c755ad4cd4ae9a2d78fff196
2016-03-20 03:16:49 +00:00
"gentoo": {
"python-pip": "dev-python/pip",
update pkg-map entries for python3 Map python3 packages properly, or else we get invalid package names. Change-Id: I7af8621c856c689840a11d3cb9d094f02a0b9593
2016-12-24 02:02:38 +00:00
"python3-pip": "dev-python/pip",
Fix pip-and-virtualenv to work with python3 We are explicitly calling python in this element which does not work on systems which only have python3. Change-Id: Ia730850a48e2478fd5461710a9d2619408725cd8
2016-12-06 21:51:13 +00:00
"python-virtualenv": "dev-python/virtualenv",
update pkg-map entries for python3 Map python3 packages properly, or else we get invalid package names. Change-Id: I7af8621c856c689840a11d3cb9d094f02a0b9593
2016-12-24 02:02:38 +00:00
"python3-virtualenv": "dev-python/virtualenv",
"python-dev": "dev-lang/python",
Fix pip-and-virtualenv to work with python3 We are explicitly calling python in this element which does not work on systems which only have python3. Change-Id: Ia730850a48e2478fd5461710a9d2619408725cd8
2016-12-06 21:51:13 +00:00
"python3-dev": "dev-lang/python"
elements: pip-and-virtualenv: Add python-xml dependency SUSE packages the 'xml' python module as a separate package so make sure it's pulled in before we attempt to install the pip module since the latter depends on it. Fixes the following problem when building with the opensuse-minimal and pip-and-virtualenv elements: Traceback (most recent call last): File "/tmp/get-pip.py", line 19177, in <module> main() File "/tmp/get-pip.py", line 194, in main bootstrap(tmpdir=tmpdir) File "/tmp/get-pip.py", line 82, in bootstrap import pip File "/tmp/tmpOiESjX/pip.zip/pip/__init__.py", line 16, in <module> File "/tmp/tmpOiESjX/pip.zip/pip/vcs/subversion.py", line 9, in <module> File "/tmp/tmpOiESjX/pip.zip/pip/index.py", line 32, in <module> File "/tmp/tmpOiESjX/pip.zip/pip/_vendor/html5lib/__init__.py", line 16, in <module> File "/tmp/tmpOiESjX/pip.zip/pip/_vendor/html5lib/html5parser.py", line 6, in <module> File "/tmp/tmpOiESjX/pip.zip/pip/_vendor/html5lib/inputstream.py", line 10, in <module> File "/tmp/tmpOiESjX/pip.zip/pip/_vendor/html5lib/utils.py", line 10, in <module> ImportError: No module named xml.etree.ElementTree Change-Id: I1bec12dfcde05fb07f41bcec994148c3eacbb287
2016-10-20 17:53:30 +00:00
},
Fix pip-and-virtualenv to work with python3 We are explicitly calling python in this element which does not work on systems which only have python3. Change-Id: Ia730850a48e2478fd5461710a9d2619408725cd8
2016-12-06 21:51:13 +00:00
"suse": {
"python-xml": "python-xml",
On suse the python2 dev package is python-devel This was previously defined as python2-devel (which is what rhel uses), but the actual package name is python-devel. See: https://software.opensuse.org/package/python-devel Change-Id: Id61e5b05772d10c32b33d3e70cb64d5ebdcba6e4
2017-06-16 18:26:31 +00:00
"python-dev": "python-devel",
pip-and-virtualenv: Install python3 on openSUSE The python3 package actually contains some core modules (like the xml one) which are not present in the python3-base on which is pulled by the python3-devel package. As such, it's best to have it installed similar to python-xml for python2. Change-Id: I5cd5d1127ae62d6753c2ace44965179c5400bb9a
2017-06-28 21:32:38 +00:00
"python3-dev": "python3-devel",
"python3": "python3"
Fix pip-and-virtualenv to work with python3 We are explicitly calling python in this element which does not work on systems which only have python3. Change-Id: Ia730850a48e2478fd5461710a9d2619408725cd8
2016-12-06 21:51:13 +00:00
},
"redhat": {
Adjust package mapping for SUSE family package-installs.yaml is installing python-dev, not python2-dev, so we need to adjust the mapping accordingly. In addition, zypper-minimal used an dpkg specific package name, while there is a SUSE equivalent (and zypper-minimal is anyway SUSE family specific) Change-Id: Ia9dd061fa46a514781808d62e5e93b03f75c6745
2017-05-31 14:59:30 +00:00
"python-dev": "python2-devel",
Fix pip-and-virtualenv to work with python3 We are explicitly calling python in this element which does not work on systems which only have python3. Change-Id: Ia730850a48e2478fd5461710a9d2619408725cd8
2016-12-06 21:51:13 +00:00
"python3-dev": "python3-devel"
add pkg-map to pip-and-virtualenv element Add a pkg-map file so that Gentoo can avoid polluting the FS with files not tracked in the package manager. Changed the directory name so that the source-install method would actually be disabled when DIB_INSTALLTYPE_pip_and_virtualenv=package is set. Also changed source-repository line to be consistent with the element name. Change-Id: I5225bd7113ff2588c755ad4cd4ae9a2d78fff196
2016-03-20 03:16:49 +00:00
}
elements: pip-and-virtualenv: Add python-xml dependency SUSE packages the 'xml' python module as a separate package so make sure it's pulled in before we attempt to install the pip module since the latter depends on it. Fixes the following problem when building with the opensuse-minimal and pip-and-virtualenv elements: Traceback (most recent call last): File "/tmp/get-pip.py", line 19177, in <module> main() File "/tmp/get-pip.py", line 194, in main bootstrap(tmpdir=tmpdir) File "/tmp/get-pip.py", line 82, in bootstrap import pip File "/tmp/tmpOiESjX/pip.zip/pip/__init__.py", line 16, in <module> File "/tmp/tmpOiESjX/pip.zip/pip/vcs/subversion.py", line 9, in <module> File "/tmp/tmpOiESjX/pip.zip/pip/index.py", line 32, in <module> File "/tmp/tmpOiESjX/pip.zip/pip/_vendor/html5lib/__init__.py", line 16, in <module> File "/tmp/tmpOiESjX/pip.zip/pip/_vendor/html5lib/html5parser.py", line 6, in <module> File "/tmp/tmpOiESjX/pip.zip/pip/_vendor/html5lib/inputstream.py", line 10, in <module> File "/tmp/tmpOiESjX/pip.zip/pip/_vendor/html5lib/utils.py", line 10, in <module> ImportError: No module named xml.etree.ElementTree Change-Id: I1bec12dfcde05fb07f41bcec994148c3eacbb287
2016-10-20 17:53:30 +00:00
},
"default": {
pip-and-virtualenv: Install python3 on openSUSE The python3 package actually contains some core modules (like the xml one) which are not present in the python3-base on which is pulled by the python3-devel package. As such, it's best to have it installed similar to python-xml for python2. Change-Id: I5cd5d1127ae62d6753c2ace44965179c5400bb9a
2017-06-28 21:32:38 +00:00
"python-xml": "",
pip-and-virtualenv: include python3-venv for Debuntu This package is not installed by default on Debuntu, but is on RH platforms. This is causing a build breakage as DIB_PYTHON_VIRTUALENV tries to use this (I3414fb9e503f94ff744b560eff9ec0f4afdbb50e). Add the package. Change-Id: I9a551c57dd128bbb4b095c847f634c777b2cb553
2019-10-25 04:41:54 +00:00
"python3": "",
"python3-venv": ""
add pkg-map to pip-and-virtualenv element Add a pkg-map file so that Gentoo can avoid polluting the FS with files not tracked in the package manager. Changed the directory name so that the source-install method would actually be disabled when DIB_INSTALLTYPE_pip_and_virtualenv=package is set. Also changed source-repository line to be consistent with the element name. Change-Id: I5225bd7113ff2588c755ad4cd4ae9a2d78fff196
2016-03-20 03:16:49 +00:00
}
}
Reference in New Issue Copy Permalink