diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
| commit | 3fd04f71ad25d5df59c636986f741b9a36ce6501 (patch) | |
| tree | 995f4a15764d4196a92ecd966150e38d910d57d1 /conf/distro/minimal.conf | |
| parent | b5b3d83a6f3b1c04a4ebe09f636683ef22495d09 (diff) | |
| parent | e426517ed76c7532434f0687f88fca1295530000 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/linux/linux-kirkwood_2.6.33-rc1.bb
Diffstat (limited to 'conf/distro/minimal.conf')
| -rw-r--r-- | conf/distro/minimal.conf | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 62e76154e1..8e0ae2eb34 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -52,10 +52,11 @@ INHERIT += "packaged-staging" # Chose the packaging system INHERIT += "package_ipk" IMAGE_FSTYPES ?= "tar.gz jffs2" - -require conf/distro/include/sane-feed.inc PREFERRED_PKG_FORMAT ?= "ipk" -require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc + +# Put links to sources in deploy/sources to make it easier for people to be GPL compliant +INHERIT += "src_distribute_local" +SRC_DIST_LOCAL ?= "symlink" # If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run IPKG_VARIANT = "opkg-nogpg" @@ -68,6 +69,7 @@ IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${PREFERRED_PKG_FORMAT}-$ CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}" DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" +SPLASH ?= "${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)}" # increase inode/block ratio for ext2 filesystem EXTRA_IMAGECMD_ext2 = "-i 8192" |