From 327db76f9e49b3bb0136b19f94e2e20815489868 Mon Sep 17 00:00:00 2001 From: neo954 Date: Wed, 23 Nov 2016 00:36:08 -0600 Subject: [PATCH] Make all the deb packages have the exactly same version and release numbers --- build-ubunturepo | 64 ++++++++++++--------- perl-xCAT/debian/compat | 2 +- perl-xCAT/debian/control | 7 ++- perl-xCAT/debian/rules | 6 +- xCAT-IBMhpc/debian/compat | 2 +- xCAT-IBMhpc/debian/control | 14 ++--- xCAT-IBMhpc/debian/rules | 6 +- xCAT-OpenStack-baremetal/debian/compat | 2 +- xCAT-OpenStack-baremetal/debian/control | 8 +-- xCAT-OpenStack/debian/compat | 2 +- xCAT-OpenStack/debian/control | 12 ++-- xCAT-UI/debian/compat | 2 +- xCAT-UI/debian/control | 11 ++-- xCAT-UI/debian/rules | 5 +- xCAT-buildkit/debian/compat | 2 +- xCAT-buildkit/debian/control | 8 +-- xCAT-buildkit/debian/rules | 4 -- xCAT-client/debian/compat | 2 +- xCAT-client/debian/control | 12 ++-- xCAT-client/debian/rules | 6 +- xCAT-genesis-builder/debian/compat | 2 +- xCAT-genesis-builder/debian/control | 8 +-- xCAT-genesis-scripts/debian/compat | 2 +- xCAT-genesis-scripts/debian/control-amd64 | 19 +++--- xCAT-genesis-scripts/debian/control-ppc64el | 13 +++-- xCAT-probe/debian/compat | 2 +- xCAT-probe/debian/control | 6 +- xCAT-probe/debian/rules | 6 +- xCAT-rmc/debian/compat | 2 +- xCAT-rmc/debian/control | 6 +- xCAT-rmc/debian/rules | 6 +- xCAT-server/debian/compat | 2 +- xCAT-server/debian/control | 14 +++-- xCAT-server/debian/install | 1 - xCAT-server/debian/rules | 3 +- xCAT-test/debian/compat | 2 +- xCAT-test/debian/control | 9 ++- xCAT-test/debian/rules | 6 +- xCAT-vlan/debian/compat | 2 +- xCAT-vlan/debian/control | 9 ++- xCAT-vlan/debian/rules | 2 + xCAT/debian/compat | 2 +- xCAT/debian/control | 28 +++++++-- xCAT/debian/rules | 6 +- xCATsn/debian/compat | 2 +- xCATsn/debian/control | 13 +++-- xCATsn/debian/rules | 6 +- 47 files changed, 181 insertions(+), 175 deletions(-) diff --git a/build-ubunturepo b/build-ubunturepo index b4220b4a6..8379d8201 100755 --- a/build-ubunturepo +++ b/build-ubunturepo @@ -4,7 +4,7 @@ # Author: Leonardo Tonetto (tonetto@linux.vnet.ibm.com) # Revisor: Arif Ali (aali@ocf.co.uk) # -# +# # Getting Started: # - Clone the xcat-core git repository int a directory called /src/xcat-core, where # is the same name as the release dir it is uploaded to xcat.org (e.g devel, 2.9, 2.10) @@ -15,21 +15,21 @@ # PROMOTE=1 - if the attribute "PROMOTE" is specified, means an official dot release. This does not # actually build xcat, just uploads the most recent snap build to http://xcat.org/files/xcat/ . # If not specified, a snap build is assumed, which uploads to https://xcat.org/files/xcat/ -# PREGA=1 - use this option with PROMOTE=1 on a branch that already has a released dot release, but this -# build is a GA candidate build, not to be released yet. This will result in the tarball +# PREGA=1 - use this option with PROMOTE=1 on a branch that already has a released dot release, but this +# build is a GA candidate build, not to be released yet. This will result in the tarball # being uploaded to http://xcat.org/files/xcat/repos/apt -# (but the tarball file name will be like a released tarball, not a snap build). +# (but the tarball file name will be like a released tarball, not a snap build). # When you are ready to release this build, use PROMOTE=1 without PREGA -# BUILDALL=1 - build all rpms, whether they changed or not. Should be used for snap builds that are in +# BUILDALL=1 - build all rpms, whether they changed or not. Should be used for snap builds that are in # prep for a release. # UP=0 or UP=1 - override the default upload behavior # LOG= - provide an LOG file option to redirect some output into log file # -# For the dependency packages 1. All the xcat dependency deb packages should be uploaded to +# For the dependency packages 1. All the xcat dependency deb packages should be uploaded to # "pokgsa/projects/x/xcat/build/ubuntu/xcat-dep/debs/" on GSA # 2. run ./build-ubunturepo -d # -# 3. the built xcat-dep deb packages tarball can be found in "../../xcat-dep" +# 3. the built xcat-dep deb packages tarball can be found in "../../xcat-dep" # related to the path of this script ############################ printusage() @@ -39,10 +39,10 @@ printusage() echo " -d : Create the xcat-dep repo." } # For the purpose of getting the distribution name -if [[ ! -f /etc/lsb-release ]]; then +if [[ ! -f /etc/lsb-release ]]; then echo "ERROR: Could not find /etc/lsb-release, is this script executed on a Ubuntu machine?" exit 1 -fi +fi . /etc/lsb-release # Check the necessary packages before starting the build @@ -84,7 +84,7 @@ do r) r_flag=1 genesis_rpm_path="$OPTARG" ;; - ?) printusage + ?) printusage exit 2 ;; esac @@ -129,7 +129,7 @@ fi export HOME=/root WGET_CMD="wget" -if [ ! -z ${LOG} ]; then +if [ ! -z ${LOG} ]; then WGET_CMD="wget -o ${LOG}" fi @@ -211,13 +211,13 @@ then build_string="Snap_Build" cur_date=`date +%Y%m%d%H%M` pkg_version="${ver}-${pkg_type}${cur_date}" - + if [ ! -d ../../$package_dir_name ];then mkdir -p "../../$package_dir_name" fi 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) - for file in `echo $packages` + for file in $packages do file_low=`echo $file | tr '[A-Z]' '[a-z]'` if [ "$file" = "xCAT" -o "$file" = "xCAT-genesis-scripts" ]; then @@ -225,7 +225,7 @@ then else target_archs="all" fi - for target_arch in `echo $target_archs` + for target_arch in $target_archs do if grep -q $file $update_log || [ "$BUILDALL" == 1 -o "$file" = "perl-xCAT" ]; then rm -f ../../$package_dir_name/${file_low}_*.$target_arch.deb @@ -245,18 +245,28 @@ then cp -f ${CURDIR}/../perl-xCAT/xCAT/GlobalDef.pm ${CURDIR}/lib/perl/xCAT/ cp -f ${CURDIR}/../perl-xCAT/xCAT/ServiceNodeUtils.pm ${CURDIR}/lib/perl/xCAT/ fi - dpkg-buildpackage -uc -us + CURDIR=$(pwd) + cp ${CURDIR}/debian/control ${CURDIR}/debian/control.save.998 + # Magic string used here + sed -i -e "s#>= 2.13-snap000000000000#= ${pkg_version}#g" ${CURDIR}/debian/control + dpkg-buildpackage -rfakeroot -uc -us + mv ${CURDIR}/debian/control.save.998 ${CURDIR}/debian/control 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 + echo "Rename control file to build pkg: cp ${CURDIR}/debian/control-${target_arch} ${CURDIR}/debian/control" + cp ${CURDIR}/debian/control-${target_arch} ${CURDIR}/debian/control fi - dpkg-buildpackage -uc -us -a$target_arch + CURDIR=$(pwd) + cp ${CURDIR}/debian/control ${CURDIR}/debian/control.save.998 + # Magic string used here + sed -i -e "s#>= 2.13-snap000000000000#= ${pkg_version}#g" ${CURDIR}/debian/control + dpkg-buildpackage -rfakeroot -uc -us -a$target_arch + mv ${CURDIR}/debian/control.save.998 ${CURDIR}/debian/control 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} + rm ${CURDIR}/debian/control fi fi rc=$? @@ -317,7 +327,7 @@ Label: xcat-core bazaar repository Codename: $dist Architectures: $tmp_out_arch Components: main -Description: Repository automatically genereted conf +Description: Repository automatically genereted conf SignWith: yes __EOF__ @@ -357,12 +367,12 @@ __EOF__ chmod 775 mklocalrepo.sh - #create the xcat-core.list file + #create the xcat-core.list file cd ../ if ! grep xcat /etc/group ; then groupadd xcat - fi + fi chgrp -R root xcat-core chmod -R g+w xcat-core @@ -388,7 +398,7 @@ then #the path of ubuntu xcat-dep deb packages on GSA GSA="/gsa/pokgsa/projects/x/xcat/build/ubuntu/xcat-dep" - + if [ ! -d $GSA ]; then echo "build-ubunturepo: It appears that you do not have gsa installed to access the xcat-dep pkgs." exit 1; @@ -400,10 +410,10 @@ then echo "Syncing RPMs from $GSA/ to $local_dep_repo_path/../ ..." rsync -ilrtpu --delete $GSA/ $local_dep_repo_path/../ - if [ $? -ne 0 ]; then + if [ $? -ne 0 ]; then echo "Error from rsync, cannot continue!" exit 1 - fi + fi #clean all old files if [ -e $local_dep_repo_path ];then @@ -427,7 +437,7 @@ Label: xcat-dep bazaar repository Codename: $dist Architectures: $tmp_out_arch Components: main -Description: Repository automatically genereted conf +Description: Repository automatically genereted conf SignWith: yes __EOF__ @@ -482,7 +492,7 @@ __EOF__ chmod g+w $dep_tar_name # Decide whether to upload or not (default NOT to upload) - if [ "$UP" != "1" ]; then + if [ "$UP" != "1" ]; then echo "Upload not specified, Done! (rerun with UP=1, to upload)" cd $old_pwd exit 0 diff --git a/perl-xCAT/debian/compat b/perl-xCAT/debian/compat index 7ed6ff82d..ec635144f 100644 --- a/perl-xCAT/debian/compat +++ b/perl-xCAT/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/perl-xCAT/debian/control b/perl-xCAT/debian/control index 5222978b0..cd7877d24 100644 --- a/perl-xCAT/debian/control +++ b/perl-xCAT/debian/control @@ -2,12 +2,13 @@ Source: perl-xcat Section: libs Priority: extra Maintainer: xCAT -Build-Depends: debhelper (>= 5), libsoap-lite-perl, libdbi-perl -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 9), libsoap-lite-perl, libdbi-perl +Standards-Version: 3.9.4 +Homepage: https://xcat.org/ Package: perl-xcat Architecture: all -Depends: ${perl:Depends} +Depends: ${perl:Depends} Description: xCAT perl libraries Provides perl xCAT libraries for core functionality. Required for all xCAT installations. Includes xCAT::Table, xCAT::NodeRange, among others. diff --git a/perl-xCAT/debian/rules b/perl-xCAT/debian/rules index e5a0aa6fd..763812bba 100755 --- a/perl-xCAT/debian/rules +++ b/perl-xCAT/debian/rules @@ -9,9 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DH_COMPAT=5 - - build: dh_testdir ./db2man @@ -27,7 +24,6 @@ install: dh_installdirs dh_install -X".svn" - # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. @@ -36,7 +32,7 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs dh_installdocs # dh_installexamples dh_install -X".svn" diff --git a/xCAT-IBMhpc/debian/compat b/xCAT-IBMhpc/debian/compat index 7ed6ff82d..ec635144f 100644 --- a/xCAT-IBMhpc/debian/compat +++ b/xCAT-IBMhpc/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/xCAT-IBMhpc/debian/control b/xCAT-IBMhpc/debian/control index 38a06c9af..2bdffb1be 100644 --- a/xCAT-IBMhpc/debian/control +++ b/xCAT-IBMhpc/debian/control @@ -2,14 +2,14 @@ Source: xcat-ibmhpc Section: admin Priority: extra Maintainer: Arif Ali -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.4 Package: xcat-ibmhpc Architecture: all -Depends: ${perl:Depends}, perl-xcat (>= 2.8.0), xcat-client (>= 2.8.0) -Description: Install and configuration utilities for IBM HPC products in an xCAT cluster - xCAT-IBMhpc provides sample installation and configuration scripts for running - the IBM HPC software stack in an xCAT cluser. Support for the following IBM - products is provided: GPFS, LoadLeveler, Parallel Environment, ESSL and Parallel +Depends: ${perl:Depends}, perl-xcat (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000) +Description: Utilities for manage IBM HPC products in an xCAT cluster + xCAT-IBMhpc provides sample installation and configuration scripts for running + the IBM HPC software stack in an xCAT cluser. Support for the following IBM + products is provided: GPFS, LoadLeveler, Parallel Environment, ESSL and Parallel ESSL libraries, some compilers (vac, xlC, xlf). diff --git a/xCAT-IBMhpc/debian/rules b/xCAT-IBMhpc/debian/rules index 659821bd5..1bd639730 100755 --- a/xCAT-IBMhpc/debian/rules +++ b/xCAT-IBMhpc/debian/rules @@ -9,9 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DH_COMPAT=5 - - build: pwd dh_quilt_patch @@ -29,7 +26,6 @@ install: dh_install -X".svn" dh_link - # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. @@ -39,7 +35,7 @@ binary-arch: pwd dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs dh_installdocs # dh_installexamples dh_install -X".svn" diff --git a/xCAT-OpenStack-baremetal/debian/compat b/xCAT-OpenStack-baremetal/debian/compat index 45a4fb75d..ec635144f 100644 --- a/xCAT-OpenStack-baremetal/debian/compat +++ b/xCAT-OpenStack-baremetal/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/xCAT-OpenStack-baremetal/debian/control b/xCAT-OpenStack-baremetal/debian/control index 61ad678eb..b62fc34bb 100644 --- a/xCAT-OpenStack-baremetal/debian/control +++ b/xCAT-OpenStack-baremetal/debian/control @@ -2,13 +2,11 @@ Source: xcat-openstack-baremetal Section: admin Priority: extra Maintainer: xCAT -Build-Depends: debhelper (>= 8.0.0) +Build-Depends: debhelper (>= 9) Standards-Version: 3.9.4 -Homepage: http://xcat.org -#Vcs-Git: git://git.debian.org/collab-maint/xcat-openstack-baremetal.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/xcat-openstack-baremetal.git;a=summary +Homepage: https://xcat.org/ Package: xcat-openstack-baremetal Architecture: all Depends: xcat-client -Description: Executables and data of the xCAT baremetal driver for OpenStack +Description: Executables and data of xCAT baremetal driver for OpenStack diff --git a/xCAT-OpenStack/debian/compat b/xCAT-OpenStack/debian/compat index 45a4fb75d..ec635144f 100644 --- a/xCAT-OpenStack/debian/compat +++ b/xCAT-OpenStack/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/xCAT-OpenStack/debian/control b/xCAT-OpenStack/debian/control index 04cff6ab9..9f6ac5661 100644 --- a/xCAT-OpenStack/debian/control +++ b/xCAT-OpenStack/debian/control @@ -2,13 +2,13 @@ Source: xcat-openstack Section: admin Priority: extra Maintainer: xCAT -Build-Depends: debhelper (>= 8.0.0) -Standards-Version: 3.9.2 -#Vcs-Git: git://git.debian.org/collab-maint/xcat-openstack.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/xcat-openstack.git;a=summary +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.4 Package: xcat-openstack Architecture: all Depends: xcat -Description: Meta-Metapackage for a common, default xCAT management node setup with OpenStack - xCAT-OpenStack is an xCAT management node package intended for at-scale management with OpenStack, including hardware management and software management. +Description: Metapackage for a xCAT management node setup with OpenStack + xCAT-OpenStack is an xCAT management node package intended for at-scale + management with OpenStack, including hardware management and software + management. diff --git a/xCAT-UI/debian/compat b/xCAT-UI/debian/compat index 7ed6ff82d..ec635144f 100644 --- a/xCAT-UI/debian/compat +++ b/xCAT-UI/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/xCAT-UI/debian/control b/xCAT-UI/debian/control index 4e91971ef..f9fe95278 100644 --- a/xCAT-UI/debian/control +++ b/xCAT-UI/debian/control @@ -2,11 +2,12 @@ Source: xcat-ui Section: admin Priority: extra Maintainer: xCAT -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.4 Package: xcat-ui Architecture: all -Depends: ${perl:Depends}, python (>= 2.3), apache2, libapache2-mod-php5 -Description: Provides a browser-based interface for xCAT (extreme Cluster Administration Tool). - Provides a browser-based interface for xCAT (extreme Cluster Administration Tool). +Depends: ${perl:Depends}, python (>= 2.3), apache2, libapache2-mod-php +Description: Provides a browser-based interface for xCAT + Provides a browser-based interface for xCAT (extreme Cluster Administration + Tool). diff --git a/xCAT-UI/debian/rules b/xCAT-UI/debian/rules index ce79be57f..1cf265aa1 100755 --- a/xCAT-UI/debian/rules +++ b/xCAT-UI/debian/rules @@ -9,9 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DH_COMPAT=5 - - build: pwd @@ -38,7 +35,7 @@ binary-arch: pwd dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs dh_installdocs # dh_installexamples dh_install -X".svn" diff --git a/xCAT-buildkit/debian/compat b/xCAT-buildkit/debian/compat index 7ed6ff82d..ec635144f 100644 --- a/xCAT-buildkit/debian/compat +++ b/xCAT-buildkit/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/xCAT-buildkit/debian/control b/xCAT-buildkit/debian/control index dfe2c644d..ee045d41e 100644 --- a/xCAT-buildkit/debian/control +++ b/xCAT-buildkit/debian/control @@ -1,11 +1,11 @@ Source: xcat-buildkit Section: admin Priority: extra -Maintainer: xu qing -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Maintainer: Xu Qing +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.4 Package: xcat-buildkit Architecture: all Depends: dpkg-dev, devscripts, debhelper -Description: xCAT-buildkit provides the buildkit tool and sample kit files to build an xCAT kit. +Description: Provides build tools and sample files to build an xCAT kit diff --git a/xCAT-buildkit/debian/rules b/xCAT-buildkit/debian/rules index b5e90c11b..c792c4f31 100755 --- a/xCAT-buildkit/debian/rules +++ b/xCAT-buildkit/debian/rules @@ -9,9 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DH_COMPAT=5 - - build: pwd mkdir -p share/man/man1 @@ -40,7 +37,6 @@ install: find debian/xcat-buildkit/opt/xcat/share/doc/packages/xCAT-buildkit -type f -exec chmod 644 {} \; dh_link - # Build architecture-independent files here. binary-indep: build install dh_installchangelogs diff --git a/xCAT-client/debian/compat b/xCAT-client/debian/compat index 7ed6ff82d..ec635144f 100644 --- a/xCAT-client/debian/compat +++ b/xCAT-client/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/xCAT-client/debian/control b/xCAT-client/debian/control index 032f70438..db9b62fe4 100644 --- a/xCAT-client/debian/control +++ b/xCAT-client/debian/control @@ -2,12 +2,14 @@ Source: xcat-client Section: admin Priority: extra Maintainer: xCAT -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.4 Package: xcat-client Architecture: all -Depends: ${perl:Depends}, nmap, perl-xcat -Recommends: libsort-versions-perl +Depends: ${perl:Depends}, perl-xcat (>= 2.13-snap000000000000) +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, etc) helpful in administrating systems at scale, with particular attention paid to large HPC clusters. + xCAT-client provides the fundamental xCAT commands (chtab, chnode, rpower, + etc) helpful in administrating systems at scale, with particular attention + paid to large HPC clusters. diff --git a/xCAT-client/debian/rules b/xCAT-client/debian/rules index 5beff8b73..17e87fad6 100755 --- a/xCAT-client/debian/rules +++ b/xCAT-client/debian/rules @@ -9,9 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DH_COMPAT=5 - - build: pwd ./xpod2man @@ -29,7 +26,6 @@ install: dh_install -X".svn" dh_link - # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. @@ -39,7 +35,7 @@ binary-arch: pwd dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs dh_installdocs # dh_installexamples dh_install -X".svn" diff --git a/xCAT-genesis-builder/debian/compat b/xCAT-genesis-builder/debian/compat index 7ed6ff82d..ec635144f 100644 --- a/xCAT-genesis-builder/debian/compat +++ b/xCAT-genesis-builder/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/xCAT-genesis-builder/debian/control b/xCAT-genesis-builder/debian/control index b107a09ab..ebb738dcf 100644 --- a/xCAT-genesis-builder/debian/control +++ b/xCAT-genesis-builder/debian/control @@ -2,15 +2,15 @@ Source: xcat-genesis-base-amd64 Section: admin Priority: extra Maintainer: xCAT -Build-Depends: debhelper (>= 8.0.0) -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.4 Package: xcat-genesis-base-amd64 Architecture: all -Depends: +Depends: Replaces: xcat-genesis-amd64 Breaks: xcat-genesis-amd64 Description: xCAT Genesis netboot image 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. + discovery and management actions when interaction with an OS is infeasible. diff --git a/xCAT-genesis-scripts/debian/compat b/xCAT-genesis-scripts/debian/compat index 45a4fb75d..ec635144f 100644 --- a/xCAT-genesis-scripts/debian/compat +++ b/xCAT-genesis-scripts/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/xCAT-genesis-scripts/debian/control-amd64 b/xCAT-genesis-scripts/debian/control-amd64 index ada257a83..8c4de338e 100644 --- a/xCAT-genesis-scripts/debian/control-amd64 +++ b/xCAT-genesis-scripts/debian/control-amd64 @@ -2,14 +2,17 @@ Source: xcat-genesis-scripts Section: admin Priority: extra Maintainer: xCAT -Build-Depends: debhelper (>= 8.0.0) -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.4 Package: xcat-genesis-scripts-amd64 -Architecture: all +Architecture: all Depends: xcat-genesis-base-amd64 (>=2.13.0) -Conflicts: xcat-genesis-scripts,xcat-genesis-scripts-x86-64 -Replaces: xcat-genesis-scripts,xcat-genesis-scripts-x86-64 -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 - +Conflicts: xcat-genesis-scripts, xcat-genesis-scripts-x86-64 +Replaces: xcat-genesis-scripts, xcat-genesis-scripts-x86-64 +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 825592d88..2165376c7 100644 --- a/xCAT-genesis-scripts/debian/control-ppc64el +++ b/xCAT-genesis-scripts/debian/control-ppc64el @@ -2,14 +2,17 @@ Source: xcat-genesis-scripts Section: admin Priority: extra Maintainer: xCAT -Build-Depends: debhelper (>= 8.0.0) -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.4 Package: xcat-genesis-scripts-ppc64 Architecture: all Depends: xcat-genesis-base-ppc64 (>=2.13.0) 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 - +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-probe/debian/compat b/xCAT-probe/debian/compat index 7ed6ff82d..ec635144f 100644 --- a/xCAT-probe/debian/compat +++ b/xCAT-probe/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/xCAT-probe/debian/control b/xCAT-probe/debian/control index f0b56bb3f..2a7549362 100644 --- a/xCAT-probe/debian/control +++ b/xCAT-probe/debian/control @@ -2,11 +2,11 @@ Source: xcat-probe Section: admin Priority: extra Maintainer: xCAT -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.4 Package: xcat-probe Architecture: all Depends: ${perl:Depends} Recommends: wget, dnsutils, tftp-hpa -Description: Provides a toolkit to help probe all the possible issues in xCAT +Description: Provides a toolkit to probe possible issues in xCAT diff --git a/xCAT-probe/debian/rules b/xCAT-probe/debian/rules index cb48348a6..bb1842ebe 100755 --- a/xCAT-probe/debian/rules +++ b/xCAT-probe/debian/rules @@ -9,9 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DH_COMPAT=5 - - build: dh_testdir pwd @@ -29,7 +26,6 @@ install: dh_install -X".svn" dh_link - # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. @@ -40,7 +36,7 @@ binary-arch: export dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs dh_installdocs # dh_installexamples dh_install -X".svn" diff --git a/xCAT-rmc/debian/compat b/xCAT-rmc/debian/compat index 7ed6ff82d..ec635144f 100644 --- a/xCAT-rmc/debian/compat +++ b/xCAT-rmc/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/xCAT-rmc/debian/control b/xCAT-rmc/debian/control index 33f8bc9cd..e8e97d82d 100644 --- a/xCAT-rmc/debian/control +++ b/xCAT-rmc/debian/control @@ -2,11 +2,11 @@ Source: xcat-rmc Section: admin Priority: extra Maintainer: Arif Ali -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.4 Package: xcat-rmc Architecture: all -Depends: ${perl:Depends}, perl-xcat, xcat-server +Depends: ${perl:Depends}, perl-xcat (>= 2.13-snap000000000000), xcat-server (>= 2.13-snap000000000000) Description: RMC monitoring plug-in for xCAT Provides RMC monitoring plug-in module for xCAT, configuration scripts, predefined conditions, responses and sensors diff --git a/xCAT-rmc/debian/rules b/xCAT-rmc/debian/rules index 5099b8b4b..d880b083b 100755 --- a/xCAT-rmc/debian/rules +++ b/xCAT-rmc/debian/rules @@ -9,9 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DH_COMPAT=5 - - build: pwd @@ -28,7 +25,6 @@ install: dh_install -X".svn" dh_link - # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. @@ -39,7 +35,7 @@ binary-arch: export dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs dh_installdocs # dh_installexamples dh_install -X".svn" diff --git a/xCAT-server/debian/compat b/xCAT-server/debian/compat index 7ed6ff82d..ec635144f 100644 --- a/xCAT-server/debian/compat +++ b/xCAT-server/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/xCAT-server/debian/control b/xCAT-server/debian/control index 83eb791fb..ae2306ed9 100644 --- a/xCAT-server/debian/control +++ b/xCAT-server/debian/control @@ -2,11 +2,15 @@ Source: xcat-server Section: admin Priority: extra Maintainer: xCAT -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.4 +Homepage: https://xcat.org/ Package: xcat-server Architecture: all -Depends: ${perl:Depends}, grub2-xcat, perl-xcat (>= 2.5.0-1), xcat-client (>= 2.5.0-1), 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 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 +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 +Description: Server and configuration utilities of xCAT + xCAT-server provides the core server and configuration management components + of xCAT. + . + This package should be installed on the xCAT management node. diff --git a/xCAT-server/debian/install b/xCAT-server/debian/install index 7941d95c2..ec21c731e 100644 --- a/xCAT-server/debian/install +++ b/xCAT-server/debian/install @@ -19,7 +19,6 @@ share/xcat/devicetype/* opt/xcat/share/xcat/devicetype share/xcat/ib/netboot/sles/* opt/xcat/share/xcat/ib/netboot/sles share/xcat/ib/netboot/rh/* opt/xcat/share/xcat/ib/netboot/rh - lib/perl/xCAT/* opt/xcat/lib/perl/xCAT/ lib/xcat/plugins/* opt/xcat/lib/perl/xCAT_plugin/ lib/xcat/schema/* opt/xcat/lib/perl/xCAT_schema/ diff --git a/xCAT-server/debian/rules b/xCAT-server/debian/rules index 027559171..72d780fc1 100755 --- a/xCAT-server/debian/rules +++ b/xCAT-server/debian/rules @@ -9,7 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DH_COMPAT=5 export buildroot=$(PWD)/debian/xcat-server export prefix=/opt/xcat export rootdir=$(buildroot)/$(prefix) @@ -41,7 +40,7 @@ binary-arch: pwd dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs dh_installdocs # dh_installexamples dh_install -X".svn" diff --git a/xCAT-test/debian/compat b/xCAT-test/debian/compat index 7ed6ff82d..ec635144f 100644 --- a/xCAT-test/debian/compat +++ b/xCAT-test/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/xCAT-test/debian/control b/xCAT-test/debian/control index 10e475fb5..fa073a669 100644 --- a/xCAT-test/debian/control +++ b/xCAT-test/debian/control @@ -2,10 +2,13 @@ Source: xcat-test Section: admin Priority: extra Maintainer: xCAT -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.4 +Homepage: https://xcat.org/ Package: xcat-test Architecture: all Depends: ${perl:Depends} -Description: Provides automated test tool and buckets to help test xCAT commands automatically +Description: xCAT automated test tool + Provides automated test tool and buckets to help test xCAT commands + automatically. diff --git a/xCAT-test/debian/rules b/xCAT-test/debian/rules index 2d65f3a62..ad419b385 100755 --- a/xCAT-test/debian/rules +++ b/xCAT-test/debian/rules @@ -9,9 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DH_COMPAT=5 - - build: dh_testdir mkdir -p share/man/man1 @@ -33,7 +30,6 @@ install: dh_install -X".svn" dh_link - # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. @@ -44,7 +40,7 @@ binary-arch: export dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs dh_installdocs # dh_installexamples dh_install -X".svn" diff --git a/xCAT-vlan/debian/compat b/xCAT-vlan/debian/compat index 45a4fb75d..ec635144f 100755 --- a/xCAT-vlan/debian/compat +++ b/xCAT-vlan/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/xCAT-vlan/debian/control b/xCAT-vlan/debian/control index b6d89e310..5eddaa6e8 100755 --- a/xCAT-vlan/debian/control +++ b/xCAT-vlan/debian/control @@ -2,12 +2,11 @@ Source: xcat-vlan Section: admin Priority: extra Maintainer: root -Build-Depends: debhelper (>= 8.0.0) -Standards-Version: 3.9.2 -#Vcs-Git: git://git.debian.org/collab-maint/xcat-vlan.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/xcat-vlan.git;a=summary +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.4 +Homepage: https://xcat.org/ Package: xcat-vlan Architecture: all -Depends: xcat-client +Depends: xcat-client (>= 2.13-snap000000000000) Description: xCAT-vlan provides the xCAT vlan confiuration. diff --git a/xCAT-vlan/debian/rules b/xCAT-vlan/debian/rules index 4ab16dbff..2ab51a5dd 100755 --- a/xCAT-vlan/debian/rules +++ b/xCAT-vlan/debian/rules @@ -11,10 +11,12 @@ build: ./xpod2man + clean: dh_testdir dh_testroot dh_clean -d + install: pwd dh_installdirs diff --git a/xCAT/debian/compat b/xCAT/debian/compat index 7ed6ff82d..ec635144f 100644 --- a/xCAT/debian/compat +++ b/xCAT/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/xCAT/debian/control b/xCAT/debian/control index 913d00c94..fae5030f6 100644 --- a/xCAT/debian/control +++ b/xCAT/debian/control @@ -2,11 +2,29 @@ Source: xcat Section: admin Priority: extra Maintainer: xCAT -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.4 +Vcs-browser: https://github.com/xcat2/xcat-core.git +Homepage: https://xcat.org/ 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.17-1), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat, xnba-undi, xcat-genesis-scripts-ppc64, xcat-genesis-scripts-amd64, 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 +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, 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) +Suggests: yaboot-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 + Infrastructure, Clouds, Datacenters, and whatever tomorrow's buzzwords may + be. It is agile, extensible, and based on years of system administration best + practices and experience. + . + It enables you to: + . + * Provision Operating Systems on physical or virtual machines: RHEL, CentOS, + Fedora, SLES, Ubuntu, AIX, Windows, VMWare, KVM, PowerVM, PowerKVM, zVM. + * Provision using scripted install, stateless, statelite, iSCSI, or cloning + * Remotely manage systems: lights-out management, remote console, and + distributed shell support + * Quickly configure and control management node services: DNS, HTTP, DHCP, + TFTP, NFS diff --git a/xCAT/debian/rules b/xCAT/debian/rules index b45ba65a7..14d8be8b1 100755 --- a/xCAT/debian/rules +++ b/xCAT/debian/rules @@ -9,9 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DH_COMPAT=5 - - build: pwd @@ -28,7 +25,6 @@ install: dh_install -X".svn" dh_link - # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. @@ -39,7 +35,7 @@ binary-arch: export dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs dh_installdocs # dh_installexamples dh_install -X".svn" diff --git a/xCATsn/debian/compat b/xCATsn/debian/compat index 7ed6ff82d..ec635144f 100644 --- a/xCATsn/debian/compat +++ b/xCATsn/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/xCATsn/debian/control b/xCATsn/debian/control index 7ed6120d9..250449a81 100644 --- a/xCATsn/debian/control +++ b/xCATsn/debian/control @@ -2,12 +2,15 @@ Source: xcatsn Section: admin Priority: extra Maintainer: xCAT -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.4 +Homepage: https://xcat.org/ 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.17-1), syslinux-xcat, xnba-undi, xcat-genesis-scripts-ppc64, xcat-genesis-scripts-amd64, elilo-xcat,libsys-virt-perl, xcat-probe (>=2.12) -Recommends: yaboot-xcat +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) +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) +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. + xCATsn is a service node management package intended for at-scale + management, including hardware management and software management. diff --git a/xCATsn/debian/rules b/xCATsn/debian/rules index ce79be57f..38689173d 100755 --- a/xCATsn/debian/rules +++ b/xCATsn/debian/rules @@ -9,9 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export DH_COMPAT=5 - - build: pwd @@ -28,7 +25,6 @@ install: dh_install -X".svn" dh_link - # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. @@ -38,7 +34,7 @@ binary-arch: pwd dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs dh_installdocs # dh_installexamples dh_install -X".svn"