summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorSamuel Cabrero <scabrero@suse.de>2019-03-22 12:37:13 +0100
committerStefan Metzmacher <metze@samba.org>2019-04-18 12:09:33 +0000
commitaa29211be7fa4ddd6393db8c087b37ab322fc682 (patch)
tree023c88d340e8ae4b85fd9e94d225bd43edf142dc /bootstrap
parentf749f17f22e7a0b7fd9f2087313de537ebc06537 (diff)
downloadsamba-aa29211be7fa4ddd6393db8c087b37ab322fc682.tar.gz
bootstrap/config.py: Use generic lsb-release package name
Signed-off-by: Samuel Cabrero <scabrero@suse.de> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'bootstrap')
-rw-r--r--bootstrap/config.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 8b78d7f7f22..3101dce7f20 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -116,7 +116,7 @@ PKGS = [
('apt-utils', 'yum-utils'),
('pkg-config', 'pkgconfig'),
('procps', 'procps-ng'), # required for the free cmd in tests
- ('lsb-release', 'redhat-lsb'), # we need lsb_relase to show info
+ ('lsb-release', 'lsb-release'), # we need lsb_relase to show info
('', 'rpcgen'), # required for test
# refer: https://fedoraproject.org/wiki/Changes/SunRPCRemoval
('', 'libtirpc-devel'), # for <rpc/rpc.h> header on fedora
@@ -381,6 +381,7 @@ RPM_DISTS = {
'vagrant_box': 'centos/6',
'bootstrap': YUM_BOOTSTRAP,
'replace': {
+ 'lsb-release': 'redhat-lsb',
'python3-devel': 'python34-devel',
'python2-gpg': 'pygpgme',
'python3-gpg': '', # no python3-gpg yet
@@ -398,6 +399,7 @@ RPM_DISTS = {
'vagrant_box': 'centos/7',
'bootstrap': YUM_BOOTSTRAP,
'replace': {
+ 'lsb-release': 'redhat-lsb',
'python3-devel': 'python34-devel',
# although python36-devel is available
# after epel-release installed
@@ -416,11 +418,17 @@ RPM_DISTS = {
'docker_image': 'fedora:28',
'vagrant_box': 'fedora/28-cloud-base',
'bootstrap': DNF_BOOTSTRAP,
+ 'replace': {
+ 'lsb-release': 'redhat-lsb',
+ }
},
'fedora29': {
'docker_image': 'fedora:29',
'vagrant_box': 'fedora/29-cloud-base',
'bootstrap': DNF_BOOTSTRAP,
+ 'replace': {
+ 'lsb-release': 'redhat-lsb',
+ }
},
}