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
c8674b1
..
1faef2b
100644
(file)
--- a/
appliance/packagelist.in
+++ b/
appliance/packagelist.in
@@
-5,13
+5,21
@@
* 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
augeas-libs
btrfs-progs
+ cryptsetup-luks
diffutils
diffutils
+ e2fsprogs
/* e4fsprogs only exists on RHEL 5, will be ignored everywhere else. */
e4fsprogs
gfs-utils
/* e4fsprogs only exists on RHEL 5, will be ignored everywhere else. */
e4fsprogs
gfs-utils
@@
-22,40
+30,52
@@
MAKEDEV
nilfs-utils
ntfsprogs
MAKEDEV
nilfs-utils
ntfsprogs
+ ntfs-3g
reiserfs-utils
libselinux
udev
util-linux-ng
vim-minimal
reiserfs-utils
libselinux
udev
util-linux-ng
vim-minimal
-#elif DEBIAN == 1
+ xz
+ zfs-fuse
+#endif /* REDHAT */
+
+#ifdef DEBIAN
bsdmainutils
btrfs-tools
bsdmainutils
btrfs-tools
- /* Dependency problem prevents installation of these two:
+ cryptsetup
+ e2fsprogs
gfs-tools
gfs2-tools
gfs-tools
gfs2-tools
- */
hfsplus
iproute
libaugeas0
hfsplus
iproute
libaugeas0
+ linux-image
nilfs2-tools
nilfs2-tools
+ ntfs-3g
+ ntfsprogs
reiserfsprogs
udev
util-linux
vim-tiny
reiserfsprogs
udev
util-linux
vim-tiny
-#endif
+ xz-utils
+ zfs-fuse
+#endif /* DEBIAN */
bash
binutils
coreutils
dosfstools
file
bash
binutils
coreutils
dosfstools
file
+findutils
+grep
grub
grub
+gzip
jfsutils
lsof
lvm2
module-init-tools
net-tools
jfsutils
lsof
lvm2
module-init-tools
net-tools
-ntfs-3g
/*
Enabling this pulls out 140 extra packages
into the appliance:
/*
Enabling this pulls out 140 extra packages
into the appliance:
@@
-65,5
+85,11
@@
parted
procps
scrub
strace
procps
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