diff --git a/debperldepends b/debperldepends old mode 100644 new mode 100755 index d58c3aec2..bbc36501b --- a/debperldepends +++ b/debperldepends @@ -1,7 +1,19 @@ -#!/bin/sh +#!/bin/bash +# +# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html +# +# Author: Isaac Freeman +# +# Make some wild guesses about what debian perl modules a package requires. +# Seems to work so far for xCAT. +# +# Scans the current directory. +# found="" +# Warning: voodoo ahead + find . -name .svn -prune -o -type f \ | xargs grep -l '^#!.*perl' \ | xargs grep -hE '^\s*(use|require) ' \ @@ -11,9 +23,9 @@ find . -name .svn -prune -o -type f \ print $2 }' <<<"$mod" \ | tr '[:upper:]' '[:lower:]' ) - if apt-cache show lib${pkg}-perl >/dev/null 2>&1; then + pkgname="lib${pkg}-perl" - pkgname="lib${pkg}-perl" + if apt-cache show $pkgname >/dev/null 2>&1; then case "$found" in *$pkgname*) continue ;; @@ -25,6 +37,8 @@ find . -name .svn -prune -o -type f \ esac elif perl <<<"$mod" >/dev/null 2>&1; then + # Blindly assume that if perl doesn't complain about this, that its + # built-in to or ships with perl. continue elif [ "$1" == "-w" ]; then echo diff --git a/perl-xCAT/debian/control b/perl-xCAT/debian/control index 0a6232227..76fecfb69 100644 --- a/perl-xCAT/debian/control +++ b/perl-xCAT/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 5), libdbi-perl Standards-Version: 3.7.2 Package: perl-xcat -Architecture: all +Architecture: any Depends: ${perl:Depends}, libio-socket-ssl-perl, libxml-simple-perl, libstorable-perl, libsys-syslog-perl, libsnmp-perl, libdbi-perl Description: xCAT perl libraries Provides perl xCAT libraries for core functionality. Required for all xCAT installations. diff --git a/xCAT-client/debian/control b/xCAT-client/debian/control index 000b8d1c9..e52d9ae0b 100644 --- a/xCAT-client/debian/control +++ b/xCAT-client/debian/control @@ -7,6 +7,6 @@ Standards-Version: 3.7.2 Package: xcat-client Architecture: any -Depends: ${perl:Depends}, perl-xcat (>= 2.0-2), libsys-syslog-perl, libio-socket-ssl-perl, libxml-simple-perl +Depends: ${perl:Depends}, perl-xcat (>= 2.0-2), libsys-syslog-perl, libio-socket-ssl-perl, libxml-simple-perl, conserver-xcat-client 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. diff --git a/xCAT-client/debian/rules b/xCAT-client/debian/rules index 52cb8045a..679f1d2c9 100755 --- a/xCAT-client/debian/rules +++ b/xCAT-client/debian/rules @@ -13,8 +13,6 @@ export DH_COMPAT=5 build: - echo *** debian/rules build - echo -n *** pwd ./xpod2man @@ -24,8 +22,6 @@ clean: dh_clean -d install: - echo *** debian/rules install - echo -n *** pwd dh_testdir dh_testroot @@ -40,8 +36,6 @@ binary-indep: build install # Build architecture-dependent files here. binary-arch: - echo *** debian/rules binary-arch - echo -n *** pwd dh_testdir dh_testroot