git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'unknown filesystem' warnings in old inspection code (RHBZ#678231 RHBZ#666578).
[libguestfs.git]
/
appliance
/
packagelist.in
diff --git
a/appliance/packagelist.in
b/appliance/packagelist.in
index
c03357f
..
05afa94
100644
(file)
--- a/
appliance/packagelist.in
+++ b/
appliance/packagelist.in
@@
-5,10
+5,20
@@
* 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.
+ * ARCHLINUX=1 For Archlinux.
+ *
+ * There is also a list of packages which are excluded if they appear
+ * as dependencies of the packages below. See: excludelist.in
*/
*/
-#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
@@
-18,6
+28,7
@@
e4fsprogs
gfs-utils
gfs2-utils
e4fsprogs
gfs-utils
gfs2-utils
+ grub
hfsplus-tools
iputils
kernel
hfsplus-tools
iputils
kernel
@@
-27,41
+38,70
@@
ntfs-3g
reiserfs-utils
libselinux
ntfs-3g
reiserfs-utils
libselinux
+ systemd /* for /sbin/reboot */
udev
util-linux-ng
vim-minimal
xz
zfs-fuse
udev
util-linux-ng
vim-minimal
xz
zfs-fuse
-#elif DEBIAN == 1
+#endif /* REDHAT */
+
+#ifdef DEBIAN
bsdmainutils
btrfs-tools
cryptsetup
bsdmainutils
btrfs-tools
cryptsetup
+ diff
e2fsprogs
gfs-tools
gfs2-tools
e2fsprogs
gfs-tools
gfs2-tools
+ grub-pc
hfsplus
iproute
libaugeas0
linux-image
hfsplus
iproute
libaugeas0
linux-image
- nilfs
2
-tools
+ nilfs-tools
ntfs-3g
ntfsprogs
reiserfsprogs
udev
ntfs-3g
ntfsprogs
reiserfsprogs
udev
+ ufsutils
util-linux
vim-tiny
xz-utils
zfs-fuse
util-linux
vim-tiny
xz-utils
zfs-fuse
-#endif
+#endif /* DEBIAN */
+
+#ifdef ARCHLINUX
+ kernel26
+ vim
+ btrfs-progs-unstable
+ cryptsetup
+ diffutils
+ augeas
+ zfs-fuse
+ e2fsprogs
+ grub
+ iputils
+ nilfs-utils
+ ntfsprogs
+ ntfs-3g
+ reiserfsprogs
+ udev
+ util-linux-ng
+ xz
+#endif /* ARCHLINUX */
+acl
+attr
bash
binutils
coreutils
bash
binutils
coreutils
+cpio
dosfstools
file
findutils
dosfstools
file
findutils
+gawk
grep
grep
-grub
gzip
jfsutils
lsof
gzip
jfsutils
lsof
@@
-78,5
+118,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