diff options
| -rw-r--r-- | appliance/Makefile.am | 2 | ||||
| -rw-r--r-- | appliance/packagelist.in | 24 | ||||
| -rw-r--r-- | configure.ac | 3 |
3 files changed, 21 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 + diff --git a/configure.ac b/configure.ac index e9e36643..16253279 100644 --- a/configure.ac +++ b/configure.ac @@ -144,6 +144,7 @@ if test "x$FEBOOTSTRAP" != "xno"; then AC_MSG_ERROR([fakechroot version must be >= 2.9]) fi fi + DIST="REDHAT" else # check for debootstrap and debirf AC_CHECK_PROG([DEBOOTSTRAP], @@ -153,7 +154,9 @@ else AC_CHECK_PROG([DEBIRF],[debirf],[debirf],[no]) test "x$DEBIRF" = "xno" && AC_MSG_ERROR([debirf must be installed]) + DIST="DEBIAN" fi +AC_SUBST(DIST) dnl --with-repo to specify a Fedora repository. |