diff options
| author | Guido Günther <agx@sigxcpu.org> | 2009-06-29 18:40:00 +0200 |
|---|---|---|
| committer | Richard Jones <rjones@trick.home.annexia.org> | 2009-06-30 09:18:49 +0100 |
| commit | b4fade6392ccb2961f0d7e2bf45dfc2e20333aed (patch) | |
| tree | d04e8d91c8c8e47842ff337ba6e4870d929557ff /appliance | |
| parent | 3155a268151d70a669517a1f1ea8563a7d91cdb8 (diff) | |
| download | libguestfs-b4fade6392ccb2961f0d7e2bf45dfc2e20333aed.tar.gz libguestfs-b4fade6392ccb2961f0d7e2bf45dfc2e20333aed.tar.xz libguestfs-b4fade6392ccb2961f0d7e2bf45dfc2e20333aed.zip | |
define REDHAT and DEBIAN
so we can preprocess packagelist.in
Diffstat (limited to 'appliance')
| -rw-r--r-- | appliance/Makefile.am | 2 | ||||
| -rw-r--r-- | appliance/packagelist.in | 24 |
2 files changed, 18 insertions, 8 deletions
diff --git a/appliance/Makefile.am b/appliance/Makefile.am index c06d7ae9..93e11679 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -68,7 +68,7 @@ kmod.whitelist: kmod.whitelist.in grep -v '^[[:space:]]*$$' < $< | grep -v '^#' > $@ packagelist: packagelist.in - cpp -undef -DREDHAT=1 < $< | \ + cpp -undef -D$(DIST)=1 < $< | \ grep -v '^[[:space:]]*$$' | grep -v '^#' > $@ # This is for building the supermin appliance. It has to be enabled diff --git a/appliance/packagelist.in b/appliance/packagelist.in index 1d1f63a0..6b9d3e2c 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -5,26 +5,36 @@ * following symbols defined (depending on the distro): * * REDHAT=1 For Fedora, RHEL, EPEL and workalikes. + * DEBIAN=1 For Debian based distros. */ -augeas-libs +#if REDHAT == 1 + augeas-libs + iputils + kernel + MAKEDEV + ntfsprogs + scrub + util-linux-ng +#elif DEBIAN == 1 + bsdmainutils + iproute + libaugeas0 + util-linux +#endif + bash binutils coreutils dosfstools file grub -iputils -kernel lsof lvm2 -MAKEDEV module-init-tools net-tools ntfs-3g -ntfsprogs procps -scrub strace -util-linux-ng zerofree + |