From 767daba76ffe57b2c7f0ab68a7dc6c3d395916f8 Mon Sep 17 00:00:00 2001 From: Long Li Date: Fri, 20 Dec 2019 13:27:45 +0800 Subject: [PATCH] CentOS 8: Grubby should use python3 change python to python3 explicitly to fix RPM build Story: 2007065 Task: 37949 Change-Id: Ibe1e3a5c30d52cdec968f4e2220aa24e27f4d7b0 Signed-off-by: Long Li --- .../centos/meta_patches/0003-grubby-add-multiboot2.patch | 6 +++--- ...Add-support-for-updating-grub-cfg-with-multiboot-2.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/grub/grubby/centos/meta_patches/0003-grubby-add-multiboot2.patch b/grub/grubby/centos/meta_patches/0003-grubby-add-multiboot2.patch index cc7c801f7..cc382d777 100644 --- a/grub/grubby/centos/meta_patches/0003-grubby-add-multiboot2.patch +++ b/grub/grubby/centos/meta_patches/0003-grubby-add-multiboot2.patch @@ -23,10 +23,10 @@ index 28de109..e7bee82 100644 %endif Requires: findutils -+BuildRequires: python-setuptools -+Requires: python-devel ++BuildRequires: python3-setuptools ++Requires: python3-devel + -+%define pythonroot /usr/lib64/python2.7/site-packages ++%define pythonroot %python3_sitearch + %description This package provides a grubby compatibility script that manages diff --git a/grub/grubby/centos/patches/1001-Add-support-for-updating-grub-cfg-with-multiboot-2.patch b/grub/grubby/centos/patches/1001-Add-support-for-updating-grub-cfg-with-multiboot-2.patch index 538879913..abbc2f07e 100644 --- a/grub/grubby/centos/patches/1001-Add-support-for-updating-grub-cfg-with-multiboot-2.patch +++ b/grub/grubby/centos/patches/1001-Add-support-for-updating-grub-cfg-with-multiboot-2.patch @@ -42,7 +42,7 @@ index 0000000..40094b3 --- /dev/null +++ b/__init__.py @@ -0,0 +1,8 @@ -+#!/usr/bin/env python ++#!/usr/bin/env python3 +# +# Copyright (c) 2018 Wind River Systems, Inc. +# SPDX-License-Identifier: Apache-2.0