From fc31759423a6569b4544b8fdaedaed667c1b88dd Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 12 Feb 2019 16:38:27 -0500 Subject: [PATCH 1/3] Change debian/ubuntu build to use gitver --- build-ubunturepo | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build-ubunturepo b/build-ubunturepo index 76d981c21..39081fec2 100755 --- a/build-ubunturepo +++ b/build-ubunturepo @@ -194,7 +194,9 @@ then if ! grep -q 'Already up-to-date' $update_log; then code_change=1 fi - ver=`cat Version` + ver=${ver/-/.POST} + ver=${ver/-/.} + short_ver=`cat Version|cut -d. -f 1,2` short_short_ver=`cat Version|cut -d. -f 1` build_time=`date` @@ -215,7 +217,7 @@ then #the build introduce string build_string="Snap_Build" xcat_release="snap$(date '+%Y%m%d%H%M')" - pkg_version="${ver}-${xcat_release}" + pkg_version="${ver}" # -${xcat_release}" packages="xCAT-client xCAT-genesis-scripts perl-xCAT xCAT-server xCAT xCATsn xCAT-test xCAT-buildkit xCAT-vlan xCAT-confluent xCAT-probe" target_archs=(amd64 ppc64el) From e472c928cdc427dc556dffc7b4ebc4f22ec562bf Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 13 Feb 2019 13:40:41 -0500 Subject: [PATCH 2/3] Fix version in lenovo apt/deb builds --- build-ubunturepo | 1 + 1 file changed, 1 insertion(+) diff --git a/build-ubunturepo b/build-ubunturepo index 39081fec2..9b9cd07b7 100755 --- a/build-ubunturepo +++ b/build-ubunturepo @@ -194,6 +194,7 @@ then if ! grep -q 'Already up-to-date' $update_log; then code_change=1 fi + ver=$(git describe --tags) ver=${ver/-/.POST} ver=${ver/-/.} From 6e59b63b3931e19197ba0b5fef0f31d84bfb0816 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 13 Feb 2019 16:02:59 -0500 Subject: [PATCH 3/3] Remove dependencies for lenovo ubuntu builds --- xCAT-client/debian/control | 2 +- xCAT-server/debian/control | 2 +- xCAT/debian/control | 5 ++--- xCATsn/debian/control | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/xCAT-client/debian/control b/xCAT-client/debian/control index db9b62fe4..eb91dbc91 100644 --- a/xCAT-client/debian/control +++ b/xCAT-client/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.4 Package: xcat-client Architecture: all -Depends: ${perl:Depends}, perl-xcat (>= 2.13-snap000000000000) +Depends: ${perl:Depends}, perl-xcat Recommends: libsort-versions-perl, nmap Description: Core executables and data of the xCAT management project xCAT-client provides the fundamental xCAT commands (chtab, chnode, rpower, diff --git a/xCAT-server/debian/control b/xCAT-server/debian/control index ae2306ed9..2fd09f2bd 100644 --- a/xCAT-server/debian/control +++ b/xCAT-server/debian/control @@ -8,7 +8,7 @@ Homepage: https://xcat.org/ Package: xcat-server Architecture: all -Depends: ${perl:Depends}, grub2-xcat, perl-xcat (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libsys-syslog-perl, libio-socket-ssl-perl, libxml-simple-perl, make, libdbd-sqlite3-perl, libexpect-perl, libnet-dns-perl, libsoap-lite-perl, libxml-libxml-perl, libsnmp-perl, debootstrap, libdigest-sha-perl,libcrypt-rijndael-perl,libcrypt-cbc-perl,libjson-perl, libnet-https-nb-perl, libhttp-async-perl +Depends: ${perl:Depends}, perl-xcat (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libsys-syslog-perl, libio-socket-ssl-perl, libxml-simple-perl, make, libdbd-sqlite3-perl, libexpect-perl, libnet-dns-perl, libsoap-lite-perl, libxml-libxml-perl, libsnmp-perl, debootstrap, libdigest-sha-perl,libcrypt-rijndael-perl,libcrypt-cbc-perl,libjson-perl, libnet-https-nb-perl, libhttp-async-perl Description: Server and configuration utilities of xCAT xCAT-server provides the core server and configuration management components of xCAT. diff --git a/xCAT/debian/control b/xCAT/debian/control index 24649a905..b393fdea2 100644 --- a/xCAT/debian/control +++ b/xCAT/debian/control @@ -9,9 +9,8 @@ Homepage: https://xcat.org/ Package: xcat Architecture: amd64 ppc64el -Depends: ${perl:Depends}, xcat-server (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libdbd-sqlite3-perl, isc-dhcp-server, apache2, nfs-kernel-server, libxml-parser-perl, xinetd, rsync, tftpd-hpa, conserver-xcat, libnet-telnet-perl, xcat-genesis-scripts-ppc64 (>= 2.13-snap000000000000), xcat-genesis-scripts-amd64 (>= 2.13-snap000000000000) -Recommends: bind9, nmap, tftp-hpa, ipmitool-xcat (>= 1.8.17-1), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat, xnba-undi, elilo-xcat, xcat-buildkit (>= 2.13-snap000000000000), xcat-probe (>= 2.13-snap000000000000), goconserver -Suggests: yaboot-xcat +Depends: ${perl:Depends}, xcat-server, xcat-client, libdbd-sqlite3-perl, isc-dhcp-server, apache2, nfs-kernel-server, libxml-parser-perl, xinetd, rsync, tftpd-hpa, libnet-telnet-perl, xcat-genesis-scripts-ppc64, xcat-genesis-scripts-amd64 +Recommends: bind9, nmap, tftp-hpa, ipmitool-xcat (>= 1.8.17-1), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat, xnba-undi, elilo-xcat, Description: Metapackage for a common, default xCAT setup xCAT is Extreme Cluster/Cloud Administration Toolkit. xCAT offers complete management for HPC clusters, RenderFarms, Grids, WebFarms, Online Gaming diff --git a/xCATsn/debian/control b/xCATsn/debian/control index ca494800e..abe5fecb3 100644 --- a/xCATsn/debian/control +++ b/xCATsn/debian/control @@ -8,9 +8,8 @@ Homepage: https://xcat.org/ Package: xcatsn Architecture: amd64 ppc64el -Depends: ${perl:Depends}, xcat-server (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, conserver-xcat, libnet-telnet-perl, isc-dhcp-server, apache2, nfs-kernel-server, xcat-genesis-scripts-ppc64 (>= 2.13-snap000000000000), xcat-genesis-scripts-amd64 (>= 2.13-snap000000000000) +Depends: ${perl:Depends}, xcat-server (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, libnet-telnet-perl, isc-dhcp-server, apache2, nfs-kernel-server, xcat-genesis-scripts-ppc64 (>= 2.13-snap000000000000), xcat-genesis-scripts-amd64 (>= 2.13-snap000000000000) Recommends: bind9, nmap, tftp-hpa, ipmitool-xcat (>= 1.8.17-1), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat, xnba-undi, elilo-xcat, xcat-buildkit (>= 2.13-snap000000000000), xcat-probe (>= 2.13-snap000000000000), goconserver -Suggests: 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.