starlingx/integ
Code Issues Proposed changes

CentOS 8: Grubby should use python3

Browse Source 
change python to python3 explicitly to fix RPM build

Story: 2007065
Task: 37949
Change-Id: Ibe1e3a5c30d52cdec968f4e2220aa24e27f4d7b0
Signed-off-by: Long Li <lilong-neu@neusoft.com>
This commit is contained in:
Long Li 2019-12-20 13:27:45 +08:00 committed by Lin Shuicheng
parent a7fd513689
commit 767daba76f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grub/grubby/centos/meta_patches/0003-grubby-add-multiboot2.patch
View File

@ -23,10 +23,10 @@ index 28de109..e7bee82 100644
%endif %endif
Requires: findutils Requires: findutils
+BuildRequires: python-setuptools +BuildRequires: python3-setuptools
+Requires: python-devel +Requires: python3-devel
+ +
+%define pythonroot /usr/lib64/python2.7/site-packages +%define pythonroot %python3_sitearch
+ +
%description %description
This package provides a grubby compatibility script that manages This package provides a grubby compatibility script that manages

2
grub/grubby/centos/patches/1001-Add-support-for-updating-grub-cfg-with-multiboot-2.patch
View File

@ -42,7 +42,7 @@ index 0000000..40094b3
--- /dev/null --- /dev/null
+++ b/__init__.py +++ b/__init__.py
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+#!/usr/bin/env python +#!/usr/bin/env python3
+# +#
+# Copyright (c) 2018 Wind River Systems, Inc. +# Copyright (c) 2018 Wind River Systems, Inc.
+# SPDX-License-Identifier: Apache-2.0 +# SPDX-License-Identifier: Apache-2.0