git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ubuntu: Disable xfsprogs from Ubuntu package list.
[libguestfs.git]
/
appliance
/
packagelist.in
diff --git
a/appliance/packagelist.in
b/appliance/packagelist.in
index
51e7150
..
1faef2b
100644
(file)
--- 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.
* 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
augeas-libs
btrfs-progs
cryptsetup-luks
@@
-32,32
+38,29
@@
vim-minimal
xz
zfs-fuse
vim-minimal
xz
zfs-fuse
-#elif DEBIAN == 1
+#endif /* REDHAT */
+
+#ifdef DEBIAN
bsdmainutils
btrfs-tools
cryptsetup
e2fsprogs
bsdmainutils
btrfs-tools
cryptsetup
e2fsprogs
- /* Dependency problem prevents installation of these two:
gfs-tools
gfs2-tools
gfs-tools
gfs2-tools
- */
hfsplus
iproute
libaugeas0
linux-image
nilfs2-tools
hfsplus
iproute
libaugeas0
linux-image
nilfs2-tools
+ ntfs-3g
ntfsprogs
reiserfsprogs
udev
util-linux
vim-tiny
xz-utils
ntfsprogs
reiserfsprogs
udev
util-linux
vim-tiny
xz-utils
- /* Can't be installed under debirf because the fuse-utils post script
- requires udevd to be running.
- ntfs-3g
zfs-fuse
zfs-fuse
- */
-#endif
+#endif /* DEBIAN */
bash
binutils
bash
binutils
@@
-83,5
+86,10
@@
procps
scrub
strace
tar
scrub
strace
tar
+#ifndef UBUNTU
+/* on Ubuntu contains a file in /lib64 which conflicts with libc6 that has
+ * /lib64 as a symbolic link
+ */
xfsprogs
xfsprogs
+#endif
zerofree
zerofree