From f14f9d8a9c27440e9532d043a4116ab8228cf2ef Mon Sep 17 00:00:00 2001 From: ertaozh Date: Fri, 22 Jul 2016 04:51:44 -0400 Subject: [PATCH] Modify conflict xcat-genesis-scripts-x86-64 and xcat-genesis-scripts-ppc64 with xcat-genesis-scripts --- xCAT-genesis-scripts/debian/control-amd64 | 4 +++- xCAT-genesis-scripts/debian/control-ppc64el | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/xCAT-genesis-scripts/debian/control-amd64 b/xCAT-genesis-scripts/debian/control-amd64 index 67f8c7bf3..4acf432d8 100644 --- a/xCAT-genesis-scripts/debian/control-amd64 +++ b/xCAT-genesis-scripts/debian/control-amd64 @@ -8,7 +8,9 @@ Standards-Version: 3.9.2 Package: xcat-genesis-scripts-x86-64 Architecture: all Depends: xcat-genesis-base-x86-64 -Replaces: xcat-genesis-scripts-amd64 +Provides: xcat-genesis-scripts,xcat-genesis-scripts-amd64 +Conflicts: xcat-genesis-scripts,xcat-genesis-scripts-amd64 +Replaces: xcat-genesis-scripts,xcat-genesis-scripts-amd64 Description: xCAT genesis (Genesis Enhanced Netboot Environment for System Information and Servicing) is a small, embedded-like environment for xCAT's use in discovery and management actions when interaction with an OS is infeasible. This package reperesents the EPL content that is more tightly bound to specific xcat-core versions diff --git a/xCAT-genesis-scripts/debian/control-ppc64el b/xCAT-genesis-scripts/debian/control-ppc64el index a76515dfa..c87170c7d 100644 --- a/xCAT-genesis-scripts/debian/control-ppc64el +++ b/xCAT-genesis-scripts/debian/control-ppc64el @@ -8,6 +8,10 @@ Standards-Version: 3.9.2 Package: xcat-genesis-scripts-ppc64 Architecture: all Depends: xcat-genesis-base-ppc64 +Provides: xcat-genesis-scripts +Conflicts: xcat-genesis-scripts +Replaces: xcat-genesis-scripts + Description: xCAT genesis (Genesis Enhanced Netboot Environment for System Information and Servicing) is a small, embedded-like environment for xCAT's use in discovery and management actions when interaction with an OS is infeasible. This package reperesents the EPL content that is more tightly bound to specific xcat-core versions