Release 4.4

… to avoid warnings with Perl 5.18 and future FTBFS

Makefile

@@ -14,7 +14,7 @@
 #
 TMP        ?= /tmp
 DIST_PREFIX = ${TMP}
-VERSION     = 4.4rc1
+VERSION     = 4.4
 DEBVERSION  = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
 BASE        = xen-tools
 VCS         = git

README.markdown

@@ -33,8 +33,8 @@ known to work reliably, i.e.:
 * Lenny 5.0
 * Squeeze 6.0
 * Wheezy 7
-* Jessie 8 (under developement)
+* Jessie 8 (under development)
-* Sid (always under developement; works at least at the moment of writing :-)
+* Sid (always under development; works at least at the moment of writing :-)
 
 ### Ubuntu
 
@@ -55,7 +55,8 @@ known to work reliably, i.e.:
 * Precise Pangolin 12.04
 * Quantal Quetzal 12.10
 * Raring Ringtail 13.04
-* Saucy Salamander 13.10 (under developement)
+* Saucy Salamander 13.10
+* Trusty Tahr 14.04 (LTS, under development)
 
 [1]: http://bugs.debian.org/659360
     "debootstrap in Wheezy can no more build Ubuntu Edgy or earlier"

TODO.markdown

@@ -6,12 +6,19 @@ See KNOWN_BUGS.markdown for real bugs.
 Bugs to fix and features to add for 5.0
 ---------------------------------------
 
+* Switch build-system to autotools or something CPANish.
+
 * `xen-create-image` man page overhaul:
 
   * ambiguous option list with regards to parameters
   * Set Fail in more situations where the script has clearly failed
     i.e.: lvm exists
 
+* Roles overhaul
+
+  * Remove udev role. No more makes sense. udev gets pulled in by
+    kernels where necessary.
+
 * Test and support more file system types.
 
   Actually this should be pretty simple now that the parameters are

bin/xen-create-image

@@ -841,7 +841,7 @@ my $MOUNT_POINT = undef;
 #
 # Release number.
 #
-my $RELEASE = '4.4rc1';
+my $RELEASE = '4.4';
 
 
 #

bin/xen-create-nfs

@@ -121,7 +121,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
 #
 # Release number.
 #
-my $RELEASE = '4.4rc1';
+my $RELEASE = '4.4';
 
 
 # store version number away.

bin/xen-delete-image

@@ -164,7 +164,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4rc1';
+my $RELEASE = '4.4';
 
 
 #

bin/xen-list-images

@@ -106,7 +106,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.4rc1';
+my $RELEASE = '4.4';
 
 
 

bin/xen-resize-guest

@@ -111,7 +111,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4rc1';
+my $RELEASE = '4.4';
 
 
 #

bin/xen-update-image

@@ -113,7 +113,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4rc1';
+my $RELEASE = '4.4';
 
 
 #

bin/xt-create-xen-config

@@ -148,7 +148,7 @@ $CONFIG{ 'extension' } = '.cfg';
 #
 # Release number.
 #
-my $RELEASE = '4.4rc1';
+my $RELEASE = '4.4';
 
 
 

bin/xt-customize-image

@@ -91,7 +91,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4rc1';
+my $RELEASE = '4.4';
 
 
 

bin/xt-guess-suite-and-mirror

@@ -79,7 +79,7 @@ use strict;
 #
 # Release number.
 #
-my $RELEASE = '4.4rc1';
+my $RELEASE = '4.4';
 
 # Init
 my $mirror = '';

bin/xt-install-image

@@ -112,7 +112,7 @@ my %CONFIG;
 #
 # Release number.
 #
-my $RELEASE = '4.4rc1';
+my $RELEASE = '4.4';
 
 
 #

debian/changelog

@@ -1,3 +1,19 @@
+xen-tools (4.4-1) unstable; urgency=low
+
+  * New upstream release
+    - Run t/gitignore.t only if git is installed and .git present.
+    - Rework "minimal" role to be less based on personal preferences.
+      + No more installs sudo, vim, syslog-ng, etc.
+      + Fixes usage together with pygrub.
+    - hooks/common.sh: Split up installDebianPackage into
+      installDebianPackage and installDebianPackageAndRecommends.
+  * Also add build-dependency on "libterm-ui-perl | perl (<< 5.17.0)" and
+    "liblog-message-perl | perl (<< 5.17.0)" to avoid warnings with Perl
+    5.18 and future FTBFS.
+  * Mention Ubuntu 14.04 Trusty Tahr in long description.
+
+ -- Axel Beckert <abe@debian.org>  Wed, 11 Dec 2013 20:59:06 +0100
+
 xen-tools (4.4~rc1-1) unstable; urgency=low
 
   * New upstream release candidate

debian/control

@@ -10,6 +10,8 @@ Build-Depends: debhelper (>= 9~),
                libdata-validate-uri-perl,
                libfile-slurp-perl,
                libfile-which-perl,
+               liblog-message-perl | perl (<< 5.17.0),
+               libterm-ui-perl | perl (<< 5.17.0),
                libtest-notabs-perl,
                libtest-pod-coverage-perl,
                libtest-pod-perl,
@@ -72,6 +74,7 @@ Description: Tools to manage Xen virtual servers
    * Ubuntu 12.04 Precise Pangolin (LTS)
    * Ubuntu 12.10 Quantal Quetzal
    * Ubuntu 13.04 Raring Ringtail
-   * Ubuntu 13.10 Saucy Salamander (under development)
+   * Ubuntu 13.10 Saucy Salamander
+   * Ubuntu 14.04 Trusty Tahr (LTS, under development)
    * CentOS 5
    * CentOS 6

