diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2010-12-06 14:31:17 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2010-12-06 14:32:50 +0000 |
| commit | 227c9a4bca760f7f38e255f459720888a8335eeb (patch) | |
| tree | 5172ae1a7135322872ccd4818c858ce598395b8d | |
| parent | 0bb4208467dcfc49389037defe6ce7f291807901 (diff) | |
| download | libguestfs-227c9a4bca760f7f38e255f459720888a8335eeb.tar.gz libguestfs-227c9a4bca760f7f38e255f459720888a8335eeb.tar.xz libguestfs-227c9a4bca760f7f38e255f459720888a8335eeb.zip | |
ubuntu: Make Ubuntu into a separate distro for the package list.
This allows us to select Ubuntu packages separately from Debian ones.
| -rw-r--r-- | appliance/packagelist.in | 16 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 15 insertions, 4 deletions
diff --git a/appliance/packagelist.in b/appliance/packagelist.in index c03357f6..2b1a4190 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -5,10 +5,16 @@ * following symbols defined (depending on the distro): * * REDHAT=1 For Fedora, RHEL, EPEL and workalikes. - * DEBIAN=1 For Debian based distros. + * DEBIAN=1 For Debian. + * UBUNTU=1 For Ubuntu. */ -#if REDHAT == 1 +/* Basically the same with a few minor tweaks. */ +#ifdef UBUNTU +#define DEBIAN 1 +#endif + +#ifdef REDHAT augeas-libs btrfs-progs cryptsetup-luks @@ -32,7 +38,9 @@ vim-minimal xz zfs-fuse -#elif DEBIAN == 1 +#endif /* REDHAT */ + +#ifdef DEBIAN bsdmainutils btrfs-tools cryptsetup @@ -52,7 +60,7 @@ vim-tiny xz-utils zfs-fuse -#endif +#endif /* DEBIAN */ bash binutils diff --git a/configure.ac b/configure.ac index 94995f1e..912ea622 100644 --- a/configure.ac +++ b/configure.ac @@ -223,6 +223,9 @@ if test "x$enable_appliance" = "xyes"; then DISTRO=REDHAT if test -f /etc/debian_version; then DISTRO=DEBIAN + if grep -q 'DISTRIB_ID=Ubuntu' /etc/lsb-release 2>/dev/null; then + DISTRO=UBUNTU + fi fi AC_MSG_RESULT([$DISTRO]) AC_SUBST([DISTRO]) |