1dfcde98b1
Added packaging support for Trixie under 'debian/trixie/'. This change brings updates from the 'f/trixie' branch into 'master' to ensure consistent functionality and packaging structure across both branches. grub-efi grub2 grubby Story: 2011360 Task: 53245 Change-Id: I596d3af4d23d7e669b72e8a359cc89ee847d1de2 Signed-off-by: pmp1 <preetham.mp@windriver.com> Signed-off-by: Abhinav Ayyapasetti <ayyapasetti.abhinav@windriver.com>
30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
From 84bb9335c054cbd61fd54f05f1fa43318b44dae0 Mon Sep 17 00:00:00 2001
|
|
From: Li Zhou <li.zhou@windriver.com>
|
|
Date: Mon, 5 Sep 2022 11:00:14 +0800
|
|
Subject: [PATCH 4/4] grub-pc: remove conflict with grub-efi-amd64
|
|
|
|
Solve this error when build-image with package grub-efi-amd64:
|
|
grub-pc : Conflicts: grub-efi-amd64 but 2.06-1.stx.3 is to be installed
|
|
|
|
Signed-off-by: Li Zhou <li.zhou@windriver.com>
|
|
---
|
|
debian/control | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/debian/control b/debian/control
|
|
index b318ec8..b38d66a 100644
|
|
--- a/debian/control
|
|
+++ b/debian/control
|
|
@@ -152,7 +152,7 @@ Architecture: any-i386 any-amd64
|
|
Pre-Depends: ${misc:Pre-Depends}
|
|
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-pc-bin (= ${binary:Version}), ucf, freebsd-utils (>= 8.0-4) [kfreebsd-any], ${gfxpayload-depends}
|
|
Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-ieee1275
|
|
-Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-ieee1275, grub-xen
|
|
+Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-ia32, grub-coreboot, grub-ieee1275, grub-xen
|
|
Multi-Arch: foreign
|
|
Description: GRand Unified Bootloader, version 2 (PC/BIOS version)
|
|
GRUB is a portable, powerful bootloader. This version of GRUB is based on a
|
|
--
|
|
2.17.1
|
|
|