hooks/common.sh

@@ -55,14 +55,12 @@ assert ()
 
 
 #
-#  Install a number of Debian packages via apt-get.
+#  Install a number of Debian packages via apt-get including Recommends.
 #
 #  We take special care so that daemons shouldn't start after installation
 # which they might otherwise do.
 #
-#  NOTE:  Function not renamed with trailing "s" for compatibility reasons.
+installDebianPackageAndRecommends ()
-#
-installDebianPackage ()
 {
     prefix=$1
     shift
@@ -98,7 +96,7 @@ installDebianPackage ()
     #
     # Install the packages
     #
-    DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes --force-yes --no-install-recommends install "$@"
+    DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes --force-yes install "$@"
 
     #
     #  Remove the policy-rc.d script.
@@ -112,6 +110,21 @@ installDebianPackage ()
 
 }
 
+#
+#  Install a number of Debian packages via apt-get, but without Recommends
+#
+#  We take special care so that daemons shouldn't start after installation
+# which they might otherwise do.
+#
+#  NOTE:  Function not renamed with trailing "s" for compatibility reasons.
+#
+installDebianPackage ()
+{
+    prefix=$1
+    shift
+
+    installDebianPackageAndRecommends ${prefix} --no-install-recommends "$@"
+}
 
 #
 #  Generate a Debian-/Ubuntu-compliant menu.lst for legacy GRUB

roles/minimal

@@ -1,13 +1,10 @@
 #!/bin/sh
 #
-#  Configure the new image to be a minimal image, by removing
+#  Configure the new image to be a minimal image, by removing packages
-# packages I don't care about - and installing new ones I prefer.
+# not necessarily needed - and installing less resource-hungry ones
 #
-# Steve
+#  Still far away from perfect. Less personal than in the past, but
-# --
+# for now still based on gut feeling.
-# http://www.steve.org.uk/
-#
-
 
 prefix=$1
 
@@ -26,15 +23,11 @@ fi
 
 
 #
-#  Install some new packages - do this first to avoid dependency errors.
+#  Install some new packages - do this first to avoid dependency errors
 #
-installDebianPackage ${prefix} syslog-ng 
-installDebianPackage ${prefix} deborphan
-installDebianPackage ${prefix} less
-installDebianPackage ${prefix} screen
-installDebianPackage ${prefix} sudo
-installDebianPackage ${prefix} vim
 
+# Minimalst possible syslog service
+installDebianPackage ${prefix} busybox-syslogd
 
 #
 #  Remove some standard packages.
@@ -47,22 +40,57 @@ removeDebianPackage ${prefix} pppoe
 removeDebianPackage ${prefix} ppp
 removeDebianPackage ${prefix} libpcap0.7
 
-# Editors
+# Editors, keep only a minimal vi, namely nvi
-removeDebianPackage ${prefix} nano
+installDebianPackage ${prefix} nvi
-removeDebianPackage ${prefix} ed
+removeDebianPackage ${prefix} ed nano
-removeDebianPackage ${prefix} nvi
+removeDebianPackage ${prefix} vim-tiny vim-common vim-runtime
 
 # Syslog
-removeDebianPackage ${prefix} klogd
+removeDebianPackage ${prefix} klogd sysklogd
-removeDebianPackage ${prefix} sysklogd
+removeDebianPackage ${prefix} rsyslog
+removeDebianPackage ${prefix} logrotate
 
-# manpages
+# Man pages
-removeDebianPackage ${prefix} manpages  
+removeDebianPackage ${prefix} manpages man-db groff-base
-removeDebianPackage ${prefix} man-db 
 removeDebianPackage ${prefix} info
 
 # misc
 removeDebianPackage ${prefix} tasksel tasksel-data
 removeDebianPackage ${prefix} pciutils
 removeDebianPackage ${prefix} fdutils
-removeDebianPackage ${prefix} cpio
+removeDebianPackage ${prefix} util-linux-locales locales
+removeDebianPackage ${prefix} debconf-i18n
+removeDebianPackage ${prefix} netcat-traditional netcat-openbsd
+removeDebianPackage ${prefix} whiptail
+
+# Unnecessary stuff only installed by default on Ubuntu
+removeDebianPackage ${prefix} sudo
+removeDebianPackage ${prefix} resolvconf
+removeDebianPackage ${prefix} console-setup keyboard-configuration kbd xkb-data ureadahead
+removeDebianPackage ${prefix} python python3 dh-python
+
+# General cleanup
+chroot ${prefix} aptitude -y markauto \
+    '~n -common' \
+    '~s libs' \
+    '~s localization' \
+    '~s misc' \
+    '~s perl' \
+    '~s python'
+chroot ${prefix} apt-mark auto \
+    cpio \
+    crda \
+    debconf \
+    install-info \
+    kmod \
+    lsb-base \
+    makedev \
+    mime-support \
+    module-init-tools \
+    plymouth
+
+chroot ${prefix} aptitude -y purge '~c'
+removeDebianPackage ${prefix} aptitude aptitude-common
+
+chroot ${prefix} apt-get autoremove --purge
+chroot ${prefix} apt-get clean

t/gitignore.t

@@ -7,10 +7,16 @@
 #
 
 use strict;
-use Test::More tests => 3;
+use Test::More;
+use File::Which;
 
-BEGIN { use_ok( 'Git' ); }
+if (which('git') and -d '.git') {
+    plan tests => 3;
+} else {
+    plan skip_all => 'gitignore test is only thought for release testing.';
+}
 
+use_ok( 'Git' );
 
 # First, check that no tracked files are ignored
 my $cmd = Git::command_output_pipe('ls-files', '--ignored', '--exclude-standard');