diff options
125 files changed, 4141 insertions, 35624 deletions
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index f7d941063d..1d40bbac56 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -68,10 +68,5 @@ include conf/distro/preferred-gpe-versions-2.8.inc # # E # - - -#23:57 < mickeyl> it's no longer necessary since our cleanup -#23:57 < mickeyl> it may be again when we add cvs versions, but until now, just don't include it - -#include conf/distro/preferred-e-versions.inc +include conf/distro/preferred-e-versions.inc diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf index 9cc84e96c4..99e501589f 100644 --- a/conf/distro/familiar.conf +++ b/conf/distro/familiar.conf @@ -7,9 +7,10 @@ TARGET_OS = "linux" PARALLEL_INSTALL_MODULES = "1" UDEV_DEVFS_RULES = "1" +IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" -include conf/distro/include/multimachine.conf
\ No newline at end of file +include conf/distro/include/multimachine.conf diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 072c69c5a0..f424b16696 100644 --- a/conf/di |