From 15dd9113728f2145e9ce1f9017d8590daec32d27 Mon Sep 17 00:00:00 2001 From: ertaozh Date: Mon, 18 Jul 2016 03:20:49 -0400 Subject: [PATCH 1/6] Modify xcat-genesis-scripts-ppc64 depend on xcat-genesis-base-ppc64 and xcat-genesis-scripts-x86-64 depend on xcat-genesis-base-x86-64 for ubuntu --- build-ubunturepo | 10 ++++++++++ .../debian/{control => control-amd64} | 8 ++++---- xCAT-genesis-scripts/debian/control-ppc64el | 13 +++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) rename xCAT-genesis-scripts/debian/{control => control-amd64} (73%) create mode 100644 xCAT-genesis-scripts/debian/control-ppc64el diff --git a/build-ubunturepo b/build-ubunturepo index 5acce32fb..275a95347 100755 --- a/build-ubunturepo +++ b/build-ubunturepo @@ -254,7 +254,17 @@ then fi dpkg-buildpackage -uc -us else + if [ "$file" = "xCAT-genesis-scripts" ]; then + CURDIR=$(pwd) + echo "Rename control file to build pkg: mv ${CURDIR}/debian/control-${target_arch} ${CURDIR}/debian/control" + mv ${CURDIR}/debian/control-${target_arch} ${CURDIR}/debian/control + fi dpkg-buildpackage -uc -us -a$target_arch + if [ "$file" = "xCAT-genesis-scripts" ]; then + CURDIR=$(pwd) + echo "Move control file back: mv ${CURDIR}/debian/control ${CURDIR}/debian/control-${target_arch}" + mv ${CURDIR}/debian/control ${CURDIR}/debian/control-${target_arch} + fi fi rc=$? if [ $rc -gt 0 ]; then diff --git a/xCAT-genesis-scripts/debian/control b/xCAT-genesis-scripts/debian/control-amd64 similarity index 73% rename from xCAT-genesis-scripts/debian/control rename to xCAT-genesis-scripts/debian/control-amd64 index a8e44e30b..67f8c7bf3 100644 --- a/xCAT-genesis-scripts/debian/control +++ b/xCAT-genesis-scripts/debian/control-amd64 @@ -5,10 +5,10 @@ Maintainer: xCAT Build-Depends: debhelper (>= 8.0.0) Standards-Version: 3.9.2 -Package: xcat-genesis-scripts -Architecture: amd64 ppc64el -Depends: xcat-genesis-base-amd64[any-amd64],xcat-genesis-base-ppc64[any-ppc64el] -Replaces: xcat-genesis-scripts-amd64[any-amd64] +Package: xcat-genesis-scripts-x86-64 +Architecture: all +Depends: xcat-genesis-base-x86-64 +Replaces: 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 new file mode 100644 index 000000000..a76515dfa --- /dev/null +++ b/xCAT-genesis-scripts/debian/control-ppc64el @@ -0,0 +1,13 @@ +Source: xcat-genesis-scripts +Section: admin +Priority: extra +Maintainer: xCAT +Build-Depends: debhelper (>= 8.0.0) +Standards-Version: 3.9.2 + +Package: xcat-genesis-scripts-ppc64 +Architecture: all +Depends: xcat-genesis-base-ppc64 +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 + From 88ea55bfe5035a996874e2b91de6240279a9f692 Mon Sep 17 00:00:00 2001 From: ertaozh Date: Tue, 19 Jul 2016 05:56:31 -0400 Subject: [PATCH 2/6] modify depends on xcat-genesis-scripts to xcat-genesis-scripts-ppc64 and xcat-genesis-scripts-x86-64 --- xCAT/debian/control | 2 +- xCATsn/debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT/debian/control b/xCAT/debian/control index c5051a272..69dd56b0e 100644 --- a/xCAT/debian/control +++ b/xCAT/debian/control @@ -7,6 +7,6 @@ Standards-Version: 3.7.2 Package: xcat Architecture: amd64 ppc64el -Depends: ${perl:Depends}, xcat-server, xcat-client, libdbd-sqlite3-perl, isc-dhcp-server, apache2, nfs-kernel-server, nmap, bind9, libxml-parser-perl, xinetd, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, ipmitool-xcat (>=1.8.9), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat[any-amd64], xnba-undi, xcat-genesis-scripts, elilo-xcat, xcat-buildkit, xcat-probe (>=2.12) +Depends: ${perl:Depends}, xcat-server, xcat-client, libdbd-sqlite3-perl, isc-dhcp-server, apache2, nfs-kernel-server, nmap, bind9, libxml-parser-perl, xinetd, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, ipmitool-xcat (>=1.8.15-2), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat[any-amd64], xnba-undi, xcat-genesis-scripts-ppc64, xcat-genesis-scripts-x86-64, elilo-xcat, xcat-buildkit, xcat-probe (>=2.12) Description: Server and configuration utilities of the xCAT management project xcat-server provides the core server and configuration management components of xCAT. This package should be installed on your management server diff --git a/xCATsn/debian/control b/xCATsn/debian/control index 604590bc5..8283481f1 100644 --- a/xCATsn/debian/control +++ b/xCATsn/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.7.2 Package: xcatsn Architecture: all -Depends: ${perl:Depends}, xcat-server, perl-xcat, xcat-client, libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, dhcp3-server, apache2, expect, nfs-kernel-server, nmap, bind9, ipmitool-xcat (>=1.8.9), syslinux-xcat, xnba-undi, xcat-genesis-scripts, elilo-xcat,libsys-virt-perl +Depends: ${perl:Depends}, xcat-server, perl-xcat, xcat-client, libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, dhcp3-server, apache2, expect, nfs-kernel-server, nmap, bind9, ipmitool-xcat (>=1.8.15-2), syslinux-xcat, xnba-undi, xcat-genesis-scripts-ppc64, xcat-genesis-scripts-x86-64, elilo-xcat,libsys-virt-perl Recommends: yaboot-xcat Description: Metapackage for a common, default xCAT service node setup xCATsn is a service node management package intended for at-scale management, including hardware management and software management. From d5674fc7121b68f4c3b99e3d892ea2c67f00a78d Mon Sep 17 00:00:00 2001 From: zet809 Date: Wed, 20 Jul 2016 12:59:51 +0800 Subject: [PATCH 3/6] Update control --- xCAT/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT/debian/control b/xCAT/debian/control index 69dd56b0e..35b1b9328 100644 --- a/xCAT/debian/control +++ b/xCAT/debian/control @@ -7,6 +7,6 @@ Standards-Version: 3.7.2 Package: xcat Architecture: amd64 ppc64el -Depends: ${perl:Depends}, xcat-server, xcat-client, libdbd-sqlite3-perl, isc-dhcp-server, apache2, nfs-kernel-server, nmap, bind9, libxml-parser-perl, xinetd, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, ipmitool-xcat (>=1.8.15-2), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat[any-amd64], xnba-undi, xcat-genesis-scripts-ppc64, xcat-genesis-scripts-x86-64, elilo-xcat, xcat-buildkit, xcat-probe (>=2.12) +Depends: ${perl:Depends}, xcat-server, xcat-client, libdbd-sqlite3-perl, isc-dhcp-server, apache2, nfs-kernel-server, nmap, bind9, libxml-parser-perl, xinetd, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, ipmitool-xcat (>=1.8.9), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat[any-amd64], xnba-undi, xcat-genesis-scripts-ppc64, xcat-genesis-scripts-x86-64, elilo-xcat, xcat-buildkit, xcat-probe (>=2.12) Description: Server and configuration utilities of the xCAT management project xcat-server provides the core server and configuration management components of xCAT. This package should be installed on your management server From fcf8f693531793d3166d3ae0ea4aa0ff57879455 Mon Sep 17 00:00:00 2001 From: zet809 Date: Wed, 20 Jul 2016 13:00:17 +0800 Subject: [PATCH 4/6] Update control --- xCATsn/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCATsn/debian/control b/xCATsn/debian/control index 8283481f1..154ba3fd5 100644 --- a/xCATsn/debian/control +++ b/xCATsn/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.7.2 Package: xcatsn Architecture: all -Depends: ${perl:Depends}, xcat-server, perl-xcat, xcat-client, libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, dhcp3-server, apache2, expect, nfs-kernel-server, nmap, bind9, ipmitool-xcat (>=1.8.15-2), syslinux-xcat, xnba-undi, xcat-genesis-scripts-ppc64, xcat-genesis-scripts-x86-64, elilo-xcat,libsys-virt-perl +Depends: ${perl:Depends}, xcat-server, perl-xcat, xcat-client, libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, dhcp3-server, apache2, expect, nfs-kernel-server, nmap, bind9, ipmitool-xcat (>=1.8.9), syslinux-xcat, xnba-undi, xcat-genesis-scripts-ppc64, xcat-genesis-scripts-x86-64, elilo-xcat,libsys-virt-perl Recommends: yaboot-xcat Description: Metapackage for a common, default xCAT service node setup xCATsn is a service node management package intended for at-scale management, including hardware management and software management. From f7581c4c8224cb9c6359be83b35b93a7548f56f5 Mon Sep 17 00:00:00 2001 From: zet809 Date: Wed, 20 Jul 2016 13:05:12 +0800 Subject: [PATCH 5/6] Update control --- xCATsn/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCATsn/debian/control b/xCATsn/debian/control index 154ba3fd5..604590bc5 100644 --- a/xCATsn/debian/control +++ b/xCATsn/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.7.2 Package: xcatsn Architecture: all -Depends: ${perl:Depends}, xcat-server, perl-xcat, xcat-client, libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, dhcp3-server, apache2, expect, nfs-kernel-server, nmap, bind9, ipmitool-xcat (>=1.8.9), syslinux-xcat, xnba-undi, xcat-genesis-scripts-ppc64, xcat-genesis-scripts-x86-64, elilo-xcat,libsys-virt-perl +Depends: ${perl:Depends}, xcat-server, perl-xcat, xcat-client, libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, dhcp3-server, apache2, expect, nfs-kernel-server, nmap, bind9, ipmitool-xcat (>=1.8.9), syslinux-xcat, xnba-undi, xcat-genesis-scripts, elilo-xcat,libsys-virt-perl Recommends: yaboot-xcat Description: Metapackage for a common, default xCAT service node setup xCATsn is a service node management package intended for at-scale management, including hardware management and software management. From b622997ba0eb25b2ec3796d1008ccdc6cf112679 Mon Sep 17 00:00:00 2001 From: zet809 Date: Wed, 20 Jul 2016 13:05:36 +0800 Subject: [PATCH 6/6] Update control --- xCAT/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT/debian/control b/xCAT/debian/control index 35b1b9328..c5051a272 100644 --- a/xCAT/debian/control +++ b/xCAT/debian/control @@ -7,6 +7,6 @@ Standards-Version: 3.7.2 Package: xcat Architecture: amd64 ppc64el -Depends: ${perl:Depends}, xcat-server, xcat-client, libdbd-sqlite3-perl, isc-dhcp-server, apache2, nfs-kernel-server, nmap, bind9, libxml-parser-perl, xinetd, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, ipmitool-xcat (>=1.8.9), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat[any-amd64], xnba-undi, xcat-genesis-scripts-ppc64, xcat-genesis-scripts-x86-64, elilo-xcat, xcat-buildkit, xcat-probe (>=2.12) +Depends: ${perl:Depends}, xcat-server, xcat-client, libdbd-sqlite3-perl, isc-dhcp-server, apache2, nfs-kernel-server, nmap, bind9, libxml-parser-perl, xinetd, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, ipmitool-xcat (>=1.8.9), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat[any-amd64], xnba-undi, xcat-genesis-scripts, elilo-xcat, xcat-buildkit, xcat-probe (>=2.12) Description: Server and configuration utilities of the xCAT management project xcat-server provides the core server and configuration management components of xCAT. This package should be installed on your management server