diff options
| author | Roger Leigh <rleigh@debian.org> | 2013-04-01 21:25:26 +0100 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2013-04-01 23:57:34 +0100 |
| commit | 472bc0e3d03cc5a43d1b232a64e8874babcd85a5 (patch) | |
| tree | b377a80670063ceceb6a6a916dddc0838e90eec9 /debian | |
| parent | 8acb735711193988e9f233dd38528773ac823e84 (diff) | |
| download | schroot-472bc0e3d03cc5a43d1b232a64e8874babcd85a5.tar.gz | |
debian: Remove UUID support
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | debian/rules | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index f469cc19..d9266026 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,9 @@ schroot (1.7.0-1) UNRELEASED; urgency=low exec-start argument. * debian/copyright: Update to use DEP-5 copyright format v1.0. * debian/control: Remove liblockdev from Build-Depends. - * debian/rules: Build using g++ in C++11 mode. + * debian/rules: + - Build using g++ in C++11 mode. + - Remove UUID support. -- Roger Leigh <rleigh@debian.org> Sat, 21 Jul 2012 10:44:09 +0100 diff --git a/debian/rules b/debian/rules index b7428e0a..e24fe881 100755 --- a/debian/rules +++ b/debian/rules @@ -15,12 +15,6 @@ else BTRFSSNAP_OPTIONS = --enable-btrfs-snapshot endif -ifneq ($(DEB_HOST_ARCH_OS),kfreebsd) - UUID_OPTIONS = --enable-uuid -else - UUID_OPTIONS = --disable-uuid -endif - CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -47,7 +41,7 @@ debian/build/config.status: configure --enable-dchroot --enable-dchroot-dsa \ --enable-static --disable-shared \ --with-bash-completion-dir=/etc/bash_completion.d \ - $(LVMSNAP_OPTIONS) $(BTRFSSNAP_OPTIONS) $(UUID_OPTIONS) \ + $(LVMSNAP_OPTIONS) $(BTRFSSNAP_OPTIONS) \ BTRFS=/sbin/btrfs \ BTRFSCTL=/sbin/btrfsctl \ LVCREATE=/sbin/lvcreate \ |