CentOS 8: Update build-pkgs script for centos8
R lbzip2 --> bzip2 Since lbzip2 does not have an el8 version, bzip2 is used instead Add config_opts ['package_manager'] = 'dnf' Change-Id: I0e68fcee32484e96363e83dbc38c8469d263b431 Story: 2006844 Task: 37670 Signed-off-by: fuyong <fuyong@neusoft.com>
This commit is contained in:
parent
9d3ca8fa09
commit
30cab9b154
|
@ -4,6 +4,7 @@ config_opts['legal_host_arches'] = ('x86_64',)
|
||||||
config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
|
config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
|
||||||
config_opts['dist'] = 'el8' # only useful for --resultdir variable subst
|
config_opts['dist'] = 'el8' # only useful for --resultdir variable subst
|
||||||
config_opts['releasever'] = '8'
|
config_opts['releasever'] = '8'
|
||||||
|
config_opts['package_manager'] = 'dnf'
|
||||||
|
|
||||||
config_opts['yum.conf'] = """
|
config_opts['yum.conf'] = """
|
||||||
[main]
|
[main]
|
||||||
|
@ -99,9 +100,9 @@ config_opts['environment']['CGCS_GIT_BRANCH'] = 'CGCS_DEV_0019'
|
||||||
config_opts['macros']['%_no_cgcs_license_check'] = '1'
|
config_opts['macros']['%_no_cgcs_license_check'] = '1'
|
||||||
config_opts['macros']['%_tis_build_type'] = 'std'
|
config_opts['macros']['%_tis_build_type'] = 'std'
|
||||||
#config_opts['chroot_setup_cmd'] = 'install @buildsys-build pigz lbzip2 yum shadow-utils rpm-build lbzip2 gcc glibc-headers make gcc-c++ java-devel'
|
#config_opts['chroot_setup_cmd'] = 'install @buildsys-build pigz lbzip2 yum shadow-utils rpm-build lbzip2 gcc glibc-headers make gcc-c++ java-devel'
|
||||||
config_opts['chroot_setup_cmd'] = 'install @buildsys-build pigz shadow-utils rpm-build gcc glibc-headers make gcc-c++ java-devel bash python3'
|
config_opts['chroot_setup_cmd'] = 'install @buildsys-build pigz bzip2 shadow-utils rpm-build gcc glibc-headers make gcc-c++ java-devel bash python3'
|
||||||
config_opts['macros']['%__gzip'] = '/usr/bin/pigz'
|
config_opts['macros']['%__gzip'] = '/usr/bin/pigz'
|
||||||
#config_opts['macros']['%__bzip2'] = '/usr/bin/lbzip2'
|
config_opts['macros']['%__bzip2'] = '/usr/bin/bzip2'
|
||||||
config_opts['macros']['%_patch_confdir'] = '%{_sysconfdir}/patching'
|
config_opts['macros']['%_patch_confdir'] = '%{_sysconfdir}/patching'
|
||||||
config_opts['macros']['%_patch_scripts'] = '%{_patch_confdir}/patch-scripts'
|
config_opts['macros']['%_patch_scripts'] = '%{_patch_confdir}/patch-scripts'
|
||||||
config_opts['macros']['%_runtime_patch_scripts'] = '/run/patching/patch-scripts'
|
config_opts['macros']['%_runtime_patch_scripts'] = '/run/patching/patch-scripts'
|
||||||
|
|
|
@ -100,8 +100,8 @@ fi
|
||||||
#grep -q "config_opts\['chroot_setup_cmd'\] = 'install @buildsys-build pigz lbzip2 yum $NETWORK_PKGS'" $FILE || \
|
#grep -q "config_opts\['chroot_setup_cmd'\] = 'install @buildsys-build pigz lbzip2 yum $NETWORK_PKGS'" $FILE || \
|
||||||
# echo "config_opts['chroot_setup_cmd'] = 'install @buildsys-build pigz lbzip2 yum $NETWORK_PKGS'" >> $FILE
|
# echo "config_opts['chroot_setup_cmd'] = 'install @buildsys-build pigz lbzip2 yum $NETWORK_PKGS'" >> $FILE
|
||||||
|
|
||||||
grep -q "config_opts\['chroot_setup_cmd'\] = 'install @buildsys-build pigz bash python3 $NETWORK_PKGS'" $FILE || \
|
grep -q "config_opts\['chroot_setup_cmd'\] = 'install @buildsys-build pigz bzip2 bash python3 $NETWORK_PKGS'" $FILE || \
|
||||||
echo "config_opts['chroot_setup_cmd'] = 'install @buildsys-build pigz bash python3 $NETWORK_PKGS'" >> $FILE
|
echo "config_opts['chroot_setup_cmd'] = 'install @buildsys-build pigz bzip2 bash python3 $NETWORK_PKGS'" >> $FILE
|
||||||
|
|
||||||
# Special case for containers.
|
# Special case for containers.
|
||||||
# rpmbuild_networking is required for invoking helm commands within mock
|
# rpmbuild_networking is required for invoking helm commands within mock
|
||||||
|
|
|
@ -4,6 +4,7 @@ config_opts['legal_host_arches'] = ('x86_64',)
|
||||||
config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
|
config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
|
||||||
config_opts['dist'] = 'el8' # only useful for --resultdir variable subst
|
config_opts['dist'] = 'el8' # only useful for --resultdir variable subst
|
||||||
config_opts['releasever'] = '8'
|
config_opts['releasever'] = '8'
|
||||||
|
config_opts['package_manager'] = 'dnf'
|
||||||
config_opts['rpmbuild_networking'] = False
|
config_opts['rpmbuild_networking'] = False
|
||||||
|
|
||||||
config_opts['yum.conf'] = """
|
config_opts['yum.conf'] = """
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# config file as 'macros' passed into the RPM build
|
# config file as 'macros' passed into the RPM build
|
||||||
#
|
#
|
||||||
%__gzip=/usr/bin/pigz
|
%__gzip=/usr/bin/pigz
|
||||||
%__bzip2=/usr/bin/lbzip2
|
%__bzip2=/usr/bin/bzip2
|
||||||
%_patch_confdir=%{_sysconfdir}/patching
|
%_patch_confdir=%{_sysconfdir}/patching
|
||||||
%_patch_scripts=%{_patch_confdir}/patch-scripts
|
%_patch_scripts=%{_patch_confdir}/patch-scripts
|
||||||
%_runtime_patch_scripts=/run/patching/patch-scripts
|
%_runtime_patch_scripts=/run/patching/patch-scripts
|
||||||
|
|
Loading…
Reference in New Issue